add basic_materials mod

update homedecor, pipeworks, gloopblocks, signs_lib, stainedglass
also updated technic, roads, glooptest, framedglass
(they're my forks actually, just until some pending PRs are merged)
make default locked chests use basic_materials padlock

7 files changed, 12 insertions, 12 deletions

diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua
index 67b9f79..c1a1d73 100644
--- a/technic/machines/LV/compressor.lua
+++ b/technic/machines/LV/compressor.lua
@@ -6,7 +6,7 @@ minetest.register_craft({
 	recipe = {
 		{'default:stone',            'technic:motor',          'default:stone'},
 		{'mesecons:piston',          'technic:machine_casing', 'mesecons:piston'},
-		{'technic:fine_silver_wire', 'technic:lv_cable',       'technic:fine_silver_wire'},
+		{'basic_materials:silver_wire', 'technic:lv_cable',       'basic_materials:silver_wire'},
 	}
 })
 
diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua
index 27f4abc..1699a52 100644
--- a/technic/machines/LV/geothermal.lua
+++ b/technic/machines/LV/geothermal.lua
@@ -11,7 +11,7 @@ minetest.register_craft({
 	output = 'technic:geothermal',
 	recipe = {
 		{'technic:granite',          'default:diamond',        'technic:granite'},
-		{'technic:fine_copper_wire', 'technic:machine_casing', 'technic:fine_copper_wire'},
+		{'basic_materials:copper_wire', 'technic:machine_casing', 'basic_materials:copper_wire'},
 		{'technic:granite',          'technic:lv_cable',       'technic:granite'},
 	}
 })
diff --git a/technic/machines/LV/solar_panel.lua b/technic/machines/LV/solar_panel.lua
index c072b13..6143fa9 100644
--- a/technic/machines/LV/solar_panel.lua
+++ b/technic/machines/LV/solar_panel.lua
@@ -9,9 +9,9 @@ minetest.register_craft({
 	output = 'technic:solar_panel',
 	recipe = {
 		{'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer'},
-		{'technic:fine_silver_wire',    'technic:lv_cable',            'mesecons_materials:glue'},
-
-	}
+		{'basic_materials:silver_wire',    'technic:lv_cable',            'mesecons_materials:glue'},
+	},
+	replacements = { {"basic_materials:silver_wire", "basic_materials:empty_spool"}, },
 })
 
 
diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua
index d5c60a3..ab07d58 100644
--- a/technic/machines/other/frames.lua
+++ b/technic/machines/other/frames.lua
@@ -979,7 +979,7 @@ minetest.register_craft({
 	output = 'technic:frame_111111',
 	recipe = {
 		{ '',              'default:stick',       '' },
-		{ 'default:stick', 'technic:brass_ingot', 'default:stick' },
+		{ 'default:stick', 'basic_materials:brass_ingot', 'default:stick' },
 		{ '',              'default:stick',       '' },
 	}
 })
@@ -996,9 +996,9 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:template 10',
 	recipe = {
-		{ '',                    'technic:brass_ingot',  '' },
-		{ 'technic:brass_ingot', 'default:mese_crystal', 'technic:brass_ingot' },
-		{ '',                    'technic:brass_ingot',  '' },
+		{ '',                    'basic_materials:brass_ingot',  '' },
+		{ 'basic_materials:brass_ingot', 'default:mese_crystal', 'basic_materials:brass_ingot' },
+		{ '',                    'basic_materials:brass_ingot',  '' },
 	}
 })
 
diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua
index 3aeacd5..8731b8e 100644
--- a/technic/machines/register/alloy_recipes.lua
+++ b/technic/machines/register/alloy_recipes.lua
@@ -21,7 +21,7 @@ local recipes = {
 	{"technic:carbon_steel_dust 3",   "technic:chromium_dust",      "technic:stainless_steel_dust 4"},
 	{"technic:carbon_steel_ingot 3",  "technic:chromium_ingot",     "technic:stainless_steel_ingot 4"},
 	{"technic:copper_dust 2",         "technic:zinc_dust",          "technic:brass_dust 3"},
-	{"default:copper_ingot 2",        "technic:zinc_ingot",         "technic:brass_ingot 3"},
+	{"default:copper_ingot 2",        "technic:zinc_ingot",         "basic_materials:brass_ingot 3"},
 	{"default:sand 2",                "technic:coal_dust 2",        "technic:silicon_wafer"},
 	{"technic:silicon_wafer",         "technic:gold_dust",          "technic:doped_silicon_wafer"},
 	-- from https://en.wikipedia.org/wiki/Carbon_black
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index 8c8e178..da90aad 100644
--- a/technic/machines/register/grinder_recipes.lua
+++ b/technic/machines/register/grinder_recipes.lua
@@ -93,7 +93,7 @@ local function register_dust(name, ingot)
 end
 
 -- Sorted alphibeticaly
-register_dust("Brass",           "technic:brass_ingot")
+register_dust("Brass",           "basic_materials:brass_ingot")
 register_dust("Bronze",          "default:bronze_ingot")
 register_dust("Carbon Steel",    "technic:carbon_steel_ingot")
 register_dust("Cast Iron",       "technic:cast_iron_ingot")
diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua
index 9202c4a..6c520ca 100644
--- a/technic/machines/supply_converter.lua
+++ b/technic/machines/supply_converter.lua
@@ -201,7 +201,7 @@ minetest.register_node("technic:supply_converter", {
 minetest.register_craft({
 	output = 'technic:supply_converter 1',
 	recipe = {
-		{'technic:fine_gold_wire', 'technic:rubber',         'technic:doped_silicon_wafer'},
+		{'basic_materials:gold_wire', 'technic:rubber',         'technic:doped_silicon_wafer'},
 		{'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'},
 		{'technic:mv_cable',       'technic:rubber',         'technic:lv_cable'},
 	}