Vitaliy
2018-07-21 d1b54a573c6287ea1d63b9c3f979c39058b1331a
Use tin from MTG instead of `moreores` (#401)

Register tin dust unconditionally
6 files modified
18 ■■■■ changed files
technic/crafts.lua 2 ●●● patch | view | raw | blame | history
technic/machines/register/alloy_recipes.lua 2 ●●● patch | view | raw | blame | history
technic/machines/register/battery_box.lua 2 ●●● patch | view | raw | blame | history
technic/machines/register/grinder_recipes.lua 6 ●●●● patch | view | raw | blame | history
technic/radiation.lua 4 ●●●● patch | view | raw | blame | history
technic/tools/mining_drill.lua 2 ●●● patch | view | raw | blame | history
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'},
    }
})
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},
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"},
    }
})
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
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,
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'},
    }