diff --git a/bzgold2/info.json b/bzgold2/info.json index 45e138f..0190ad3 100644 --- a/bzgold2/info.json +++ b/bzgold2/info.json @@ -9,12 +9,12 @@ "dependencies": [ "base >= 2.0.0", "? bzfoundry2 >= 2.0.0", - "? bztitanium >= 2.0.26", + "? bztitanium2 >= 2.0.27", "? bzlead2 >= 2.0.29", "? bzzirconium >= 2.1.13", "? bztungsten2 >= 2.0.0", "? bzcarbon2 >= 2.0.22", - "? bztin >= 2.1.15", + "? bztin2 >= 2.1.16", "? bzgas2", "? bzchlorine2", "? 248k-Redux >= 0.1.22", diff --git a/bzgold2/prototypes/catalyst.lua b/bzgold2/prototypes/catalyst.lua index 14e5cb8..2ae5446 100644 --- a/bzgold2/prototypes/catalyst.lua +++ b/bzgold2/prototypes/catalyst.lua @@ -50,7 +50,7 @@ if util.me.catalysis() then local base = "stone" if mods.bzaluminum2 then base = "alumina" - elseif mods.bzsilicon then base = "silica" + elseif mods["bzsilicon2"] then base = "silica" end local fluid = "sulfuric-acid" diff --git a/bzgold2/prototypes/cpu.lua b/bzgold2/prototypes/cpu.lua index 933764c..8cb4611 100644 --- a/bzgold2/prototypes/cpu.lua +++ b/bzgold2/prototypes/cpu.lua @@ -1,7 +1,7 @@ local util = require("data-util"); local silicon = {type="item", name="stone", amount=30} -if mods.bzsilicon then +if mods["bzsilicon2"] then silicon = data.raw.item["silicon-wafer"] and {type="item", name="silicon-wafer", amount=30} or {type="item", name=mods.Krastorio2 and "kr-silicon" or "silicon", amount=15} elseif mods.Krastorio2 then silicon = data.raw.item["silicon-wafer"] and {type="item", name="silicon-wafer", amount=30} or {type="item", name="kr-silicon", amount=15} diff --git a/bzgold2/prototypes/mlcc.lua b/bzgold2/prototypes/mlcc.lua index 2d5b111..f43147a 100644 --- a/bzgold2/prototypes/mlcc.lua +++ b/bzgold2/prototypes/mlcc.lua @@ -9,7 +9,7 @@ elseif mods.bzzirconium then ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="zirconia", amount=2}} elseif mods.bzaluminum2 then ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="alumina", amount=2}} -elseif mods.bzsilicon then +elseif mods["bzsilicon2"] then ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="silica", amount=3}} elseif mods.Krastorio2 then ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="kr-sand", amount=2}} diff --git a/bzgold2/prototypes/palladium.lua b/bzgold2/prototypes/palladium.lua index 9f6d77e..25ba2f0 100644 --- a/bzgold2/prototypes/palladium.lua +++ b/bzgold2/prototypes/palladium.lua @@ -67,7 +67,7 @@ data:extend({ order = "b-b", }, }) -if mods.bztitanium then +if mods["bztitanium2"] then data:extend({ { type = "item", diff --git a/bzgold2/prototypes/recipe-updates.lua b/bzgold2/prototypes/recipe-updates.lua index 89a647f..690c811 100644 --- a/bzgold2/prototypes/recipe-updates.lua +++ b/bzgold2/prototypes/recipe-updates.lua @@ -7,7 +7,7 @@ if mods.Krastorio2 then util.add_product("enriched-copper", {type="item", name="silver-ore", amount=1}) end -if mods.bztitanium then +if mods["bztitanium2"] then util.replace_ingredient("heat-exchanger", util.titanium_plate, "titanium-palladium-flange") util.replace_some_ingredient("steam-turbine", util.titanium_plate, 10, "titanium-palladium-flange", 10) util.replace_some_ingredient("kr-advanced-steam-turbine", util.titanium_plate, 10, "titanium-palladium-flange", 10) diff --git a/bzgold2/prototypes/temperature-sensor.lua b/bzgold2/prototypes/temperature-sensor.lua index 5ae6e9e..16b9daf 100644 --- a/bzgold2/prototypes/temperature-sensor.lua +++ b/bzgold2/prototypes/temperature-sensor.lua @@ -7,7 +7,7 @@ if mods.bzzirconium then base = "zirconia" elseif mods.bzaluminum2 then base = "alumina" -elseif mods.bzsilicon then +elseif mods["bzsilicon2"] then base = "silica" elseif mods.Krastorio2 then base = "kr-glass"