From 06b4bcf2ec23a57484a97fc853eae489554358a9 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 21 Oct 2025 14:28:47 +0200 Subject: [PATCH 1/6] Update to bztitanium2 --- bzcarbon2/carbon-recipe-updates.lua | 2 +- bzcarbon2/info.json | 2 +- bzcarbon2/prototypes/activated-carbon.lua | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bzcarbon2/carbon-recipe-updates.lua b/bzcarbon2/carbon-recipe-updates.lua index 0bf6fde..e46c3ec 100644 --- a/bzcarbon2/carbon-recipe-updates.lua +++ b/bzcarbon2/carbon-recipe-updates.lua @@ -107,7 +107,7 @@ if util.me.use_carbon_black() then util.add_product("coal-liquefaction", util.item("carbon-black", 1)) --K2 - if mods.bztitanium then + if mods["bztitanium2"] then util.add_ingredient("kr-black-reinforced-plate", "carbon-black", 5) util.add_ingredient("kr-white-reinforced-plate", "titanium-plate", 1) end diff --git a/bzcarbon2/info.json b/bzcarbon2/info.json index 6f3159a..5e2f147 100644 --- a/bzcarbon2/info.json +++ b/bzcarbon2/info.json @@ -8,7 +8,7 @@ "homepage": "https://discord.gg/ufvFUJtVwk", "dependencies": [ "base >= 2.0.42", - "? bztitanium", + "? bztitanium2", "? bzsilicon", "? bzzirconium", "? bzfoundry2", diff --git a/bzcarbon2/prototypes/activated-carbon.lua b/bzcarbon2/prototypes/activated-carbon.lua index 67774c8..63b4a59 100644 --- a/bzcarbon2/prototypes/activated-carbon.lua +++ b/bzcarbon2/prototypes/activated-carbon.lua @@ -24,7 +24,7 @@ if mods["wood-industry"] then precursor = "charcoal" end { util.item(precursor), util.fluid("steam"), - (mods.bztitanium or mods.bzzirconium) and util.fluid("vacuum") or nil + (mods["bztitanium2"] or mods.bzzirconium) and util.fluid("vacuum") or nil }, results = { {type="item", name= "activated-carbon", amount=1}, @@ -49,7 +49,7 @@ if mods["wood-industry"] then precursor = "charcoal" end { util.item("carbon-black", 5), util.fluid("steam"), - (mods.bztitanium or mods.bzzirconium) and util.fluid("vacuum") or nil + (mods["bztitanium2"] or mods.bzzirconium) and util.fluid("vacuum") or nil }, results = { {type="item", name= "activated-carbon", amount=1}, From e9d2283c2033f500be2888376cab908a030d52bd Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 21 Oct 2025 14:28:54 +0200 Subject: [PATCH 2/6] Update to bzsilicon2 --- bzcarbon2/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzcarbon2/info.json b/bzcarbon2/info.json index 5e2f147..469f352 100644 --- a/bzcarbon2/info.json +++ b/bzcarbon2/info.json @@ -9,7 +9,7 @@ "dependencies": [ "base >= 2.0.42", "? bztitanium2", - "? bzsilicon", + "? bzsilicon2", "? bzzirconium", "? bzfoundry2", "? space-exploration", From 4c239ddddceda10abd9f870d4d3791120bee8123 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 21 Oct 2025 14:53:21 +0200 Subject: [PATCH 3/6] Update to bzzirconium2 --- bzcarbon2/info.json | 2 +- bzcarbon2/prototypes/activated-carbon.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bzcarbon2/info.json b/bzcarbon2/info.json index 469f352..18b8a21 100644 --- a/bzcarbon2/info.json +++ b/bzcarbon2/info.json @@ -10,7 +10,7 @@ "base >= 2.0.42", "? bztitanium2", "? bzsilicon2", - "? bzzirconium", + "? bzzirconium2", "? bzfoundry2", "? space-exploration", "? aai-industry", diff --git a/bzcarbon2/prototypes/activated-carbon.lua b/bzcarbon2/prototypes/activated-carbon.lua index 63b4a59..ee34824 100644 --- a/bzcarbon2/prototypes/activated-carbon.lua +++ b/bzcarbon2/prototypes/activated-carbon.lua @@ -24,7 +24,7 @@ if mods["wood-industry"] then precursor = "charcoal" end { util.item(precursor), util.fluid("steam"), - (mods["bztitanium2"] or mods.bzzirconium) and util.fluid("vacuum") or nil + (mods["bztitanium2"] or mods["bzzirconium2"]) and util.fluid("vacuum") or nil }, results = { {type="item", name= "activated-carbon", amount=1}, @@ -49,7 +49,7 @@ if mods["wood-industry"] then precursor = "charcoal" end { util.item("carbon-black", 5), util.fluid("steam"), - (mods["bztitanium2"] or mods.bzzirconium) and util.fluid("vacuum") or nil + (mods["bztitanium2"] or mods["bzzirconium2"]) and util.fluid("vacuum") or nil }, results = { {type="item", name= "activated-carbon", amount=1}, From aa1103ae23d47d4b523429f17cdb82f7514dc5a5 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 21 Oct 2025 15:54:35 +0200 Subject: [PATCH 4/6] 2.0.23 --- bzcarbon2/changelog.txt | 5 +++++ bzcarbon2/info.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bzcarbon2/changelog.txt b/bzcarbon2/changelog.txt index b374cda..478a445 100644 --- a/bzcarbon2/changelog.txt +++ b/bzcarbon2/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.23 +Date: 21.10.2025 + Changes: + - Switch to bz mods forks +--------------------------------------------------------------------------------------------------- Version: 2.0.22 Date: 19.10.2025 Legacy version meant to be played with my other forks and ATOM. diff --git a/bzcarbon2/info.json b/bzcarbon2/info.json index 18b8a21..7885cc2 100644 --- a/bzcarbon2/info.json +++ b/bzcarbon2/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon2", - "version": "2.0.22", + "version": "2.0.23", "factorio_version": "2.0", "title": "Graphite & Diamonds - Legacy", "description": "Adds elemental carbon items to the game, including graphite, diamonds, graphene, and more.", From 1cee258d5639e7069e53bcb933edbdc272751111 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 22 Oct 2025 23:34:34 +0200 Subject: [PATCH 5/6] Fix booleans being strings --- bzcarbon2/data-util.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bzcarbon2/data-util.lua b/bzcarbon2/data-util.lua index 1433824..6f1e7ce 100644 --- a/bzcarbon2/data-util.lua +++ b/bzcarbon2/data-util.lua @@ -1748,8 +1748,8 @@ function util.replace_ingredients_prior_to(tech, old, new, multiplier) end util.remove_prior_unlocks(tech, old) for i, recipe in pairs(data.raw.recipe) do - if (recipe.enabled and recipe.enabled ~= 'false') - and (not recipe.hidden or recipe.hidden == 'true') -- probably don't want to change hidden recipes + if (recipe.enabled and recipe.enabled ~= false) + and (not recipe.hidden or recipe.hidden == true) -- probably don't want to change hidden recipes and string.sub(recipe.name, 1, 3) ~= 'se-' -- have to exlude SE in general :( then -- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :| From d4952e2620669270d322fe7b7ae1f9d57015dad7 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 22 Oct 2025 23:34:50 +0200 Subject: [PATCH 6/6] Fix graphite recipe icon scale --- bzcarbon2/carbon-recipe.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzcarbon2/carbon-recipe.lua b/bzcarbon2/carbon-recipe.lua index f2d3d03..23c10cd 100644 --- a/bzcarbon2/carbon-recipe.lua +++ b/bzcarbon2/carbon-recipe.lua @@ -43,7 +43,7 @@ data:extend({ icons = (util.k2() and { { icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128}, - { icon = "__bzcarbon2__/graphics/icons/flake-graphite.png", icon_size = 128, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzcarbon2__/graphics/icons/flake-graphite.png", icon_size = 128, icon_mipmaps = 3, scale=0.125, shift= {-8, -8}}, } or nil), -- normal = (util.k2() and -- {