From 30d3b89193535d81887935183e1ef87e1fe40c5f Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 19 Oct 2025 15:20:29 +0200 Subject: [PATCH 01/11] readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 0106f52..5caf629 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,7 @@ This mod mostly impacts the early game including electronic circuit creation. Wi - [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (Update to 2.0) - [ElAdamo](https://mods.factorio.com/user/ElAdamo) (Gas-fired boiler: code, design, graphics) (code is public domain) - [Sakuro](https://github.com/sakuro) (expand options, icon tweaks) -- [Benjah-bmm27](https://commons.wikimedia.org/wiki/User:Benjah-bmm27) ([Formaldehyde icon](https://commons.wikimedia.org/wiki/File:Formaldehyde-3D-vdW.png), - public domain) +- [Benjah-bmm27](https://commons.wikimedia.org/wiki/User:Benjah-bmm27) ([Formaldehyde icon](https://commons.wikimedia.org/wiki/File:Formaldehyde-3D-vdW.png), public domain) ### Compatibility - [nihilistzsche](https://github.com/nihilistzsche) From 7dead531385eef164daf077ace8ee1148a358c2a Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 19 Oct 2025 15:52:44 +0200 Subject: [PATCH 02/11] Update to bztungsten2 --- bzgas2/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzgas2/info.json b/bzgas2/info.json index 8eb6958..59c0749 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -12,7 +12,7 @@ "? bztitanium >= 2.0.26", "? bzlead >= 2.0.28", "? bzzirconium >= 2.1.13", - "? bztungsten >= 0.6.0", + "? bztungsten2 >= 2.0.0", "? bzcarbon >= 2.0.21", "? bztin >= 2.1.15", "? warptorio2_expansion", From 206aa4614d7fddf363fa2756b50350c4030ac856 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 19 Oct 2025 17:54:11 +0200 Subject: [PATCH 03/11] Update to bzcarbon2 --- bzgas2/data-final-fixes.lua | 4 ++-- bzgas2/info.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bzgas2/data-final-fixes.lua b/bzgas2/data-final-fixes.lua index aa7d6fb..ad08a6f 100644 --- a/bzgas2/data-final-fixes.lua +++ b/bzgas2/data-final-fixes.lua @@ -17,7 +17,7 @@ end -- Vanilla burner phase tweaks -- green circuits after electronics -- Electronic circuit recipe set below in compatibility script -if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and not mods.bzcarbon then +if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and not mods["bzcarbon2"] then util.replace_ingredient("offshore-pump", "electronic-circuit", "copper-cable") util.replace_ingredient("lab", "electronic-circuit", "copper-cable") util.replace_ingredient("electric-mining-drill", "electronic-circuit", "copper-cable", 2, true) @@ -38,7 +38,7 @@ if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and util.set_enabled("inserter", false) util.add_prerequisite("logistic-science-pack", "electronics") end -if not mods.bzaluminum2 and not mods.bzcarbon then +if not mods.bzaluminum2 and not mods["bzcarbon2"] then util.replace_ingredients_prior_to("electronics", "electronic-circuit", "copper-cable", 2) end diff --git a/bzgas2/info.json b/bzgas2/info.json index 59c0749..71cdf45 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -13,7 +13,7 @@ "? bzlead >= 2.0.28", "? bzzirconium >= 2.1.13", "? bztungsten2 >= 2.0.0", - "? bzcarbon >= 2.0.21", + "? bzcarbon2 >= 2.0.22", "? bztin >= 2.1.15", "? warptorio2_expansion", "? space-exploration >= 0.7.34", From da43a2cdb2cd8e8c609839ef5cd3ecfcfd1a06ff Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:23:28 +0200 Subject: [PATCH 04/11] Update to bzlead2 --- bzgas2/info.json | 2 +- bzgas2/prototypes/gas-extractor.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bzgas2/info.json b/bzgas2/info.json index 71cdf45..34ab28d 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -10,7 +10,7 @@ "base >= 2.0.0", "? bzfoundry2 >= 2.0.0", "? bztitanium >= 2.0.26", - "? bzlead >= 2.0.28", + "? bzlead2 >= 2.0.29", "? bzzirconium >= 2.1.13", "? bztungsten2 >= 2.0.0", "? bzcarbon2 >= 2.0.22", diff --git a/bzgas2/prototypes/gas-extractor.lua b/bzgas2/prototypes/gas-extractor.lua index 02f8b15..156b547 100644 --- a/bzgas2/prototypes/gas-extractor.lua +++ b/bzgas2/prototypes/gas-extractor.lua @@ -7,7 +7,7 @@ local ge_ingredients = { {type="item", name="stone-brick", amount=4}, } local ge_prereq = {"automation"} -if mods.bzlead then table.insert(ge_ingredients, {type="item", name="lead-plate", amount=4}) end +if mods["bzlead2"] then table.insert(ge_ingredients, {type="item", name="lead-plate", amount=4}) end if mods.Krastorio2 then table.insert(ge_ingredients, {type="item", name="kr-sand", amount=10}) ge_prereq = {"kr-stone-processing"} From 0767319efd0ed46776d2b4785b849c02aa8b38da Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 21 Oct 2025 14:27:59 +0200 Subject: [PATCH 05/11] Update to bztin2 --- bzgas2/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzgas2/info.json b/bzgas2/info.json index 34ab28d..aa501c4 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -14,7 +14,7 @@ "? bzzirconium >= 2.1.13", "? bztungsten2 >= 2.0.0", "? bzcarbon2 >= 2.0.22", - "? bztin >= 2.1.15", + "? bztin2 >= 2.1.16", "? warptorio2_expansion", "? space-exploration >= 0.7.34", "? aai-industry >= 0.6.13", From b604045779fcf64afa34921a2a06ee66a77644c3 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 21 Oct 2025 14:28:02 +0200 Subject: [PATCH 06/11] Update to bztitanium2 --- bzgas2/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzgas2/info.json b/bzgas2/info.json index aa501c4..c9430be 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -9,7 +9,7 @@ "dependencies": [ "base >= 2.0.0", "? bzfoundry2 >= 2.0.0", - "? bztitanium >= 2.0.26", + "? bztitanium2 >= 2.0.26", "? bzlead2 >= 2.0.29", "? bzzirconium >= 2.1.13", "? bztungsten2 >= 2.0.0", From 824922faf7bbd98d3ca69585df512fdbf4cd884b Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 21 Oct 2025 14:53:05 +0200 Subject: [PATCH 07/11] Update to bzzirconium2 --- bzgas2/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzgas2/info.json b/bzgas2/info.json index c9430be..81f03d7 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -11,7 +11,7 @@ "? bzfoundry2 >= 2.0.0", "? bztitanium2 >= 2.0.26", "? bzlead2 >= 2.0.29", - "? bzzirconium >= 2.1.13", + "? bzzirconium2 >= 2.1.14", "? bztungsten2 >= 2.0.0", "? bzcarbon2 >= 2.0.22", "? bztin2 >= 2.1.16", From c02885c314258e23861926cebfe73cdee2779d49 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 21 Oct 2025 15:59:29 +0200 Subject: [PATCH 08/11] 2.0.1 --- bzgas2/changelog.txt | 5 +++++ bzgas2/info.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bzgas2/changelog.txt b/bzgas2/changelog.txt index db6a1b0..4d308d3 100644 --- a/bzgas2/changelog.txt +++ b/bzgas2/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.1 +Date: 21.10.2025 + Changes: + - Switch to bz mods forks +--------------------------------------------------------------------------------------------------- Version: 2.0.0 Date: 19.10.2025 Changes: diff --git a/bzgas2/info.json b/bzgas2/info.json index 81f03d7..45db26a 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -1,6 +1,6 @@ { "name": "bzgas2", - "version": "2.0.0", + "version": "2.0.1", "factorio_version": "2.0", "title": "Natural Gas", "description": "Adds a natural gas resource, along with early game plastic.", From 159ca3b1c07b8dcec1f929b2516725d196c00040 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 22 Oct 2025 23:03:09 +0200 Subject: [PATCH 09/11] Fix booleans being strings --- bzgas2/data-util.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bzgas2/data-util.lua b/bzgas2/data-util.lua index 3825ac6..ff75c36 100644 --- a/bzgas2/data-util.lua +++ b/bzgas2/data-util.lua @@ -1188,8 +1188,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 858d7d4f209d162789b27996c23d0871fc13e38c Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 22 Oct 2025 23:03:34 +0200 Subject: [PATCH 10/11] Fix bakelite prerequisite if foundry is present --- bzgas2/prototypes/bakelite.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bzgas2/prototypes/bakelite.lua b/bzgas2/prototypes/bakelite.lua index 5018dd3..83a7a9d 100644 --- a/bzgas2/prototypes/bakelite.lua +++ b/bzgas2/prototypes/bakelite.lua @@ -1,10 +1,5 @@ local util = require("data-util"); -b_prereq = {"basic-chemistry"} -if data.raw.technology["foundry"] then - table.insert(b_prereq, "foundry") -end - data:extend({ { type = "item", @@ -35,7 +30,7 @@ data:extend({ name = "bakelite", icon = "__bzgas2__/graphics/technology/bakelite.png", icon_size = 256, - prerequisites = b_prereq, + prerequisites = {"basic-chemistry"}, effects = { {type = "unlock-recipe", recipe = "bakelite"}, }, From 9ea99b716c21538309e6dac5977c2617882c67ad Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 22 Oct 2025 23:14:42 +0200 Subject: [PATCH 11/11] 2.0.2 --- bzgas2/changelog.txt | 5 +++++ bzgas2/info.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bzgas2/changelog.txt b/bzgas2/changelog.txt index 4d308d3..42c0650 100644 --- a/bzgas2/changelog.txt +++ b/bzgas2/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.2 +Date: 22.10.2025 + Bug Fixes: + - Fix bakelite prerequisite if foundry is present +--------------------------------------------------------------------------------------------------- Version: 2.0.1 Date: 21.10.2025 Changes: diff --git a/bzgas2/info.json b/bzgas2/info.json index 45db26a..ebae08f 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -1,6 +1,6 @@ { "name": "bzgas2", - "version": "2.0.1", + "version": "2.0.2", "factorio_version": "2.0", "title": "Natural Gas", "description": "Adds a natural gas resource, along with early game plastic.",