Merge branch 'groups' into 'master'

Groups

See merge request VanessaE/basic_materials!5

.luacheckrc

@@ -0,0 +1,30 @@
+std = "lua51+minetest"
+unused_args = false
+allow_defined_top = true
+max_line_length = 999
+
+stds.minetest = {
+	read_globals = {
+		"DIR_DELIM",
+		"minetest",
+		"core",
+		"dump",
+		"vector",
+		"nodeupdate",
+		"VoxelManip",
+		"VoxelArea",
+		"PseudoRandom",
+		"ItemStack",
+		"default",
+		table = {
+			fields = {
+				"copy",
+			},
+		},
+	}
+}
+
+read_globals = {
+	"default",
+	"moreores",
+}

init.lua

@@ -7,6 +7,7 @@
 local modpath = minetest.get_modpath("basic_materials")
 
 basic_materials = {}
+basic_materials.mod = { author = "Vanessa Dannenberg" }
 
 dofile(modpath.."/metals.lua")
 dofile(modpath.."/plastics.lua")

locale/basic_materials.de.tr

@@ -0,0 +1,33 @@
+# textdomain: basic_materials
+Silicon lump=Silikonklumpen
+Simple Integrated Circuit=einfacher Integrierter Schaltkreis
+Simple Motor=einfacher Motor
+Heating element=Heizelement
+Simple energy crystal=einfacher Energiekristall
+
+Spool of steel wire=Spule mit Stahldraht
+Spool of copper wire=Spule mit Kupferdraht
+Spool of silver wire=Spule mit Silberdraht
+Spool of gold wire=Spule mit Golddraht
+Steel Strip=Stahlstreifen
+Copper Strip=Kupferstreifen
+Steel Bar=Stahlstab
+Chainlinks (brass)=Messing-Kettenglieder
+Chainlinks (steel)=Stahl-Kettenglieder
+Brass Ingot=Messingbarren
+Steel gear=Stahlzahnrad
+Padlock=Vorhängeschloss
+Chain (steel, hanging)=Stahlkette
+Chain (brass, hanging)=Messingkette
+Brass Block=Messingblock
+
+Oil extract=raffiniertes Öl
+Unprocessed paraffin=unbearbeitetes Paraffin
+Uncooked Terracotta Base=ungebranntes Terrakotta
+Wet Cement=nasser Zement
+Cement=Zement
+Concrete Block=Betonblock
+
+Plastic sheet=Kunststoffplatte
+Plastic strips=Kunststoffstreifen
+Empty wire spool=leere Drahtspule

locale/basic_materials.ru.tr

@@ -0,0 +1,33 @@
+# textdomain: basic_materials
+Silicon lump=Кусок Кремния
+Simple Integrated Circuit=Микросхема
+Simple Motor=Мотор
+Heating element=Нить Накала
+Simple energy crystal=Энергетический Кристалл
+
+Spool of steel wire=Катушка Стальной Проволоки
+Spool of copper wire=Катушка Медной Проволоки
+Spool of silver wire=Катушка Серебрянной Проволоки
+Spool of gold wire=Катушка Золотой Проволоки
+Steel Strip=Стальная Полоса
+Copper Strip=Медная Полоса
+Steel Bar=Стальной Прут
+Chainlinks (brass)=Латунные Звенья
+Chainlinks (steel)=Стальные Звенья
+Brass Ingot=Латунный Брусок
+Steel gear=Стальная Шестерня
+Padlock=Навесной Замок
+Chain (steel, hanging)=Стальная Цепь
+Chain (brass, hanging)=Латунная Цепь
+Brass Block=Латунный Блок
+
+Oil extract=Масляный Экстракт
+Unprocessed paraffin=Необработанный Парафин
+Uncooked Terracotta Base=Ком Мокрого Терракота
+Wet Cement=Ком Мокрого Цемента
+Cement=Цемент
+Concrete Block=Железобетон
+
+Plastic sheet=Пластиковый Лист
+Plastic strips=Пластиковая Полоса
+Empty wire spool=Пустая Катушка

metals.lua

@@ -5,31 +5,37 @@ local S = minetest.get_translator("basic_materials")
 
 minetest.register_craftitem("basic_materials:steel_wire", {
 	description = S("Spool of steel wire"),
+	groups = { wire = 1 },
 	inventory_image = "basic_materials_steel_wire.png"
 })
 
 minetest.register_craftitem("basic_materials:copper_wire", {
 	description = S("Spool of copper wire"),
+	groups = { wire = 1 },
 	inventory_image = "basic_materials_copper_wire.png"
 })
 
 minetest.register_craftitem("basic_materials:silver_wire", {
 	description = S("Spool of silver wire"),
+	groups = { wire = 1 },
 	inventory_image = "basic_materials_silver_wire.png"
 })
 
 minetest.register_craftitem("basic_materials:gold_wire", {
 	description = S("Spool of gold wire"),
+	groups = { wire = 1 },
 	inventory_image = "basic_materials_gold_wire.png"
 })
 
 minetest.register_craftitem("basic_materials:steel_strip", {
 	description = S("Steel Strip"),
+	groups = { strip = 1 },
 	inventory_image = "basic_materials_steel_strip.png"
 })
 
 minetest.register_craftitem("basic_materials:copper_strip", {
 	description = S("Copper Strip"),
+	groups = { strip = 1 },
 	inventory_image = "basic_materials_copper_strip.png"
 })
 
@@ -40,11 +46,13 @@ minetest.register_craftitem("basic_materials:steel_bar", {
 
 minetest.register_craftitem("basic_materials:chainlink_brass", {
 	description = S("Chainlinks (brass)"),
+	groups = { chainlinks = 1 },
 	inventory_image = "basic_materials_chainlink_brass.png"
 })
 
 minetest.register_craftitem("basic_materials:chainlink_steel", {
 	description = S("Chainlinks (steel)"),
+	groups = { chainlinks = 1 },
 	inventory_image = "basic_materials_chainlink_steel.png"
 })
 
@@ -70,14 +78,6 @@ local chains_sbox = {
 	fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 }
 }
 
-local topchains_sbox = {
-	type = "fixed",
-	fixed = {
-		{ -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 },
-		{ -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 }
-	}
-}
-
 minetest.register_node("basic_materials:chain_steel", {
 	description = S("Chain (steel, hanging)"),
 	drawtype = "mesh",
@@ -245,6 +245,18 @@ minetest.register_craft( {
 	},
 })
 
+if not minetest.get_modpath("moreores") then
+    -- Without moreores, there still should be a way to create brass.
+    minetest.register_craft( {
+        output = "basic_materials:brass_ingot 9",
+        recipe = {
+	    {"default:copper_ingot", "default:tin_ingot", "default:copper_ingot"},
+	    {"default:gold_ingot", "default:copper_ingot", "default:gold_ingot"},
+	    {"default:copper_ingot", "default:tin_ingot", "default:copper_ingot"},
+        },
+    })
+end
+
 minetest.register_craft( {
 	type = "shapeless",
 	output = "basic_materials:brass_ingot 9",

mod.conf

@@ -1,3 +1,4 @@
 name = basic_materials
 depends = default
 optional_depends = moreores
+min_minetest_version = 5.2.0

plastics.lua

@@ -10,6 +10,7 @@ minetest.register_craftitem("basic_materials:plastic_sheet", {
 
 minetest.register_craftitem("basic_materials:plastic_strip", {
 	description = S("Plastic strips"),
+	groups = { strip = 1 },
 	inventory_image = "basic_materials_plastic_strip.png",
 })