diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua index 2a97954..0bf6fde 100644 --- a/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -175,7 +175,7 @@ if util.k2() then util.add_ingredient("tungsten-carbide", "graphite", 4) util.replace_some_ingredient("kr-s-c-steel-beam", "iron-plate", 4, "graphite", 8) util.replace_some_ingredient("kr-s-c-steel-gear-wheel", "iron-plate", 2, "graphite", 4) -elseif mods.bzfoundry and util.me.foundry_enable() then +elseif mods.bzfoundry2 and util.me.foundry_enable() then util.replace_some_ingredient("steel-plate", "iron-plate", 1, "graphite", 1) util.replace_some_ingredient("tungsten-carbide", "tungsten-plate", 1, "graphite", 1) end diff --git a/carbon-recipe.lua b/carbon-recipe.lua index 2126012..18b023d 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -94,7 +94,7 @@ if not util.me.use_flake_graphite() then type = "recipe", name = "graphite", icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size=128, - category = mods.bzfoundry and "founding" or "crafting", + category = mods.bzfoundry2 and "founding" or "crafting", order = "d[graphite]", enabled = false, energy_required = 0.5, @@ -108,7 +108,7 @@ if not util.me.use_flake_graphite() then type = "recipe", name = "graphite", icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size=128, - category = mods.bzfoundry and "founding" or "crafting", + category = mods.bzfoundry2 and "founding" or "crafting", subgroup = data.raw.item.graphite.subgroup, order = "d[graphite]", enabled = false, diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 18ca3a2..4f82089 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -119,7 +119,7 @@ end util.remove_ingredient("electric-furnace", "cuw") -- support new tungsten -- Vanilla burner phase tweaks -- green circuits after electronics -if not util.k2() and not mods["aai-industry"] and not mods.bzaluminum then +if not util.k2() and not mods["aai-industry"] and not mods.bzaluminum2 then util.replace_ingredient("electric-mining-drill", "electronic-circuit", "copper-cable", 6) -- Most of this can go post 2.0 @@ -151,7 +151,7 @@ end util.add_prerequisite("nanobots", "electronics") -if not mods.bzaluminum then +if not mods.bzaluminum2 then util.replace_ingredients_prior_to("electronics", "electronic-circuit", "copper-cable", 2) end diff --git a/data-util.lua b/data-util.lua index d867278..1433824 100644 --- a/data-util.lua +++ b/data-util.lua @@ -99,7 +99,7 @@ if get_setting("bz-recipe-bypass") then end function util.is_foundry() - return mods.bzfoundry and not me.get_setting("bzfoundry-minimal") + return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal") end function should_force(options) diff --git a/info.json b/info.json index 3cc817e..6c82cf1 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon", - "version": "2.0.20", + "version": "2.0.21", "factorio_version": "2.0", "title": "Graphite & Diamonds", "author": "Brevven", @@ -12,7 +12,7 @@ "? bztitanium", "? bzsilicon", "? bzzirconium", - "? bzfoundry", + "? bzfoundry2", "? space-exploration", "? aai-industry", "? Krastorio2", diff --git a/settings.lua b/settings.lua index 996a706..e125c21 100644 --- a/settings.lua +++ b/settings.lua @@ -62,7 +62,7 @@ if not mods["space-age"] and not mods["rso-mod"] then }, }) end -if mods.bzchlorine then +if mods.bzchlorine2 then data:extend({ { type = "string-setting",