From aa82fa1d1379ca2adc552a5e90cfa9a77da3edd6 Mon Sep 17 00:00:00 2001
From: Lejo <Lejo_1@web.de>
Date: Sun, 09 Dec 2018 15:57:48 +0100
Subject: [PATCH] Forcefield: Remove deprecated update_map() call (#467)

---
 technic/machines/register/grinder_recipes.lua |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index 64eb8e1..da90aad 100644
--- a/technic/machines/register/grinder_recipes.lua
+++ b/technic/machines/register/grinder_recipes.lua
@@ -15,6 +15,7 @@
 	{"default:desert_stone",       "default:desert_sand"},
 	{"default:gold_lump",          "technic:gold_dust 2"},
 	{"default:iron_lump",          "technic:wrought_iron_dust 2"},
+	{"default:tin_lump",           "technic:tin_dust 2"},
 	{"technic:chromium_lump",      "technic:chromium_dust 2"},
 	{"technic:uranium_lump",       "technic:uranium_dust 2"},
 	{"technic:zinc_lump",          "technic:zinc_dust 2"},
@@ -22,17 +23,29 @@
 	{"technic:sulfur_lump",        "technic:sulfur_dust 2"},
 	{"default:stone",              "technic:stone_dust"},
 	{"default:sand",               "technic:stone_dust"},
-	
+
 	-- Other
-	{"default:cobble",          "default:gravel"},
-	{"default:gravel",          "default:sand"},
-	{"default:sandstone",       "default:sand 2"}, -- reverse recipe can be found in the compressor
+	{"default:cobble",           "default:gravel"},
+	{"default:gravel",           "default:sand"},
+	{"default:sandstone",        "default:sand 2"}, -- reverse recipe can be found in the compressor
+	{"default:desert_sandstone", "default:desert_sand 2"}, -- reverse recipe can be found in the compressor
+	{"default:silver_sandstone", "default:silver_sand 2"}, -- reverse recipe can be found in the compressor
 }
 
 -- defuse the sandstone -> 4 sand recipe to avoid infinite sand bugs (also consult the inverse compressor recipe)
 minetest.clear_craft({
 	recipe = {
-		{'default:sandstone'}
+		{"default:sandstone"}
+	},
+})
+minetest.clear_craft({
+	recipe = {
+		{"default:desert_sandstone"}
+	},
+})
+minetest.clear_craft({
+	recipe = {
+		{"default:silver_sandstone"}
 	},
 })
 
@@ -43,7 +56,6 @@
 if minetest.get_modpath("moreores") then
 	table.insert(recipes, {"moreores:mithril_lump",   "technic:mithril_dust 2"})
 	table.insert(recipes, {"moreores:silver_lump",    "technic:silver_dust 2"})
-	table.insert(recipes, {"moreores:tin_lump",       "technic:tin_dust 2"})
 end
 
 if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then
@@ -60,12 +72,6 @@
 
 for _, data in pairs(recipes) do
 	technic.register_grinder_recipe({input = {data[1]}, output = data[2]})
-end
-
--- defuse common grinder unfriendly recipes
-if minetest.get_modpath("fake_fire") then -- from homedecor_modpack
-	minetest.register_craft({ output='default:cobble 0', recipe={{'default:cobble'}}})
-	minetest.register_craft({ output='default:gravel 0', recipe={{'default:gravel'}}})
 end
 
 -- dusts
@@ -87,7 +93,7 @@
 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")
@@ -100,9 +106,9 @@
 register_dust("Mithril",         "moreores:mithril_ingot")
 register_dust("Silver",          "moreores:silver_ingot")
 register_dust("Stainless Steel", "technic:stainless_steel_ingot")
-register_dust("Stone",            "default:stone")
+register_dust("Stone",           "default:stone")
 register_dust("Sulfur",          nil)
-register_dust("Tin",             "moreores:tin_ingot")
+register_dust("Tin",             "default:tin_ingot")
 register_dust("Wrought Iron",    "technic:wrought_iron_ingot")
 register_dust("Zinc",            "technic:zinc_ingot")
 if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then

--
Gitblit v1.8.0