Skip to content

Commit d1b54a5

Browse files
numberZeroSmallJoker
authored andcommitted
Use tin from MTG instead of moreores (#401)
Register tin dust unconditionally
1 parent f013d2d commit d1b54a5

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

technic/crafts.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ minetest.register_craft({
164164
recipe = {
165165
{'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'},
166166
{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
167-
{'moreores:tin_ingot', 'moreores:tin_ingot', 'moreores:tin_ingot'},
167+
{'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
168168
}
169169
})
170170

technic/machines/register/alloy_recipes.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ end
1313

1414
local recipes = {
1515
{"technic:copper_dust 3", "technic:tin_dust", "technic:bronze_dust 4"},
16-
{"default:copper_ingot 3", "moreores:tin_ingot", "default:bronze_ingot 4"},
16+
{"default:copper_ingot 3", "default:tin_ingot", "default:bronze_ingot 4"},
1717
{"technic:wrought_iron_dust", "technic:coal_dust", "technic:carbon_steel_dust", 3},
1818
{"technic:wrought_iron_ingot", "technic:coal_dust", "technic:carbon_steel_ingot", 3},
1919
{"technic:carbon_steel_dust", "technic:coal_dust", "technic:cast_iron_dust", 3},

technic/machines/register/battery_box.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ minetest.register_craft({
1818
output = "technic:battery",
1919
recipe = {
2020
{"group:wood", "default:copper_ingot", "group:wood"},
21-
{"group:wood", "moreores:tin_ingot", "group:wood"},
21+
{"group:wood", "default:tin_ingot", "group:wood"},
2222
{"group:wood", "default:copper_ingot", "group:wood"},
2323
}
2424
})

technic/machines/register/grinder_recipes.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ local recipes = {
1515
{"default:desert_stone", "default:desert_sand"},
1616
{"default:gold_lump", "technic:gold_dust 2"},
1717
{"default:iron_lump", "technic:wrought_iron_dust 2"},
18+
{"default:tin_lump", "technic:tin_dust 2"},
1819
{"technic:chromium_lump", "technic:chromium_dust 2"},
1920
{"technic:uranium_lump", "technic:uranium_dust 2"},
2021
{"technic:zinc_lump", "technic:zinc_dust 2"},
@@ -43,7 +44,6 @@ end
4344
if minetest.get_modpath("moreores") then
4445
table.insert(recipes, {"moreores:mithril_lump", "technic:mithril_dust 2"})
4546
table.insert(recipes, {"moreores:silver_lump", "technic:silver_dust 2"})
46-
table.insert(recipes, {"moreores:tin_lump", "technic:tin_dust 2"})
4747
end
4848

4949
if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then
@@ -94,9 +94,9 @@ register_dust("Gold", "default:gold_ingot")
9494
register_dust("Mithril", "moreores:mithril_ingot")
9595
register_dust("Silver", "moreores:silver_ingot")
9696
register_dust("Stainless Steel", "technic:stainless_steel_ingot")
97-
register_dust("Stone", "default:stone")
97+
register_dust("Stone", "default:stone")
9898
register_dust("Sulfur", nil)
99-
register_dust("Tin", "moreores:tin_ingot")
99+
register_dust("Tin", "default:tin_ingot")
100100
register_dust("Wrought Iron", "technic:wrought_iron_ingot")
101101
register_dust("Zinc", "technic:zinc_ingot")
102102
if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then

technic/radiation.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ local rad_resistance_node = {
5454
["default:lava_source"] = 17,
5555
["default:mese"] = 21,
5656
["default:mossycobble"] = 15,
57+
["default:tinblock"] = 37,
5758
["pbj_pup:pbj_pup"] = 10000,
5859
["pbj_pup:pbj_pup_candies"] = 10000,
5960
["gloopblocks:rainbow_block_diagonal"] = 5000,
@@ -76,6 +77,7 @@ local rad_resistance_node = {
7677
["default:stone_with_gold"] = 34,
7778
["default:stone_with_iron"] = 20,
7879
["default:stone_with_mese"] = 17,
80+
["default:stone_with_tin"] = 19,
7981
["default:stonebrick"] = 17,
8082
["default:water_flowing"] = 2.8,
8183
["default:water_source"] = 5.6,
@@ -141,10 +143,8 @@ local rad_resistance_node = {
141143
["moreblocks:wood_tile_up"] = 1.7,
142144
["moreores:mineral_mithril"] = 18,
143145
["moreores:mineral_silver"] = 21,
144-
["moreores:mineral_tin"] = 19,
145146
["moreores:mithril_block"] = 26,
146147
["moreores:silver_block"] = 53,
147-
["moreores:tin_block"] = 37,
148148
["snow:snow_brick"] = 2.8,
149149
["technic:brass_block"] = 43,
150150
["technic:carbon_steel_block"] = 40,

technic/tools/mining_drill.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local S = technic.getter
66
minetest.register_craft({
77
output = 'technic:mining_drill',
88
recipe = {
9-
{'moreores:tin_ingot', 'technic:diamond_drill_head', 'moreores:tin_ingot'},
9+
{'default:tin_ingot', 'technic:diamond_drill_head', 'default:tin_ingot'},
1010
{'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'},
1111
{'', 'technic:red_energy_crystal', 'default:copper_ingot'},
1212
}

0 commit comments

Comments
 (0)