From d1b54a573c6287ea1d63b9c3f979c39058b1331a Mon Sep 17 00:00:00 2001
From: Vitaliy <silverunicorn2011@yandex.ru>
Date: Sat, 21 Jul 2018 19:11:12 +0200
Subject: [PATCH] Use tin from MTG instead of `moreores` (#401)
---
technic/machines/register/grinder_recipes.lua | 6 +++---
technic/machines/register/battery_box.lua | 2 +-
technic/machines/register/alloy_recipes.lua | 2 +-
technic/tools/mining_drill.lua | 2 +-
technic/crafts.lua | 2 +-
technic/radiation.lua | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/technic/crafts.lua b/technic/crafts.lua
index 14bafd3..5d3ae04 100644
--- a/technic/crafts.lua
+++ b/technic/crafts.lua
@@ -164,7 +164,7 @@
recipe = {
{'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'},
{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
- {'moreores:tin_ingot', 'moreores:tin_ingot', 'moreores:tin_ingot'},
+ {'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
}
})
diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua
index bd09bd6..3aeacd5 100644
--- a/technic/machines/register/alloy_recipes.lua
+++ b/technic/machines/register/alloy_recipes.lua
@@ -13,7 +13,7 @@
local recipes = {
{"technic:copper_dust 3", "technic:tin_dust", "technic:bronze_dust 4"},
- {"default:copper_ingot 3", "moreores:tin_ingot", "default:bronze_ingot 4"},
+ {"default:copper_ingot 3", "default:tin_ingot", "default:bronze_ingot 4"},
{"technic:wrought_iron_dust", "technic:coal_dust", "technic:carbon_steel_dust", 3},
{"technic:wrought_iron_ingot", "technic:coal_dust", "technic:carbon_steel_ingot", 3},
{"technic:carbon_steel_dust", "technic:coal_dust", "technic:cast_iron_dust", 3},
diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua
index 7f25dfd..d10b705 100644
--- a/technic/machines/register/battery_box.lua
+++ b/technic/machines/register/battery_box.lua
@@ -18,7 +18,7 @@
output = "technic:battery",
recipe = {
{"group:wood", "default:copper_ingot", "group:wood"},
- {"group:wood", "moreores:tin_ingot", "group:wood"},
+ {"group:wood", "default:tin_ingot", "group:wood"},
{"group:wood", "default:copper_ingot", "group:wood"},
}
})
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index fa55e7a..1f4047c 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"},
@@ -43,7 +44,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
@@ -94,9 +94,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
diff --git a/technic/radiation.lua b/technic/radiation.lua
index 722b0ac..a4c49c6 100644
--- a/technic/radiation.lua
+++ b/technic/radiation.lua
@@ -54,6 +54,7 @@
["default:lava_source"] = 17,
["default:mese"] = 21,
["default:mossycobble"] = 15,
+ ["default:tinblock"] = 37,
["pbj_pup:pbj_pup"] = 10000,
["pbj_pup:pbj_pup_candies"] = 10000,
["gloopblocks:rainbow_block_diagonal"] = 5000,
@@ -76,6 +77,7 @@
["default:stone_with_gold"] = 34,
["default:stone_with_iron"] = 20,
["default:stone_with_mese"] = 17,
+ ["default:stone_with_tin"] = 19,
["default:stonebrick"] = 17,
["default:water_flowing"] = 2.8,
["default:water_source"] = 5.6,
@@ -141,10 +143,8 @@
["moreblocks:wood_tile_up"] = 1.7,
["moreores:mineral_mithril"] = 18,
["moreores:mineral_silver"] = 21,
- ["moreores:mineral_tin"] = 19,
["moreores:mithril_block"] = 26,
["moreores:silver_block"] = 53,
- ["moreores:tin_block"] = 37,
["snow:snow_brick"] = 2.8,
["technic:brass_block"] = 43,
["technic:carbon_steel_block"] = 40,
diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua
index bc426e7..1cf7491 100644
--- a/technic/tools/mining_drill.lua
+++ b/technic/tools/mining_drill.lua
@@ -6,7 +6,7 @@
minetest.register_craft({
output = 'technic:mining_drill',
recipe = {
- {'moreores:tin_ingot', 'technic:diamond_drill_head', 'moreores:tin_ingot'},
+ {'default:tin_ingot', 'technic:diamond_drill_head', 'default:tin_ingot'},
{'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'},
{'', 'technic:red_energy_crystal', 'default:copper_ingot'},
}
--
Gitblit v1.8.0