From 0d55409e6496221469ac4809c7062a023f6d2977 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 7 Oct 2025 13:22:24 +0200 Subject: [PATCH 01/10] Fix compatibility with Bio Industries --- me.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/me.lua b/me.lua index bd93651..4e05a87 100644 --- a/me.lua +++ b/me.lua @@ -10,11 +10,11 @@ end function me.more_intermediates() if me.get_setting("bz-all-intermediates") then return true end - return mods["Bio_Industries"] or me.get_setting("bzsilicon-more-intermediates") == "yes" + return mods["Bio_Industries_2"] or me.get_setting("bzsilicon-more-intermediates") == "yes" end function me.use_bio_crushed_stone() - return mods["Bio_Industries"] and me.get_setting("bzsilicon-bio-crushed-stone") == true + return mods["Bio_Industries_2"] and me.get_setting("bzsilicon-bio-crushed-stone") == true end function me.get_setting(name) From 5c588c915e407781f8e13d569721976a3605db60 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 8 Oct 2025 22:25:31 +0200 Subject: [PATCH 02/10] Update dependencies --- info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.json b/info.json index 71ede75..a354f6f 100644 --- a/info.json +++ b/info.json @@ -11,7 +11,7 @@ "? Krastorio2", "? Krastorio2-spaced-out", "? space-exploration", - "? 248k", + "? 248k-Redux", "? aai-industry", "? modmashsplinterelectronics", "? bztitanium", From d23c195fa828d67fc7b7a9309389bcaf797bb80c Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 11 Oct 2025 18:23:07 +0200 Subject: [PATCH 03/10] Mod compatibility fixes --- prototypes/silica-recipe.lua | 9 --------- prototypes/silicon-recipe.lua | 13 ++----------- recipe-updates.lua | 9 +++++---- recipes/silicon-vulcanite.lua | 2 +- 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/prototypes/silica-recipe.lua b/prototypes/silica-recipe.lua index af205c4..8da893d 100644 --- a/prototypes/silica-recipe.lua +++ b/prototypes/silica-recipe.lua @@ -30,15 +30,6 @@ data:extend( allow_productivity = true, ingredients = {util.item("stone-crushed", 4)}, results = {util.item("silica", 5)}, - -- } or mods["aai-industry"] and { - -- type = "recipe", - -- name = "silica", - -- category = mods["space-age"] and "basic-crushing" or "crafting", - -- enabled = false, - -- energy_required = 0.5, - -- allow_productivity = true, - -- ingredients = {util.item("sand", 1)}, - -- results = {util.item("silica", 1)}, } or { type = "recipe", diff --git a/prototypes/silicon-recipe.lua b/prototypes/silicon-recipe.lua index 7b651d6..75e904a 100644 --- a/prototypes/silicon-recipe.lua +++ b/prototypes/silicon-recipe.lua @@ -6,7 +6,7 @@ if util.k2() then util.remove_raw("recipe", "kr-silicon") util.remove_recipe_effect("kr-silicon-processing", "kr-silicon") if mods["Sebs-Electrics"] then - util.add_unlock("kr-silicon-processing", "silicon") + util.add_unlock("kr-silicon-processing", "kr-silicon") end end local prerequisites = {} @@ -40,15 +40,6 @@ data:extend( allow_productivity = true, ingredients = {util.item("silica", 10)}, results = {util.item("silicon", 1)} - -- expensive = - -- { - -- enabled = false, - -- energy_required = 3.2, - -- ingredients = {{"silica", 10}}, - -- result = "silicon", - -- result_count = 1 - -- }, - }, (not util.k2()) and { @@ -209,7 +200,7 @@ if not mods["space-age"] then end end util.add_effect("kr-fluids-chemistry", {type="unlock-recipe", recipe="kr-hydrogen-chloride"}) -util.add_unlock("kr-silicon-processing", "silicon") +util.add_unlock("kr-silicon-processing", mods.Krastorio2 and "kr-silicon" or "silicon") if util.me.more_intermediates() and not mods["space-age"] then diff --git a/recipe-updates.lua b/recipe-updates.lua index 1bcc52c..0988805 100644 --- a/recipe-updates.lua +++ b/recipe-updates.lua @@ -140,7 +140,7 @@ if not util.k2() then else util.add_ingredient("concrete", "silica", 15); if not mods["aai-industry"] then - util.add_ingredient("concrete", "sand", 10); + util.add_ingredient("concrete", "kr-sand", 10); end end @@ -280,11 +280,12 @@ end -- Sand in crusher. If sand comes from stone, silica comes from sand if mods["space-age"] then - if data.raw.item["sand"] and data.raw.recipe["sand"] and #data.raw.recipe["sand"].ingredients == 1 then - data.raw.recipe["sand"].category = "basic-crushing" + local sand = mods["Krastorio2"] and "kr-sand" or "sand" + if data.raw.item[sand] and data.raw.recipe[sand] and #data.raw.recipe[sand].ingredients == 1 then + data.raw.recipe[sand].category = "basic-crushing" log(serpent.block(data.raw.recipe.sand)) if data.raw.recipe.sand.ingredients[1].name == "stone" then - util.replace_ingredient("silica", "stone", "sand", 1) + util.replace_ingredient("silica", "stone", sand, 1) util.set_product_amount("silica", "silica", 1) util.set_recipe_time("silica", 0.5) end diff --git a/recipes/silicon-vulcanite.lua b/recipes/silicon-vulcanite.lua index 19bf8f9..a5da764 100644 --- a/recipes/silicon-vulcanite.lua +++ b/recipes/silicon-vulcanite.lua @@ -22,7 +22,7 @@ if mods["space-exploration"] then if string.sub(mods["space-exploration"], 1, 3) == "0.6" then table.insert(recipe.ingredients, {"kr-coke", 1}) recipe.icons = { - { icon = "__Krastorio2Assets__/icons/items-with-variations/silicon/silicon.png", icon_size = 64}, + { icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64}, { icon = "__space-exploration-graphics__/graphics/icons/fluid/pyroflux.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, } end From 9cf62985ffd20244fd7bc82a2bfd7bdee6a29f6b Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 13 Oct 2025 17:39:06 +0200 Subject: [PATCH 04/10] Fix some SE conditions --- recipes/silicon-vulcanite.lua | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/recipes/silicon-vulcanite.lua b/recipes/silicon-vulcanite.lua index a5da764..36eceb0 100644 --- a/recipes/silicon-vulcanite.lua +++ b/recipes/silicon-vulcanite.lua @@ -1,7 +1,7 @@ local util = require("data-util"); if mods["space-exploration"] then - if string.sub(mods["space-exploration"], 1, 3) == "0.6" and data.raw["item-subgroup"]["stone"] then + if data.raw["item-subgroup"]["stone"] then util.set_item_subgroup("silica", "stone") util.set_item_subgroup("silicon", "stone") util.set_subgroup("silicon", "stone") @@ -11,21 +11,18 @@ if mods["space-exploration"] then local recipe = data.raw.recipe["se-kr-silicon-with-vulcanite"] recipe.ingredients = { {type="item", name="silica", amount=18}, - string.sub(mods["space-exploration"], 1, 3) == "0.6" and - {type="fluid", name="se-pyroflux", amount=10} or {type="item", name="se-vulcanite-block", amount=1}, + {type="fluid", name="se-pyroflux", amount=10}, } recipe.category = "smelting" -- now uses pyroflux so can't be kiln in se 0.6 recipe.energy_required=21.6 recipe.results = { {type="item", name = "kr-silicon", amount = 6}, } - if string.sub(mods["space-exploration"], 1, 3) == "0.6" then - table.insert(recipe.ingredients, {"kr-coke", 1}) - recipe.icons = { - { icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64}, - { icon = "__space-exploration-graphics__/graphics/icons/fluid/pyroflux.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, - } - end + table.insert(recipe.ingredients, { type = "item", name = "kr-coke", amount = 1 }) + recipe.icons = { + { icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64}, + { icon = "__space-exploration-graphics__/graphics/icons/fluid/pyroflux.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, + } else se_delivery_cannon_recipes["silicon"] = {name= "silicon"} data:extend({ @@ -40,26 +37,18 @@ if mods["space-exploration"] then allow_as_intermediate = false, ingredients = { {type="item", name = "silica", amount = 20}, - string.sub(mods["space-exploration"], 1, 3) == "0.6" and - {type="fluid", name="se-pyroflux", amount=10} or {type="item", name="se-vulcanite-block", amount=1}, + {type="fluid", name="se-pyroflux", amount=10}, }, results = { {type="item", name = "silicon", amount = 3}, }, icons = { { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64, icon_mipmaps = 3 }, - string.sub(mods["space-exploration"], 1, 3) == "0.6" and - { icon = "__space-exploration-graphics__/graphics/icons/fluid/pyroflux.png", icon_size = 64, scale=0.25, shift= {-10, -10}} or - { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, + { icon = "__space-exploration-graphics__/graphics/icons/fluid/pyroflux.png", icon_size = 64, scale=0.25, shift= {-10, -10}} }, }, }) - if string.sub(mods["space-exploration"], 1, 3) == "0.6" then util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "silicon-smelting-vulcanite"}) util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "silicon-smelting-vulcanite"}) - else - table.insert(data.raw.technology["se-processing-vulcanite"].effects, - {type = "unlock-recipe", recipe= "silicon-smelting-vulcanite"}) - end end end From 27e33afa952f3609026a6be0f64c8d8b5b972506 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:35:00 +0200 Subject: [PATCH 05/10] Update bz mods to version 2 --- data-util.lua | 2 +- prototypes/gyro.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data-util.lua b/data-util.lua index ddf7a5d..f608af9 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/prototypes/gyro.lua b/prototypes/gyro.lua index 5fed8de..364120d 100644 --- a/prototypes/gyro.lua +++ b/prototypes/gyro.lua @@ -9,11 +9,11 @@ gyro_ingredients = { -- outputs 4 util.item(silicon, 4)} gyro_prereqs = {util.me.silicon_processing} -if mods.bzcarbon then +if mods["bzcarbon2"] then table.insert(gyro_ingredients, util.item("diamond", 1)) table.insert(gyro_prereqs, "diamond-processing") end -if mods.bztungsten and not mods["space-age"] then +if mods.bztungsten2 and not mods["space-age"] then table.insert(gyro_ingredients, util.item("tungsten-plate", 1)) table.insert(gyro_prereqs, "tungsten-processing") elseif mods.bztitanium and data.raw.item["titanium-plate"] then From 66e1d9362eec96030ca58ca8558cf940b595b8a3 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:38:48 +0200 Subject: [PATCH 06/10] Restructure repository --- .github/CODEOWNERS | 1 - Makefile | 37 ------------------ LICENSE.md => bzsilicon2/LICENSE.md | 0 changelog.txt => bzsilicon2/changelog.txt | 0 .../compatibility}/248k.lua | 0 .../compatibility}/any-planet-start.lua | 0 .../compatibility}/hot-metals.lua | 0 .../compatibility}/krastorio2.lua | 0 .../control-util.lua | 0 control.lua => bzsilicon2/control.lua | 0 .../data-final-fixes.lua | 0 .../data-updates.lua | 0 data-util.lua => bzsilicon2/data-util.lua | 0 data.lua => bzsilicon2/data.lua | 0 .../deadlock-stacking.lua | 0 .../graphics}/entity/razorgrass-leaves.png | Bin .../graphics}/entity/razorgrass-normal.png | Bin .../graphics}/entity/razorgrass-shadow.png | Bin .../graphics}/entity/razorgrass-shadow2.png | Bin .../graphics}/entity/razorgrass.png | Bin .../graphics}/entity/razorgrass_1.png | Bin .../graphics}/entity/razorgrass_2.png | Bin .../graphics}/entity/razorgrass_3.png | Bin .../graphics}/entity/razorgrass_4.png | Bin .../graphics}/entity/razorgrass_5.png | Bin .../graphics}/entity/razorgrass_6.png | Bin .../graphics}/entity/razorgrass_7.png | Bin .../graphics}/entity/razorgrass_8.png | Bin .../graphics}/icons/Untitled.png | Bin .../graphics}/icons/ash.png | Bin .../graphics}/icons/gyro.png | Bin .../graphics}/icons/optical-fiber.png | Bin .../graphics}/icons/razorgrass-1.png | Bin .../graphics}/icons/razorgrass-2.png | Bin .../graphics}/icons/razorgrass-3.png | Bin .../graphics}/icons/razorgrass-dried-1.png | Bin .../graphics}/icons/razorgrass-dried-2.png | Bin .../graphics}/icons/razorgrass-dried-3.png | Bin .../graphics}/icons/razorgrass-dried.png | Bin .../graphics}/icons/razorgrass-seed-1.png | Bin .../graphics}/icons/razorgrass-seed-2.png | Bin .../graphics}/icons/razorgrass-seed-3.png | Bin .../graphics}/icons/razorgrass-seed.png | Bin .../graphics}/icons/razorgrass.png | Bin .../graphics}/icons/silica.png | Bin .../graphics}/icons/silicon-wafer.png | Bin .../graphics}/icons/silicon.png | Bin .../graphics}/icons/silicone-recipe.png | Bin .../graphics}/icons/silicone.png | Bin .../graphics}/icons/solar-cell.png | Bin .../graphics}/icons/stacked/gyro-stacked.png | Bin .../icons/stacked/optical-fiber-stacked.png | Bin .../icons/stacked/silica-stacked.png | Bin .../icons/stacked/silicon-stacked.png | Bin .../icons/stacked/silicon-wafer-stacked.png | Bin .../icons/stacked/solar-cell-stacked.png | Bin .../graphics}/technology/gyro.png | Bin .../technology/optical-fiber-tech.png | Bin .../technology/razorgrass-unlock.png | Bin .../graphics}/technology/razorgrass.png | Bin .../technology/silica-processing.png | Bin .../technology/silicon-processing.png | Bin info.json => bzsilicon2/info.json | 0 {locale => bzsilicon2/locale}/de/silicon.cfg | 0 {locale => bzsilicon2/locale}/en/silicon.cfg | 0 {locale => bzsilicon2/locale}/ja/silicon.cfg | 0 {locale => bzsilicon2/locale}/ko/silicon.cfg | 0 {locale => bzsilicon2/locale}/pl/silicon.cfg | 0 {locale => bzsilicon2/locale}/ru/silicon.cfg | 0 .../locale}/zh-CN/silicon.cfg | 0 me.lua => bzsilicon2/me.lua | 0 .../prototypes}/basic-crusher.lua | 0 .../prototypes}/cables.lua | 0 .../prototypes}/gyro.lua | 0 .../prototypes}/optical-fiber.lua | 0 .../prototypes}/razorgrass.lua | 0 .../prototypes}/silica-recipe.lua | 0 .../prototypes}/silicon-recipe.lua | 0 .../prototypes}/stone.lua | 0 .../recipe-updates.lua | 0 .../recipes}/silica-matter.lua | 0 .../recipes}/silicon-vulcanite.lua | 0 .../settings-util.lua | 0 settings.lua => bzsilicon2/settings.lua | 0 .../strange-matter.lua | 0 thumbnail.png => bzsilicon2/thumbnail.png | Bin .../graphics}/entity/razorgrass-shadow.xcf | Bin .../graphics}/entity/razorgrass.blend | Bin .../graphics}/entity/razorgrass.blend1 | Bin .../graphics}/entity/razorgrass.xcf | Bin {graphics => sources/graphics}/icons/ash.xcf | Bin {graphics => sources/graphics}/icons/gyro.xcf | Bin .../graphics}/icons/optical-fiber-stacked.xcf | Bin .../graphics}/icons/optical-fiber.xcf | Bin .../graphics}/icons/razorgrass-dried-1.xcf | Bin .../graphics}/icons/razorgrass-dried-2.xcf | Bin .../graphics}/icons/razorgrass-dried-3.xcf | Bin .../graphics}/icons/razorgrass-dried.xcf | Bin .../graphics}/icons/razorgrass-seed-1.xcf | Bin .../graphics}/icons/razorgrass-seed-2.xcf | Bin .../graphics}/icons/razorgrass-seed-3.xcf | Bin .../graphics}/icons/razorgrass-seed.xcf | Bin {graphics => sources/graphics}/icons/sand.xcf | Bin .../graphics}/icons/silica-icon.xcf | Bin .../graphics}/icons/silica-stacked.xcf | Bin .../graphics}/icons/silica.xcf | Bin .../graphics}/icons/silicon-stacked.xcf | Bin .../graphics}/icons/silicon-wafer-stacked.xcf | Bin .../graphics}/icons/silicon-wafer.xcf | Bin .../graphics}/icons/silicon.xcf | Bin .../graphics}/icons/silicone.blend | Bin .../graphics}/icons/silicone.blend1 | Bin .../graphics}/icons/silicone.xcf | Bin .../graphics}/icons/solar-cell-stacked.xcf | Bin .../graphics}/icons/solar-cell.xcf | Bin .../graphics}/icons/stacked/gyro-stacked.xcf | Bin .../graphics}/icons/thumb.xcf | Bin .../technology/razorgrass-unlock.xcf | Bin 118 files changed, 38 deletions(-) delete mode 100644 .github/CODEOWNERS delete mode 100644 Makefile rename LICENSE.md => bzsilicon2/LICENSE.md (100%) rename changelog.txt => bzsilicon2/changelog.txt (100%) rename {compatibility => bzsilicon2/compatibility}/248k.lua (100%) rename {compatibility => bzsilicon2/compatibility}/any-planet-start.lua (100%) rename {compatibility => bzsilicon2/compatibility}/hot-metals.lua (100%) rename {compatibility => bzsilicon2/compatibility}/krastorio2.lua (100%) rename control-util.lua => bzsilicon2/control-util.lua (100%) rename control.lua => bzsilicon2/control.lua (100%) rename data-final-fixes.lua => bzsilicon2/data-final-fixes.lua (100%) rename data-updates.lua => bzsilicon2/data-updates.lua (100%) rename data-util.lua => bzsilicon2/data-util.lua (100%) rename data.lua => bzsilicon2/data.lua (100%) rename deadlock-stacking.lua => bzsilicon2/deadlock-stacking.lua (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass-leaves.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass-normal.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass-shadow.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass-shadow2.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass_1.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass_2.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass_3.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass_4.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass_5.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass_6.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass_7.png (100%) rename {graphics => bzsilicon2/graphics}/entity/razorgrass_8.png (100%) rename {graphics => bzsilicon2/graphics}/icons/Untitled.png (100%) rename {graphics => bzsilicon2/graphics}/icons/ash.png (100%) rename {graphics => bzsilicon2/graphics}/icons/gyro.png (100%) rename {graphics => bzsilicon2/graphics}/icons/optical-fiber.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-1.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-2.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-3.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-dried-1.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-dried-2.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-dried-3.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-dried.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-seed-1.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-seed-2.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-seed-3.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass-seed.png (100%) rename {graphics => bzsilicon2/graphics}/icons/razorgrass.png (100%) rename {graphics => bzsilicon2/graphics}/icons/silica.png (100%) rename {graphics => bzsilicon2/graphics}/icons/silicon-wafer.png (100%) rename {graphics => bzsilicon2/graphics}/icons/silicon.png (100%) rename {graphics => bzsilicon2/graphics}/icons/silicone-recipe.png (100%) rename {graphics => bzsilicon2/graphics}/icons/silicone.png (100%) rename {graphics => bzsilicon2/graphics}/icons/solar-cell.png (100%) rename {graphics => bzsilicon2/graphics}/icons/stacked/gyro-stacked.png (100%) rename {graphics => bzsilicon2/graphics}/icons/stacked/optical-fiber-stacked.png (100%) rename {graphics => bzsilicon2/graphics}/icons/stacked/silica-stacked.png (100%) rename {graphics => bzsilicon2/graphics}/icons/stacked/silicon-stacked.png (100%) rename {graphics => bzsilicon2/graphics}/icons/stacked/silicon-wafer-stacked.png (100%) rename {graphics => bzsilicon2/graphics}/icons/stacked/solar-cell-stacked.png (100%) rename {graphics => bzsilicon2/graphics}/technology/gyro.png (100%) rename {graphics => bzsilicon2/graphics}/technology/optical-fiber-tech.png (100%) rename {graphics => bzsilicon2/graphics}/technology/razorgrass-unlock.png (100%) rename {graphics => bzsilicon2/graphics}/technology/razorgrass.png (100%) rename {graphics => bzsilicon2/graphics}/technology/silica-processing.png (100%) rename {graphics => bzsilicon2/graphics}/technology/silicon-processing.png (100%) rename info.json => bzsilicon2/info.json (100%) rename {locale => bzsilicon2/locale}/de/silicon.cfg (100%) rename {locale => bzsilicon2/locale}/en/silicon.cfg (100%) rename {locale => bzsilicon2/locale}/ja/silicon.cfg (100%) rename {locale => bzsilicon2/locale}/ko/silicon.cfg (100%) rename {locale => bzsilicon2/locale}/pl/silicon.cfg (100%) rename {locale => bzsilicon2/locale}/ru/silicon.cfg (100%) rename {locale => bzsilicon2/locale}/zh-CN/silicon.cfg (100%) rename me.lua => bzsilicon2/me.lua (100%) rename {prototypes => bzsilicon2/prototypes}/basic-crusher.lua (100%) rename {prototypes => bzsilicon2/prototypes}/cables.lua (100%) rename {prototypes => bzsilicon2/prototypes}/gyro.lua (100%) rename {prototypes => bzsilicon2/prototypes}/optical-fiber.lua (100%) rename {prototypes => bzsilicon2/prototypes}/razorgrass.lua (100%) rename {prototypes => bzsilicon2/prototypes}/silica-recipe.lua (100%) rename {prototypes => bzsilicon2/prototypes}/silicon-recipe.lua (100%) rename {prototypes => bzsilicon2/prototypes}/stone.lua (100%) rename recipe-updates.lua => bzsilicon2/recipe-updates.lua (100%) rename {recipes => bzsilicon2/recipes}/silica-matter.lua (100%) rename {recipes => bzsilicon2/recipes}/silicon-vulcanite.lua (100%) rename settings-util.lua => bzsilicon2/settings-util.lua (100%) rename settings.lua => bzsilicon2/settings.lua (100%) rename strange-matter.lua => bzsilicon2/strange-matter.lua (100%) rename thumbnail.png => bzsilicon2/thumbnail.png (100%) rename {graphics => sources/graphics}/entity/razorgrass-shadow.xcf (100%) rename {graphics => sources/graphics}/entity/razorgrass.blend (100%) rename {graphics => sources/graphics}/entity/razorgrass.blend1 (100%) rename {graphics => sources/graphics}/entity/razorgrass.xcf (100%) rename {graphics => sources/graphics}/icons/ash.xcf (100%) rename {graphics => sources/graphics}/icons/gyro.xcf (100%) rename {graphics => sources/graphics}/icons/optical-fiber-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/optical-fiber.xcf (100%) rename {graphics => sources/graphics}/icons/razorgrass-dried-1.xcf (100%) rename {graphics => sources/graphics}/icons/razorgrass-dried-2.xcf (100%) rename {graphics => sources/graphics}/icons/razorgrass-dried-3.xcf (100%) rename {graphics => sources/graphics}/icons/razorgrass-dried.xcf (100%) rename {graphics => sources/graphics}/icons/razorgrass-seed-1.xcf (100%) rename {graphics => sources/graphics}/icons/razorgrass-seed-2.xcf (100%) rename {graphics => sources/graphics}/icons/razorgrass-seed-3.xcf (100%) rename {graphics => sources/graphics}/icons/razorgrass-seed.xcf (100%) rename {graphics => sources/graphics}/icons/sand.xcf (100%) rename {graphics => sources/graphics}/icons/silica-icon.xcf (100%) rename {graphics => sources/graphics}/icons/silica-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/silica.xcf (100%) rename {graphics => sources/graphics}/icons/silicon-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/silicon-wafer-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/silicon-wafer.xcf (100%) rename {graphics => sources/graphics}/icons/silicon.xcf (100%) rename {graphics => sources/graphics}/icons/silicone.blend (100%) rename {graphics => sources/graphics}/icons/silicone.blend1 (100%) rename {graphics => sources/graphics}/icons/silicone.xcf (100%) rename {graphics => sources/graphics}/icons/solar-cell-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/solar-cell.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/gyro-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/thumb.xcf (100%) rename {graphics => sources/graphics}/technology/razorgrass-unlock.xcf (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index e04c9b6..0000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* brevven diff --git a/Makefile b/Makefile deleted file mode 100644 index 11be59f..0000000 --- a/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# General makefile for factorio mods. -# -# Presumes the development work is done in a /dev// -# directory where this makefile resides. This directory must be parallel to -# the /mods/ directory where mods are installed. Run `make -# install` from dev/ to install the mod as a zip file. That zip file -# should also be ready to upload to the mod portal - -.PHONY: copy lint-changelog install - -libdir = "../bzlib" -libfiles = $(shell ls $(libdir)/*.lua | grep -o '[^/]*.lua') -pwd = $(shell pwd) -v = $(shell basename "$(pwd)")_$(shell jq -r .version info.json) - -link: - for f in $(libfiles) ; do \ - echo "using $(libdir)/$$f" ;\ - cp $(libdir)/$$f .; \ - done; - -copy: link - rm -rf ../$(v) - mkdir -p ../$(v) - cp -rf * ../$(v) - rm -f ../$(v).zip - cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" -x "*.blend*" - -install: lint-changelog copy - cp -f ../$(v).zip ../../mods/ - -lint-changelog: copy - python3 ../da-changelog-tools_0.0.14/changelog-checker.py --changelog ../$(v).zip - -zorro: - python3 ../da-changelog-tools_0.0.14/changelog-checker.py --zorro --changelog ../$(v).zip - diff --git a/LICENSE.md b/bzsilicon2/LICENSE.md similarity index 100% rename from LICENSE.md rename to bzsilicon2/LICENSE.md diff --git a/changelog.txt b/bzsilicon2/changelog.txt similarity index 100% rename from changelog.txt rename to bzsilicon2/changelog.txt diff --git a/compatibility/248k.lua b/bzsilicon2/compatibility/248k.lua similarity index 100% rename from compatibility/248k.lua rename to bzsilicon2/compatibility/248k.lua diff --git a/compatibility/any-planet-start.lua b/bzsilicon2/compatibility/any-planet-start.lua similarity index 100% rename from compatibility/any-planet-start.lua rename to bzsilicon2/compatibility/any-planet-start.lua diff --git a/compatibility/hot-metals.lua b/bzsilicon2/compatibility/hot-metals.lua similarity index 100% rename from compatibility/hot-metals.lua rename to bzsilicon2/compatibility/hot-metals.lua diff --git a/compatibility/krastorio2.lua b/bzsilicon2/compatibility/krastorio2.lua similarity index 100% rename from compatibility/krastorio2.lua rename to bzsilicon2/compatibility/krastorio2.lua diff --git a/control-util.lua b/bzsilicon2/control-util.lua similarity index 100% rename from control-util.lua rename to bzsilicon2/control-util.lua diff --git a/control.lua b/bzsilicon2/control.lua similarity index 100% rename from control.lua rename to bzsilicon2/control.lua diff --git a/data-final-fixes.lua b/bzsilicon2/data-final-fixes.lua similarity index 100% rename from data-final-fixes.lua rename to bzsilicon2/data-final-fixes.lua diff --git a/data-updates.lua b/bzsilicon2/data-updates.lua similarity index 100% rename from data-updates.lua rename to bzsilicon2/data-updates.lua diff --git a/data-util.lua b/bzsilicon2/data-util.lua similarity index 100% rename from data-util.lua rename to bzsilicon2/data-util.lua diff --git a/data.lua b/bzsilicon2/data.lua similarity index 100% rename from data.lua rename to bzsilicon2/data.lua diff --git a/deadlock-stacking.lua b/bzsilicon2/deadlock-stacking.lua similarity index 100% rename from deadlock-stacking.lua rename to bzsilicon2/deadlock-stacking.lua diff --git a/graphics/entity/razorgrass-leaves.png b/bzsilicon2/graphics/entity/razorgrass-leaves.png similarity index 100% rename from graphics/entity/razorgrass-leaves.png rename to bzsilicon2/graphics/entity/razorgrass-leaves.png diff --git a/graphics/entity/razorgrass-normal.png b/bzsilicon2/graphics/entity/razorgrass-normal.png similarity index 100% rename from graphics/entity/razorgrass-normal.png rename to bzsilicon2/graphics/entity/razorgrass-normal.png diff --git a/graphics/entity/razorgrass-shadow.png b/bzsilicon2/graphics/entity/razorgrass-shadow.png similarity index 100% rename from graphics/entity/razorgrass-shadow.png rename to bzsilicon2/graphics/entity/razorgrass-shadow.png diff --git a/graphics/entity/razorgrass-shadow2.png b/bzsilicon2/graphics/entity/razorgrass-shadow2.png similarity index 100% rename from graphics/entity/razorgrass-shadow2.png rename to bzsilicon2/graphics/entity/razorgrass-shadow2.png diff --git a/graphics/entity/razorgrass.png b/bzsilicon2/graphics/entity/razorgrass.png similarity index 100% rename from graphics/entity/razorgrass.png rename to bzsilicon2/graphics/entity/razorgrass.png diff --git a/graphics/entity/razorgrass_1.png b/bzsilicon2/graphics/entity/razorgrass_1.png similarity index 100% rename from graphics/entity/razorgrass_1.png rename to bzsilicon2/graphics/entity/razorgrass_1.png diff --git a/graphics/entity/razorgrass_2.png b/bzsilicon2/graphics/entity/razorgrass_2.png similarity index 100% rename from graphics/entity/razorgrass_2.png rename to bzsilicon2/graphics/entity/razorgrass_2.png diff --git a/graphics/entity/razorgrass_3.png b/bzsilicon2/graphics/entity/razorgrass_3.png similarity index 100% rename from graphics/entity/razorgrass_3.png rename to bzsilicon2/graphics/entity/razorgrass_3.png diff --git a/graphics/entity/razorgrass_4.png b/bzsilicon2/graphics/entity/razorgrass_4.png similarity index 100% rename from graphics/entity/razorgrass_4.png rename to bzsilicon2/graphics/entity/razorgrass_4.png diff --git a/graphics/entity/razorgrass_5.png b/bzsilicon2/graphics/entity/razorgrass_5.png similarity index 100% rename from graphics/entity/razorgrass_5.png rename to bzsilicon2/graphics/entity/razorgrass_5.png diff --git a/graphics/entity/razorgrass_6.png b/bzsilicon2/graphics/entity/razorgrass_6.png similarity index 100% rename from graphics/entity/razorgrass_6.png rename to bzsilicon2/graphics/entity/razorgrass_6.png diff --git a/graphics/entity/razorgrass_7.png b/bzsilicon2/graphics/entity/razorgrass_7.png similarity index 100% rename from graphics/entity/razorgrass_7.png rename to bzsilicon2/graphics/entity/razorgrass_7.png diff --git a/graphics/entity/razorgrass_8.png b/bzsilicon2/graphics/entity/razorgrass_8.png similarity index 100% rename from graphics/entity/razorgrass_8.png rename to bzsilicon2/graphics/entity/razorgrass_8.png diff --git a/graphics/icons/Untitled.png b/bzsilicon2/graphics/icons/Untitled.png similarity index 100% rename from graphics/icons/Untitled.png rename to bzsilicon2/graphics/icons/Untitled.png diff --git a/graphics/icons/ash.png b/bzsilicon2/graphics/icons/ash.png similarity index 100% rename from graphics/icons/ash.png rename to bzsilicon2/graphics/icons/ash.png diff --git a/graphics/icons/gyro.png b/bzsilicon2/graphics/icons/gyro.png similarity index 100% rename from graphics/icons/gyro.png rename to bzsilicon2/graphics/icons/gyro.png diff --git a/graphics/icons/optical-fiber.png b/bzsilicon2/graphics/icons/optical-fiber.png similarity index 100% rename from graphics/icons/optical-fiber.png rename to bzsilicon2/graphics/icons/optical-fiber.png diff --git a/graphics/icons/razorgrass-1.png b/bzsilicon2/graphics/icons/razorgrass-1.png similarity index 100% rename from graphics/icons/razorgrass-1.png rename to bzsilicon2/graphics/icons/razorgrass-1.png diff --git a/graphics/icons/razorgrass-2.png b/bzsilicon2/graphics/icons/razorgrass-2.png similarity index 100% rename from graphics/icons/razorgrass-2.png rename to bzsilicon2/graphics/icons/razorgrass-2.png diff --git a/graphics/icons/razorgrass-3.png b/bzsilicon2/graphics/icons/razorgrass-3.png similarity index 100% rename from graphics/icons/razorgrass-3.png rename to bzsilicon2/graphics/icons/razorgrass-3.png diff --git a/graphics/icons/razorgrass-dried-1.png b/bzsilicon2/graphics/icons/razorgrass-dried-1.png similarity index 100% rename from graphics/icons/razorgrass-dried-1.png rename to bzsilicon2/graphics/icons/razorgrass-dried-1.png diff --git a/graphics/icons/razorgrass-dried-2.png b/bzsilicon2/graphics/icons/razorgrass-dried-2.png similarity index 100% rename from graphics/icons/razorgrass-dried-2.png rename to bzsilicon2/graphics/icons/razorgrass-dried-2.png diff --git a/graphics/icons/razorgrass-dried-3.png b/bzsilicon2/graphics/icons/razorgrass-dried-3.png similarity index 100% rename from graphics/icons/razorgrass-dried-3.png rename to bzsilicon2/graphics/icons/razorgrass-dried-3.png diff --git a/graphics/icons/razorgrass-dried.png b/bzsilicon2/graphics/icons/razorgrass-dried.png similarity index 100% rename from graphics/icons/razorgrass-dried.png rename to bzsilicon2/graphics/icons/razorgrass-dried.png diff --git a/graphics/icons/razorgrass-seed-1.png b/bzsilicon2/graphics/icons/razorgrass-seed-1.png similarity index 100% rename from graphics/icons/razorgrass-seed-1.png rename to bzsilicon2/graphics/icons/razorgrass-seed-1.png diff --git a/graphics/icons/razorgrass-seed-2.png b/bzsilicon2/graphics/icons/razorgrass-seed-2.png similarity index 100% rename from graphics/icons/razorgrass-seed-2.png rename to bzsilicon2/graphics/icons/razorgrass-seed-2.png diff --git a/graphics/icons/razorgrass-seed-3.png b/bzsilicon2/graphics/icons/razorgrass-seed-3.png similarity index 100% rename from graphics/icons/razorgrass-seed-3.png rename to bzsilicon2/graphics/icons/razorgrass-seed-3.png diff --git a/graphics/icons/razorgrass-seed.png b/bzsilicon2/graphics/icons/razorgrass-seed.png similarity index 100% rename from graphics/icons/razorgrass-seed.png rename to bzsilicon2/graphics/icons/razorgrass-seed.png diff --git a/graphics/icons/razorgrass.png b/bzsilicon2/graphics/icons/razorgrass.png similarity index 100% rename from graphics/icons/razorgrass.png rename to bzsilicon2/graphics/icons/razorgrass.png diff --git a/graphics/icons/silica.png b/bzsilicon2/graphics/icons/silica.png similarity index 100% rename from graphics/icons/silica.png rename to bzsilicon2/graphics/icons/silica.png diff --git a/graphics/icons/silicon-wafer.png b/bzsilicon2/graphics/icons/silicon-wafer.png similarity index 100% rename from graphics/icons/silicon-wafer.png rename to bzsilicon2/graphics/icons/silicon-wafer.png diff --git a/graphics/icons/silicon.png b/bzsilicon2/graphics/icons/silicon.png similarity index 100% rename from graphics/icons/silicon.png rename to bzsilicon2/graphics/icons/silicon.png diff --git a/graphics/icons/silicone-recipe.png b/bzsilicon2/graphics/icons/silicone-recipe.png similarity index 100% rename from graphics/icons/silicone-recipe.png rename to bzsilicon2/graphics/icons/silicone-recipe.png diff --git a/graphics/icons/silicone.png b/bzsilicon2/graphics/icons/silicone.png similarity index 100% rename from graphics/icons/silicone.png rename to bzsilicon2/graphics/icons/silicone.png diff --git a/graphics/icons/solar-cell.png b/bzsilicon2/graphics/icons/solar-cell.png similarity index 100% rename from graphics/icons/solar-cell.png rename to bzsilicon2/graphics/icons/solar-cell.png diff --git a/graphics/icons/stacked/gyro-stacked.png b/bzsilicon2/graphics/icons/stacked/gyro-stacked.png similarity index 100% rename from graphics/icons/stacked/gyro-stacked.png rename to bzsilicon2/graphics/icons/stacked/gyro-stacked.png diff --git a/graphics/icons/stacked/optical-fiber-stacked.png b/bzsilicon2/graphics/icons/stacked/optical-fiber-stacked.png similarity index 100% rename from graphics/icons/stacked/optical-fiber-stacked.png rename to bzsilicon2/graphics/icons/stacked/optical-fiber-stacked.png diff --git a/graphics/icons/stacked/silica-stacked.png b/bzsilicon2/graphics/icons/stacked/silica-stacked.png similarity index 100% rename from graphics/icons/stacked/silica-stacked.png rename to bzsilicon2/graphics/icons/stacked/silica-stacked.png diff --git a/graphics/icons/stacked/silicon-stacked.png b/bzsilicon2/graphics/icons/stacked/silicon-stacked.png similarity index 100% rename from graphics/icons/stacked/silicon-stacked.png rename to bzsilicon2/graphics/icons/stacked/silicon-stacked.png diff --git a/graphics/icons/stacked/silicon-wafer-stacked.png b/bzsilicon2/graphics/icons/stacked/silicon-wafer-stacked.png similarity index 100% rename from graphics/icons/stacked/silicon-wafer-stacked.png rename to bzsilicon2/graphics/icons/stacked/silicon-wafer-stacked.png diff --git a/graphics/icons/stacked/solar-cell-stacked.png b/bzsilicon2/graphics/icons/stacked/solar-cell-stacked.png similarity index 100% rename from graphics/icons/stacked/solar-cell-stacked.png rename to bzsilicon2/graphics/icons/stacked/solar-cell-stacked.png diff --git a/graphics/technology/gyro.png b/bzsilicon2/graphics/technology/gyro.png similarity index 100% rename from graphics/technology/gyro.png rename to bzsilicon2/graphics/technology/gyro.png diff --git a/graphics/technology/optical-fiber-tech.png b/bzsilicon2/graphics/technology/optical-fiber-tech.png similarity index 100% rename from graphics/technology/optical-fiber-tech.png rename to bzsilicon2/graphics/technology/optical-fiber-tech.png diff --git a/graphics/technology/razorgrass-unlock.png b/bzsilicon2/graphics/technology/razorgrass-unlock.png similarity index 100% rename from graphics/technology/razorgrass-unlock.png rename to bzsilicon2/graphics/technology/razorgrass-unlock.png diff --git a/graphics/technology/razorgrass.png b/bzsilicon2/graphics/technology/razorgrass.png similarity index 100% rename from graphics/technology/razorgrass.png rename to bzsilicon2/graphics/technology/razorgrass.png diff --git a/graphics/technology/silica-processing.png b/bzsilicon2/graphics/technology/silica-processing.png similarity index 100% rename from graphics/technology/silica-processing.png rename to bzsilicon2/graphics/technology/silica-processing.png diff --git a/graphics/technology/silicon-processing.png b/bzsilicon2/graphics/technology/silicon-processing.png similarity index 100% rename from graphics/technology/silicon-processing.png rename to bzsilicon2/graphics/technology/silicon-processing.png diff --git a/info.json b/bzsilicon2/info.json similarity index 100% rename from info.json rename to bzsilicon2/info.json diff --git a/locale/de/silicon.cfg b/bzsilicon2/locale/de/silicon.cfg similarity index 100% rename from locale/de/silicon.cfg rename to bzsilicon2/locale/de/silicon.cfg diff --git a/locale/en/silicon.cfg b/bzsilicon2/locale/en/silicon.cfg similarity index 100% rename from locale/en/silicon.cfg rename to bzsilicon2/locale/en/silicon.cfg diff --git a/locale/ja/silicon.cfg b/bzsilicon2/locale/ja/silicon.cfg similarity index 100% rename from locale/ja/silicon.cfg rename to bzsilicon2/locale/ja/silicon.cfg diff --git a/locale/ko/silicon.cfg b/bzsilicon2/locale/ko/silicon.cfg similarity index 100% rename from locale/ko/silicon.cfg rename to bzsilicon2/locale/ko/silicon.cfg diff --git a/locale/pl/silicon.cfg b/bzsilicon2/locale/pl/silicon.cfg similarity index 100% rename from locale/pl/silicon.cfg rename to bzsilicon2/locale/pl/silicon.cfg diff --git a/locale/ru/silicon.cfg b/bzsilicon2/locale/ru/silicon.cfg similarity index 100% rename from locale/ru/silicon.cfg rename to bzsilicon2/locale/ru/silicon.cfg diff --git a/locale/zh-CN/silicon.cfg b/bzsilicon2/locale/zh-CN/silicon.cfg similarity index 100% rename from locale/zh-CN/silicon.cfg rename to bzsilicon2/locale/zh-CN/silicon.cfg diff --git a/me.lua b/bzsilicon2/me.lua similarity index 100% rename from me.lua rename to bzsilicon2/me.lua diff --git a/prototypes/basic-crusher.lua b/bzsilicon2/prototypes/basic-crusher.lua similarity index 100% rename from prototypes/basic-crusher.lua rename to bzsilicon2/prototypes/basic-crusher.lua diff --git a/prototypes/cables.lua b/bzsilicon2/prototypes/cables.lua similarity index 100% rename from prototypes/cables.lua rename to bzsilicon2/prototypes/cables.lua diff --git a/prototypes/gyro.lua b/bzsilicon2/prototypes/gyro.lua similarity index 100% rename from prototypes/gyro.lua rename to bzsilicon2/prototypes/gyro.lua diff --git a/prototypes/optical-fiber.lua b/bzsilicon2/prototypes/optical-fiber.lua similarity index 100% rename from prototypes/optical-fiber.lua rename to bzsilicon2/prototypes/optical-fiber.lua diff --git a/prototypes/razorgrass.lua b/bzsilicon2/prototypes/razorgrass.lua similarity index 100% rename from prototypes/razorgrass.lua rename to bzsilicon2/prototypes/razorgrass.lua diff --git a/prototypes/silica-recipe.lua b/bzsilicon2/prototypes/silica-recipe.lua similarity index 100% rename from prototypes/silica-recipe.lua rename to bzsilicon2/prototypes/silica-recipe.lua diff --git a/prototypes/silicon-recipe.lua b/bzsilicon2/prototypes/silicon-recipe.lua similarity index 100% rename from prototypes/silicon-recipe.lua rename to bzsilicon2/prototypes/silicon-recipe.lua diff --git a/prototypes/stone.lua b/bzsilicon2/prototypes/stone.lua similarity index 100% rename from prototypes/stone.lua rename to bzsilicon2/prototypes/stone.lua diff --git a/recipe-updates.lua b/bzsilicon2/recipe-updates.lua similarity index 100% rename from recipe-updates.lua rename to bzsilicon2/recipe-updates.lua diff --git a/recipes/silica-matter.lua b/bzsilicon2/recipes/silica-matter.lua similarity index 100% rename from recipes/silica-matter.lua rename to bzsilicon2/recipes/silica-matter.lua diff --git a/recipes/silicon-vulcanite.lua b/bzsilicon2/recipes/silicon-vulcanite.lua similarity index 100% rename from recipes/silicon-vulcanite.lua rename to bzsilicon2/recipes/silicon-vulcanite.lua diff --git a/settings-util.lua b/bzsilicon2/settings-util.lua similarity index 100% rename from settings-util.lua rename to bzsilicon2/settings-util.lua diff --git a/settings.lua b/bzsilicon2/settings.lua similarity index 100% rename from settings.lua rename to bzsilicon2/settings.lua diff --git a/strange-matter.lua b/bzsilicon2/strange-matter.lua similarity index 100% rename from strange-matter.lua rename to bzsilicon2/strange-matter.lua diff --git a/thumbnail.png b/bzsilicon2/thumbnail.png similarity index 100% rename from thumbnail.png rename to bzsilicon2/thumbnail.png diff --git a/graphics/entity/razorgrass-shadow.xcf b/sources/graphics/entity/razorgrass-shadow.xcf similarity index 100% rename from graphics/entity/razorgrass-shadow.xcf rename to sources/graphics/entity/razorgrass-shadow.xcf diff --git a/graphics/entity/razorgrass.blend b/sources/graphics/entity/razorgrass.blend similarity index 100% rename from graphics/entity/razorgrass.blend rename to sources/graphics/entity/razorgrass.blend diff --git a/graphics/entity/razorgrass.blend1 b/sources/graphics/entity/razorgrass.blend1 similarity index 100% rename from graphics/entity/razorgrass.blend1 rename to sources/graphics/entity/razorgrass.blend1 diff --git a/graphics/entity/razorgrass.xcf b/sources/graphics/entity/razorgrass.xcf similarity index 100% rename from graphics/entity/razorgrass.xcf rename to sources/graphics/entity/razorgrass.xcf diff --git a/graphics/icons/ash.xcf b/sources/graphics/icons/ash.xcf similarity index 100% rename from graphics/icons/ash.xcf rename to sources/graphics/icons/ash.xcf diff --git a/graphics/icons/gyro.xcf b/sources/graphics/icons/gyro.xcf similarity index 100% rename from graphics/icons/gyro.xcf rename to sources/graphics/icons/gyro.xcf diff --git a/graphics/icons/optical-fiber-stacked.xcf b/sources/graphics/icons/optical-fiber-stacked.xcf similarity index 100% rename from graphics/icons/optical-fiber-stacked.xcf rename to sources/graphics/icons/optical-fiber-stacked.xcf diff --git a/graphics/icons/optical-fiber.xcf b/sources/graphics/icons/optical-fiber.xcf similarity index 100% rename from graphics/icons/optical-fiber.xcf rename to sources/graphics/icons/optical-fiber.xcf diff --git a/graphics/icons/razorgrass-dried-1.xcf b/sources/graphics/icons/razorgrass-dried-1.xcf similarity index 100% rename from graphics/icons/razorgrass-dried-1.xcf rename to sources/graphics/icons/razorgrass-dried-1.xcf diff --git a/graphics/icons/razorgrass-dried-2.xcf b/sources/graphics/icons/razorgrass-dried-2.xcf similarity index 100% rename from graphics/icons/razorgrass-dried-2.xcf rename to sources/graphics/icons/razorgrass-dried-2.xcf diff --git a/graphics/icons/razorgrass-dried-3.xcf b/sources/graphics/icons/razorgrass-dried-3.xcf similarity index 100% rename from graphics/icons/razorgrass-dried-3.xcf rename to sources/graphics/icons/razorgrass-dried-3.xcf diff --git a/graphics/icons/razorgrass-dried.xcf b/sources/graphics/icons/razorgrass-dried.xcf similarity index 100% rename from graphics/icons/razorgrass-dried.xcf rename to sources/graphics/icons/razorgrass-dried.xcf diff --git a/graphics/icons/razorgrass-seed-1.xcf b/sources/graphics/icons/razorgrass-seed-1.xcf similarity index 100% rename from graphics/icons/razorgrass-seed-1.xcf rename to sources/graphics/icons/razorgrass-seed-1.xcf diff --git a/graphics/icons/razorgrass-seed-2.xcf b/sources/graphics/icons/razorgrass-seed-2.xcf similarity index 100% rename from graphics/icons/razorgrass-seed-2.xcf rename to sources/graphics/icons/razorgrass-seed-2.xcf diff --git a/graphics/icons/razorgrass-seed-3.xcf b/sources/graphics/icons/razorgrass-seed-3.xcf similarity index 100% rename from graphics/icons/razorgrass-seed-3.xcf rename to sources/graphics/icons/razorgrass-seed-3.xcf diff --git a/graphics/icons/razorgrass-seed.xcf b/sources/graphics/icons/razorgrass-seed.xcf similarity index 100% rename from graphics/icons/razorgrass-seed.xcf rename to sources/graphics/icons/razorgrass-seed.xcf diff --git a/graphics/icons/sand.xcf b/sources/graphics/icons/sand.xcf similarity index 100% rename from graphics/icons/sand.xcf rename to sources/graphics/icons/sand.xcf diff --git a/graphics/icons/silica-icon.xcf b/sources/graphics/icons/silica-icon.xcf similarity index 100% rename from graphics/icons/silica-icon.xcf rename to sources/graphics/icons/silica-icon.xcf diff --git a/graphics/icons/silica-stacked.xcf b/sources/graphics/icons/silica-stacked.xcf similarity index 100% rename from graphics/icons/silica-stacked.xcf rename to sources/graphics/icons/silica-stacked.xcf diff --git a/graphics/icons/silica.xcf b/sources/graphics/icons/silica.xcf similarity index 100% rename from graphics/icons/silica.xcf rename to sources/graphics/icons/silica.xcf diff --git a/graphics/icons/silicon-stacked.xcf b/sources/graphics/icons/silicon-stacked.xcf similarity index 100% rename from graphics/icons/silicon-stacked.xcf rename to sources/graphics/icons/silicon-stacked.xcf diff --git a/graphics/icons/silicon-wafer-stacked.xcf b/sources/graphics/icons/silicon-wafer-stacked.xcf similarity index 100% rename from graphics/icons/silicon-wafer-stacked.xcf rename to sources/graphics/icons/silicon-wafer-stacked.xcf diff --git a/graphics/icons/silicon-wafer.xcf b/sources/graphics/icons/silicon-wafer.xcf similarity index 100% rename from graphics/icons/silicon-wafer.xcf rename to sources/graphics/icons/silicon-wafer.xcf diff --git a/graphics/icons/silicon.xcf b/sources/graphics/icons/silicon.xcf similarity index 100% rename from graphics/icons/silicon.xcf rename to sources/graphics/icons/silicon.xcf diff --git a/graphics/icons/silicone.blend b/sources/graphics/icons/silicone.blend similarity index 100% rename from graphics/icons/silicone.blend rename to sources/graphics/icons/silicone.blend diff --git a/graphics/icons/silicone.blend1 b/sources/graphics/icons/silicone.blend1 similarity index 100% rename from graphics/icons/silicone.blend1 rename to sources/graphics/icons/silicone.blend1 diff --git a/graphics/icons/silicone.xcf b/sources/graphics/icons/silicone.xcf similarity index 100% rename from graphics/icons/silicone.xcf rename to sources/graphics/icons/silicone.xcf diff --git a/graphics/icons/solar-cell-stacked.xcf b/sources/graphics/icons/solar-cell-stacked.xcf similarity index 100% rename from graphics/icons/solar-cell-stacked.xcf rename to sources/graphics/icons/solar-cell-stacked.xcf diff --git a/graphics/icons/solar-cell.xcf b/sources/graphics/icons/solar-cell.xcf similarity index 100% rename from graphics/icons/solar-cell.xcf rename to sources/graphics/icons/solar-cell.xcf diff --git a/graphics/icons/stacked/gyro-stacked.xcf b/sources/graphics/icons/stacked/gyro-stacked.xcf similarity index 100% rename from graphics/icons/stacked/gyro-stacked.xcf rename to sources/graphics/icons/stacked/gyro-stacked.xcf diff --git a/graphics/icons/thumb.xcf b/sources/graphics/icons/thumb.xcf similarity index 100% rename from graphics/icons/thumb.xcf rename to sources/graphics/icons/thumb.xcf diff --git a/graphics/technology/razorgrass-unlock.xcf b/sources/graphics/technology/razorgrass-unlock.xcf similarity index 100% rename from graphics/technology/razorgrass-unlock.xcf rename to sources/graphics/technology/razorgrass-unlock.xcf From 5353386560fd1d03470940073fc1039fa5fc627c Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:39:52 +0200 Subject: [PATCH 07/10] gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 723ef36..85e49ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +*.zip \ No newline at end of file From 7c4d7ca57932951224101e3b75e9a4c959005820 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:47:26 +0200 Subject: [PATCH 08/10] Rename mod --- bzsilicon2/compatibility/hot-metals.lua | 4 +- bzsilicon2/data-final-fixes.lua | 2 +- bzsilicon2/deadlock-stacking.lua | 14 +++---- bzsilicon2/info.json | 3 +- bzsilicon2/me.lua | 2 +- bzsilicon2/prototypes/gyro.lua | 4 +- bzsilicon2/prototypes/optical-fiber.lua | 6 +-- bzsilicon2/prototypes/razorgrass.lua | 50 ++++++++++++------------ bzsilicon2/prototypes/silica-recipe.lua | 8 ++-- bzsilicon2/prototypes/silicon-recipe.lua | 12 +++--- bzsilicon2/recipes/silicon-vulcanite.lua | 2 +- bzsilicon2/strange-matter.lua | 4 +- 12 files changed, 55 insertions(+), 56 deletions(-) diff --git a/bzsilicon2/compatibility/hot-metals.lua b/bzsilicon2/compatibility/hot-metals.lua index 31dde6b..c5875e8 100644 --- a/bzsilicon2/compatibility/hot-metals.lua +++ b/bzsilicon2/compatibility/hot-metals.lua @@ -1,8 +1,8 @@ local util = require("data-util") util.add_hot_metals({ {name="silicon", icons={ - { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64}, - { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64, tint={.9,.3,0, .5}}, + { icon = "__bzsilicon2__/graphics/icons/silicon.png", icon_size = 64}, + { icon = "__bzsilicon2__/graphics/icons/silicon.png", icon_size = 64, tint={.9,.3,0, .5}}, }}, }) diff --git a/bzsilicon2/data-final-fixes.lua b/bzsilicon2/data-final-fixes.lua index cc11835..c18bd81 100644 --- a/bzsilicon2/data-final-fixes.lua +++ b/bzsilicon2/data-final-fixes.lua @@ -1,6 +1,6 @@ require("deadlock-stacking") -local util = require("__bzsilicon__.data-util"); +local util = require("data-util"); -- Mod Mash Splinter Electronics if mods.modmashsplinterelectronics then diff --git a/bzsilicon2/deadlock-stacking.lua b/bzsilicon2/deadlock-stacking.lua index 5dd9319..1299320 100644 --- a/bzsilicon2/deadlock-stacking.lua +++ b/bzsilicon2/deadlock-stacking.lua @@ -1,18 +1,18 @@ -- Deadlock stacking recipes -local util = require("__bzsilicon__.data-util"); +local util = require("data-util"); if deadlock and deadlock["add_stack"] then - deadlock.add_stack("silica", "__bzsilicon__/graphics/icons/stacked/silica-stacked.png" , "deadlock-stacking-1", 64) - deadlock.add_stack("optical-fiber", "__bzsilicon__/graphics/icons/stacked/optical-fiber-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("silica", "__bzsilicon2__/graphics/icons/stacked/silica-stacked.png" , "deadlock-stacking-1", 64) + deadlock.add_stack("optical-fiber", "__bzsilicon2__/graphics/icons/stacked/optical-fiber-stacked.png" , "deadlock-stacking-2", 64) if not util.k2() then - deadlock.add_stack("silicon", "__bzsilicon__/graphics/icons/stacked/silicon-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("silicon", "__bzsilicon2__/graphics/icons/stacked/silicon-stacked.png" , "deadlock-stacking-2", 64) end if util.me.more_intermediates() then - deadlock.add_stack("silicon-wafer", "__bzsilicon__/graphics/icons/stacked/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64) - deadlock.add_stack("solar-cell", "__bzsilicon__/graphics/icons/stacked/solar-cell-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("silicon-wafer", "__bzsilicon2__/graphics/icons/stacked/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("solar-cell", "__bzsilicon2__/graphics/icons/stacked/solar-cell-stacked.png" , "deadlock-stacking-2", 64) end if util.me.use_gyros() then - deadlock.add_stack("gyro", "__bzsilicon__/graphics/icons/stacked/gyro-stacked.png", "deadlock-stacking-3", 128) + deadlock.add_stack("gyro", "__bzsilicon2__/graphics/icons/stacked/gyro-stacked.png", "deadlock-stacking-3", 128) end end diff --git a/bzsilicon2/info.json b/bzsilicon2/info.json index a354f6f..867fe37 100644 --- a/bzsilicon2/info.json +++ b/bzsilicon2/info.json @@ -1,5 +1,5 @@ { - "name": "bzsilicon", + "name": "bzsilicon2", "version": "2.0.16", "factorio_version": "2.0", "title": "Silica & Silicon", @@ -18,6 +18,5 @@ "(?) IndustrialRevolution", "base" ], - "description": "Adds silica, silicon, and basic fiber optics to the game. Compatible with Space Age including a new plant & production chain on Gleba.\n\nA standalone piece of BZ Mods, with graphics by snouz." } diff --git a/bzsilicon2/me.lua b/bzsilicon2/me.lua index 4e05a87..41e6d9b 100644 --- a/bzsilicon2/me.lua +++ b/bzsilicon2/me.lua @@ -1,5 +1,5 @@ local me = {} -me.name = "bzsilicon" +me.name = "bzsilicon2" me.resources = {{"razorgrass-plant", "gleba"}} me.silicon_processing = (mods and data.raw.technology["kr-silicon-processing"] and "kr-silicon-processing") or "silicon-processing" me.recipes = {"silica", "silicon", "optical-fiber", "silicon-wafer", "solar-cell", "gyro", "silicon-smelting-vulcanite"} diff --git a/bzsilicon2/prototypes/gyro.lua b/bzsilicon2/prototypes/gyro.lua index 364120d..fa63616 100644 --- a/bzsilicon2/prototypes/gyro.lua +++ b/bzsilicon2/prototypes/gyro.lua @@ -28,7 +28,7 @@ data:extend({ { type = "item", name = "gyro", - icon = "__bzsilicon__/graphics/icons/gyro.png", + icon = "__bzsilicon2__/graphics/icons/gyro.png", icon_size = 128, inventory_move_sound = item_sounds.electric_small_inventory_move, pick_sound = item_sounds.electric_small_inventory_pickup, @@ -53,7 +53,7 @@ data:extend({ type = "technology", name = "gyro", icon_size = 256, - icon = "__bzsilicon__/graphics/technology/gyro.png", + icon = "__bzsilicon2__/graphics/technology/gyro.png", effects = {{type = "unlock-recipe", recipe="gyro"}}, unit = { diff --git a/bzsilicon2/prototypes/optical-fiber.lua b/bzsilicon2/prototypes/optical-fiber.lua index 8896afc..5d19140 100644 --- a/bzsilicon2/prototypes/optical-fiber.lua +++ b/bzsilicon2/prototypes/optical-fiber.lua @@ -1,12 +1,12 @@ -- Optical Fiber -local util = require("__bzsilicon__.data-util"); +local util = require("data-util"); local item_sounds = require('__base__.prototypes.item_sounds') data:extend( { { type = "item", name = "optical-fiber", - icon = "__bzsilicon__/graphics/icons/optical-fiber.png", + icon = "__bzsilicon2__/graphics/icons/optical-fiber.png", icon_size = 64, icon_mipmaps = 3, inventory_move_sound = item_sounds.wire_inventory_move, pick_sound = item_sounds.wire_inventory_pickup, @@ -34,7 +34,7 @@ data:extend( { type = "technology", name = "fiber-optics", - icon = "__bzsilicon__/graphics/technology/optical-fiber-tech.png", + icon = "__bzsilicon2__/graphics/technology/optical-fiber-tech.png", icon_size = 256, icon_mipmaps = 4, effects = { diff --git a/bzsilicon2/prototypes/razorgrass.lua b/bzsilicon2/prototypes/razorgrass.lua index 888382d..803c5f8 100644 --- a/bzsilicon2/prototypes/razorgrass.lua +++ b/bzsilicon2/prototypes/razorgrass.lua @@ -22,7 +22,7 @@ local function razorgrass_variations() local sy = math.floor((i-1)/per_row) * width -- Shadow images are rotated local variation = { trunk = { - filename = "__bzsilicon__/graphics/entity/razorgrass.png", + filename = "__bzsilicon2__/graphics/entity/razorgrass.png", flags = { "mipmap" }, surface = "gleba", width = width, @@ -34,7 +34,7 @@ local function razorgrass_variations() scale = 0.33 * scale_multiplier }, leaves = { - filename = "__bzsilicon__/graphics/entity/razorgrass-leaves.png", + filename = "__bzsilicon2__/graphics/entity/razorgrass-leaves.png", flags = { "mipmap" }, surface = "gleba", width = width, @@ -46,7 +46,7 @@ local function razorgrass_variations() scale = 0.33 * scale_multiplier }, normal = { - filename = "__bzsilicon__/graphics/entity/razorgrass-normal.png", + filename = "__bzsilicon2__/graphics/entity/razorgrass-normal.png", surface = "gleba", width = width, height = height, @@ -64,8 +64,8 @@ local function razorgrass_variations() surface = "gleba", filenames = { - "__bzsilicon__/graphics/entity/razorgrass-shadow.png", - "__bzsilicon__/graphics/entity/razorgrass-shadow2.png", + "__bzsilicon2__/graphics/entity/razorgrass-shadow.png", + "__bzsilicon2__/graphics/entity/razorgrass-shadow2.png", }, width = height, --shadows are rotated height = width, --shadows are rotated @@ -122,7 +122,7 @@ data:extend({ { type = "plant", name = "razorgrass-plant", --silica - icon = "__bzsilicon__/graphics/technology/razorgrass.png", + icon = "__bzsilicon2__/graphics/technology/razorgrass.png", icon_size = 256, growth_ticks = 5 * 60 * 60, agricultural_tower_tint = {primary = {.2, .7, .7}, secondary = {.4, .9, .9}}, @@ -216,7 +216,7 @@ data:extend({ type = "technology", name = "razorgrass", icon_size = 256, - icon = "__bzsilicon__/graphics/technology/razorgrass.png", + icon = "__bzsilicon2__/graphics/technology/razorgrass.png", effects = util.me.more_intermediates() and { { type = "unlock-recipe", recipe = "silicone", }, { type = "unlock-recipe", recipe = "razorgrass-dried", }, @@ -236,13 +236,13 @@ data:extend({ { type = "item", name = "razorgrass", - icon = "__bzsilicon__/graphics/icons/razorgrass.png", + icon = "__bzsilicon2__/graphics/icons/razorgrass.png", icon_size = 128, pictures = { - {filename="__bzsilicon__/graphics/icons/razorgrass.png", size=128, scale=.3}, - {filename="__bzsilicon__/graphics/icons/razorgrass-1.png", size=128, scale=.3}, - {filename="__bzsilicon__/graphics/icons/razorgrass-2.png", size=128, scale=.3}, - {filename="__bzsilicon__/graphics/icons/razorgrass-3.png", size=128, scale=.3}, + {filename="__bzsilicon2__/graphics/icons/razorgrass.png", size=128, scale=.3}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-1.png", size=128, scale=.3}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-2.png", size=128, scale=.3}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-3.png", size=128, scale=.3}, }, inventory_move_sound = space_age_item_sounds.agriculture_inventory_move, pick_sound = space_age_item_sounds.agriculture_inventory_pickup, @@ -260,13 +260,13 @@ data:extend({ { type = "item", name = "razorgrass-dried", - icon = "__bzsilicon__/graphics/icons/razorgrass-dried.png", + icon = "__bzsilicon2__/graphics/icons/razorgrass-dried.png", icon_size = 128, pictures = { - {filename="__bzsilicon__/graphics/icons/razorgrass-dried.png", size=128, scale=.3}, - {filename="__bzsilicon__/graphics/icons/razorgrass-dried-1.png", size=128, scale=.3}, - {filename="__bzsilicon__/graphics/icons/razorgrass-dried-2.png", size=128, scale=.3}, - {filename="__bzsilicon__/graphics/icons/razorgrass-dried-3.png", size=128, scale=.3}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-dried.png", size=128, scale=.3}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-dried-1.png", size=128, scale=.3}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-dried-2.png", size=128, scale=.3}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-dried-3.png", size=128, scale=.3}, }, inventory_move_sound = space_age_item_sounds.agriculture_inventory_move, pick_sound = space_age_item_sounds.agriculture_inventory_pickup, @@ -283,7 +283,7 @@ data:extend({ { type = "item", name = "razorgrass-ash", - icon = "__bzsilicon__/graphics/icons/ash.png", + icon = "__bzsilicon2__/graphics/icons/ash.png", icon_size = 64, inventory_move_sound = item_sounds.sulfur_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, @@ -314,8 +314,8 @@ data:extend({ type = "recipe", name = "razorgrass-ash-washing", icons = { - { icon = "__bzsilicon__/graphics/icons/ash.png", icon_size = 64, scale=0.5, shift = {-4,-4}}, - { icon = "__bzsilicon__/graphics/icons/silica.png", icon_size = 64, scale=0.25, shift={8, 8}}, + { icon = "__bzsilicon2__/graphics/icons/ash.png", icon_size = 64, scale=0.5, shift = {-4,-4}}, + { icon = "__bzsilicon2__/graphics/icons/silica.png", icon_size = 64, scale=0.25, shift={8, 8}}, }, subgroup = "agriculture-processes", category = "chemistry", @@ -334,15 +334,15 @@ data:extend({ { type = "item", name = "razorgrass-seed", - icon = "__bzsilicon__/graphics/icons/razorgrass-seed.png", + icon = "__bzsilicon2__/graphics/icons/razorgrass-seed.png", icon_size = 128, localised_name = {"item-name.razorgrass-seed"}, localised_description = {"item-description.razorgrass-seed"}, pictures = { - {filename="__bzsilicon__/graphics/icons/razorgrass-seed.png", size=128, scale=.25}, - {filename="__bzsilicon__/graphics/icons/razorgrass-seed-1.png", size=128, scale=.25}, - {filename="__bzsilicon__/graphics/icons/razorgrass-seed-2.png", size=128, scale=.25}, - {filename="__bzsilicon__/graphics/icons/razorgrass-seed-3.png", size=128, scale=.25}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-seed.png", size=128, scale=.25}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-seed-1.png", size=128, scale=.25}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-seed-2.png", size=128, scale=.25}, + {filename="__bzsilicon2__/graphics/icons/razorgrass-seed-3.png", size=128, scale=.25}, }, subgroup = "agriculture-processes", order = "a[seeds]-r[razorgrass-seed]", diff --git a/bzsilicon2/prototypes/silica-recipe.lua b/bzsilicon2/prototypes/silica-recipe.lua index 8da893d..c53817c 100644 --- a/bzsilicon2/prototypes/silica-recipe.lua +++ b/bzsilicon2/prototypes/silica-recipe.lua @@ -1,5 +1,5 @@ -- Silica -local util = require("__bzsilicon__.data-util"); +local util = require("data-util"); local item_sounds = require('__base__.prototypes.item_sounds') data:extend( { @@ -52,7 +52,7 @@ data:extend( { type = "item", name = "silica", - icon = "__bzsilicon__/graphics/icons/silica.png", + icon = "__bzsilicon2__/graphics/icons/silica.png", icon_size = 64, icon_mipmaps = 3, inventory_move_sound = item_sounds.sulfur_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, @@ -66,7 +66,7 @@ data:extend( type = "technology", name = "silica-processing", icon_size = 256, icon_mipmaps = 4, - icon = "__bzsilicon__/graphics/technology/silica-processing.png", + icon = "__bzsilicon2__/graphics/technology/silica-processing.png", effects = { { @@ -95,7 +95,7 @@ data:extend( type = "technology", name = "silica-processing", icon_size = 256, icon_mipmaps = 4, - icon = "__bzsilicon__/graphics/technology/silica-processing.png", + icon = "__bzsilicon2__/graphics/technology/silica-processing.png", prerequisites = {"logistic-science-pack"}, effects = { diff --git a/bzsilicon2/prototypes/silicon-recipe.lua b/bzsilicon2/prototypes/silicon-recipe.lua index 75e904a..1438107 100644 --- a/bzsilicon2/prototypes/silicon-recipe.lua +++ b/bzsilicon2/prototypes/silicon-recipe.lua @@ -45,7 +45,7 @@ data:extend( { type = "item", name = "silicon", - icon = "__bzsilicon__/graphics/icons/silicon.png", + icon = "__bzsilicon2__/graphics/icons/silicon.png", icon_size = 64, icon_mipmaps = 3, inventory_move_sound = item_sounds.sulfur_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, @@ -60,7 +60,7 @@ data:extend( type = "technology", name = "silicon-processing", icon_size = 256, icon_mipmaps = 4, - icon = "__bzsilicon__/graphics/technology/silicon-processing.png", + icon = "__bzsilicon2__/graphics/technology/silicon-processing.png", effects = { { @@ -93,7 +93,7 @@ data:extend({ { type = "item", name = "silicon-wafer", - icon = "__bzsilicon__/graphics/icons/silicon-wafer.png", + icon = "__bzsilicon2__/graphics/icons/silicon-wafer.png", icon_size = 64, icon_mipmaps = 3, inventory_move_sound = item_sounds.electric_small_inventory_move, pick_sound = item_sounds.electric_small_inventory_pickup, @@ -123,7 +123,7 @@ data:extend({ { type = "item", name = "silicone", - icon = "__bzsilicon__/graphics/icons/silicone.png", + icon = "__bzsilicon2__/graphics/icons/silicone.png", icon_size = 64, subgroup = "intermediate-product", stack_size = util.get_stack_size(100), @@ -133,7 +133,7 @@ data:extend({ { type = "recipe", name = "silicone", - icon = "__bzsilicon__/graphics/icons/silicone-recipe.png", + icon = "__bzsilicon2__/graphics/icons/silicone-recipe.png", icon_size = 128, subgroup = "intermediate-product", category = mods["space-age"] and "organic-or-chemistry" or "crafting-with-fluid", @@ -150,7 +150,7 @@ data:extend({ { type = "item", name = "solar-cell", - icon = "__bzsilicon__/graphics/icons/solar-cell.png", + icon = "__bzsilicon2__/graphics/icons/solar-cell.png", icon_size = 64, icon_mipmaps = 3, inventory_move_sound = item_sounds.electric_small_inventory_move, pick_sound = item_sounds.electric_small_inventory_pickup, diff --git a/bzsilicon2/recipes/silicon-vulcanite.lua b/bzsilicon2/recipes/silicon-vulcanite.lua index 36eceb0..d871b2e 100644 --- a/bzsilicon2/recipes/silicon-vulcanite.lua +++ b/bzsilicon2/recipes/silicon-vulcanite.lua @@ -43,7 +43,7 @@ if mods["space-exploration"] then {type="item", name = "silicon", amount = 3}, }, icons = { - { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64, icon_mipmaps = 3 }, + { icon = "__bzsilicon2__/graphics/icons/silicon.png", icon_size = 64, icon_mipmaps = 3 }, { icon = "__space-exploration-graphics__/graphics/icons/fluid/pyroflux.png", icon_size = 64, scale=0.25, shift= {-10, -10}} }, }, diff --git a/bzsilicon2/strange-matter.lua b/bzsilicon2/strange-matter.lua index e81ae92..f90925e 100644 --- a/bzsilicon2/strange-matter.lua +++ b/bzsilicon2/strange-matter.lua @@ -1,8 +1,8 @@ -local util = require("__bzsilicon__.data-util"); +local util = require("data-util"); local ore = "silica" -local ore_icon = "__bzsilicon__/graphics/icons/silica.png" +local ore_icon = "__bzsilicon2__/graphics/icons/silica.png" if mods["StrangeMatter"] then data:extend({ From 5b7a58e0db2984ef8f10bcb843b60dabf817d74e Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:48:05 +0200 Subject: [PATCH 09/10] editorconfig --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..bbf3e21 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +[*] +indent_style = space +indent_size = 2 \ No newline at end of file From 4adafd5fe7f5992f9c7401b4e28affc2fc325a61 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:50:42 +0200 Subject: [PATCH 10/10] info/readme/changelog --- README.md | 20 +- bzsilicon2/changelog.txt | 434 +-------------------------------------- bzsilicon2/info.json | 38 ++-- 3 files changed, 33 insertions(+), 459 deletions(-) diff --git a/README.md b/README.md index c8a99bc..02dbf61 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,21 @@ -# [Silica & Silicon](https://mods.factorio.com/mod/bzsilicon) +**This is an unofficial forked version and it stays until Brevven takes over again.** -Mod for Factorio, adds a simple "Vanilla+" version of Silica and Silicon to the game with some fiber optics and optional intermediates. -Doesn't require or any new buildings. +**Compatibility with Space Age is explicitly excluded. Stick to the original mod for Space Age.** +# Silica & Silicon +Adds Silica, Silicon, and some basic Fiber Optics to the game, with an option for more intermediates including silicon wafers, silicone and more. On Nauvis, this all derives from stone, and the amount of stone is increased by default. In Space Age, stone can be crushed to silica, and a new plant called Razorgrass is added along with a new silica production chain for Gleba. -## Version History -See changelog. +This mod is more complex than Titanium, Lead or Tin, and should play well with any or all of them. -## Created by - -- [brevven](https://mods.factorio.com/user/brevven) (code, design, graphics) +## Credits +- Brevven ([Original mod](https://mods.factorio.com/mod/bzsilicon)) +- [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (mod integrations and maintenance) - [snouz](https://github.com/snouz) (graphics) - -### Thanks to - [GeneralTank](https://mods.factorio.com/user/GeneralTank) (compatibility for stacking and crating, design contributions) - [ZombieMooose](https://mods.factorio.com/user/ZombieMooose) (design contributions) - [nihilistzsche](https://github.com/nihilistzsche) (compatibility) - ### Localization - Thanks to - [yokmp](https://mods.factorio.com/user/yokmp) (de) - [Spectrus1702](https://github.com/Spectrus1702) (ru) diff --git a/bzsilicon2/changelog.txt b/bzsilicon2/changelog.txt index d45c13e..b520415 100644 --- a/bzsilicon2/changelog.txt +++ b/bzsilicon2/changelog.txt @@ -1,429 +1,7 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.16 -Date: 2025-06-15 - Fixes: - - Krastorio2 & Spaced Out: Fix soft lock on circuits introduced in 2.0 updates - - Fix load error with certain loadouts, especially with K2SO ---------------------------------------------------------------------------------------------------- -Version: 2.0.15 -Date: 2025-05-04 - Changes: - - Krastorio2 spaced out support - - Minor K2 integration tweaks ---------------------------------------------------------------------------------------------------- -Version: 2.0.14 -Date: 2025-05-03 - Fixes: - - Fix possible load issues with Bob's - Changes: - - K2 compatibility updates, thanks to autechr3 & pla ---------------------------------------------------------------------------------------------------- -Version: 2.0.13 -Date: 2025-04-08 - Changes: - - Improve compatibility with Ash mod ---------------------------------------------------------------------------------------------------- -Version: 2.0.12 -Date: 2025-04-08 - Changes: - - Improve compatbility with Crushing Industry ---------------------------------------------------------------------------------------------------- -Version: 2.0.11 -Date: 2025-03-23 - Fixes: - - Fix when used without space age. ---------------------------------------------------------------------------------------------------- -Version: 2.0.10 -Date: 2025-03-22 - Changes: - - Set inventory sounds for some items - Fixes: - - Loads with Crafting Efficiency - - Improved compatibility with Muluna ---------------------------------------------------------------------------------------------------- -Version: 2.0.9 -Date: 2025-03-21 - Fixes: - - Fix startup crash introduced in Factorio 2.0.42 ---------------------------------------------------------------------------------------------------- -Version: 2.0.8 -Date: 2025-03-11 - Fixes: - - Improve compatibility with glass: silica comes from sand when generic sand is available. - - Minor locale fixes - Changes: - - Make wafers in smaller batches (ratio unchanged) ---------------------------------------------------------------------------------------------------- -Version: 2.0.7 -Date: 2025-03-03 - Fixes: - - Fix Tier 1 module recipes to all require silicon, when wafers are not enabled. - - Space Age: When enabled, add a handcrafting recipe for silicon wafers - - Fix for infinite loop with certain mod loadouts (mostly during mod dev). - - Other minor fixes ---------------------------------------------------------------------------------------------------- -Version: 2.0.6 -Date: 2025-01-29 - Changes: - - Changes to Any Planet Start progression - - Maraxsis: Can make silica from sand, silica is used for glass on Maraxsis. - Fixes: - - Fix razorgrass regenerate ---------------------------------------------------------------------------------------------------- -Version: 2.0.5 -Date: 2025-01-25 - Fixes: - - Improve compatibility with mods that modify armor recipes in certain ways ---------------------------------------------------------------------------------------------------- -Version: 2.0.4 -Date: 2025-01-16 - Changes: - - Player can plant razorgrass by hand on appropriate tiles. - - Stop adding extra decoratives. ---------------------------------------------------------------------------------------------------- -Version: 2.0.3 -Date: 2025-01-14 - Changes: - - Fix /bz-regenerate command when not using Space Age ---------------------------------------------------------------------------------------------------- -Version: 2.0.2 -Date: 2025-01-09 - Changes: - - With AAI Industry, unlock crusher with sand, slight change to tech tree ---------------------------------------------------------------------------------------------------- -Version: 2.0.1 -Date: 2025-01-07 - Changes: - - In Space Age, modded sand (eg in AAI Industry) will now be created in basic crusher - Fixes: - - Attempted fix for crash with a large suite of mods, one of which seems to set a "deadlock" global variable ---------------------------------------------------------------------------------------------------- -Version: 2.0.0 -Date: 2025-01-06 - Changes: - - Compatible with 2.0 and Space Age - - More intermediate recipes setting now only has yes/no options. - - Changes to silicon wafers - - New intermediate when setting is active: silicone. Silicone is handled a bit differently between vanilla and Space Age. - - With space age enabled, add a small crusher for making silica directly from stone. - - New plant for Space Age, Razorgrass. Used in silica production chain on Gleba. (Can use command "/bz-regenerate gleba razorgrass" when adding to existing game) - - Recipe for making extra stone on Vulcanus. ---------------------------------------------------------------------------------------------------- -Version: 0.11.12 -Date: 2024-01-13 - Localization: - - pl updates, thanks to S3BA ---------------------------------------------------------------------------------------------------- -Version: 0.11.11 -Date: 2023-04-23 - Fixes: - - Fix some typos - Changes: - - K2: Silica matter recipe balance - - SE+K2: Silica matter recipe requires stabilizer ---------------------------------------------------------------------------------------------------- -Version: 0.11.10 -Date: 2023-02-12 - Changes: - - Crafting efficiency improvements, thanks to nihilistzsche ---------------------------------------------------------------------------------------------------- -Version: 0.11.9 -Date: 2023-01-23 - Fixes: - - Fix for new SE release ---------------------------------------------------------------------------------------------------- -Version: 0.11.8 -Date: 2023-01-17 - Fixes: - - Add optional depenency on aai-industry to fix some mod load order discrepancies - Features: - - (Beta) Support for Crafting Efficieny mod ---------------------------------------------------------------------------------------------------- -Version: 0.11.7 -Date: 2023-01-01 - Changes: - - Prod modules enabled for optical fiber - - SE Space locomotives require MEMS gyro now - Localization: - - K2: Better string for silica processing, for ja, from Sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.11.6 -Date: 2022-12-31 - Fixes: - - SE/K2: Silicon with pyroflux can be made in fluid-enabled furnaces - - Add tech tree dependency on logistic science pack - - SE/K2: Attempt fix of issue where some mod loadouts did not have MEMS gyro in flying robot - frame recipe. - - K2: Fix compatibility issue with Seb's electrics. - Localization: - - K2: Better string for silica processing, for en ---------------------------------------------------------------------------------------------------- -Version: 0.11.5 -Date: 2022-12-24 - Localization: - - ja locale updates from Sakuro - - de locale updates from NathanU - - zh-CN updates from sunnytan53 ---------------------------------------------------------------------------------------------------- -Version: 0.11.4 -Date: 2022-08-23 - Changes: - - deep core mining balance for stone needs - - Minor compatibility updates ---------------------------------------------------------------------------------------------------- -Version: 0.11.3 -Date: 2022-08-10 - Changes: - - Cable item subgroup ---------------------------------------------------------------------------------------------------- -Version: 0.11.2 -Date: 2022-07-02 - Fixes: - - SE 0.6.68 compatibility breakage fixed ---------------------------------------------------------------------------------------------------- -Version: 0.11.1 -Date: 2022-07-01 - Fixes: - - SE 0.6: Use stone subgroup for raw material items ---------------------------------------------------------------------------------------------------- -Version: 0.11.0 -Date: 2022-07-01 - Changes: - - Compatible with Space Exploration 0.6 ---------------------------------------------------------------------------------------------------- -Version: 0.10.0 -Date: 2022-06-26 - Features: - - Beta support for 248k. Silica used in glass. More changes likely to come. ---------------------------------------------------------------------------------------------------- -Version: 0.9.1 -Date: 2022-01-08 - Features: - - Korean (ko) l10n, thanks to x2605 ---------------------------------------------------------------------------------------------------- -Version: 0.9.0 -Date: 2022-01-08 - Features: - - Added a new optional gyroscope intermediate ---------------------------------------------------------------------------------------------------- -Version: 0.8.3 -Date: 2022-01-06 - Changes: - - Polish (pl) l10n, thanks to S3BA ---------------------------------------------------------------------------------------------------- -Version: 0.8.2 -Date: 2022-01-05 - Changes: - - Simplified Chinese (zh_CN) l10n, thanks to PlexPt ---------------------------------------------------------------------------------------------------- -Version: 0.8.1 -Date: 2022-01-05 - Changes: - - Bio Industries more minor compatibility - Fixes: - - IR2 loose compatibility fix ---------------------------------------------------------------------------------------------------- -Version: 0.8.0 -Date: 2021-12-31 - Changes: - - K2 1.2 alternate electronic components recipe - - Update stone autoplace for more stone. ---------------------------------------------------------------------------------------------------- -Version: 0.7.4 -Date: 2021-07-26 - Changes: - - Very minor K2 tech tree tweak - - Minor Refactor ---------------------------------------------------------------------------------------------------- -Version: 0.7.3 -Date: 2021-07-01 - Features: - - Strange matter compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.7.2 -Date: 2021-06-26 - Changes: - - Tweak solar cell recipe, less silicon - Features: - - Transport drone circuits ---------------------------------------------------------------------------------------------------- -Version: 0.7.1 -Date: 2021-06-16 - Localization: - - ja locale updates from Sakuro - Features: - - Mod Mash Electronics recipes ---------------------------------------------------------------------------------------------------- -Version: 0.7.0 -Date: 2021-06-16 - Features: - - Recipe bypass setting - Localization: - - Polish localization tweaks, thanks to user TheoMarque ---------------------------------------------------------------------------------------------------- -Version: 0.6.14 -Date: 2021-06-02 - Localization: - - ja localization thanks to Sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.6.13 -Date: 2021-05-23 - Features: - - Zombies compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.6.12 -Date: 2021-05-22 - Localization: - - Polish localization, thanks to user TheoMarque ---------------------------------------------------------------------------------------------------- -Version: 0.6.11 -Date: 2021-05-01 - Features: - - Russian localization, thanks to user Spectrus1702 ---------------------------------------------------------------------------------------------------- -Version: 0.6.10 -Date: 2021-04-30 - Localization: - - German localization, thanks to user yokmp ---------------------------------------------------------------------------------------------------- -Version: 0.6.9 -Date: 2021-04-13 - Fixes: - - Recipe fix for deadlock stacked recipes + K2 ---------------------------------------------------------------------------------------------------- -Version: 0.6.8 -Date: 2021-04-12 - Changes: - - Reduce silicon/wafer needs for first tier modules. ---------------------------------------------------------------------------------------------------- -Version: 0.6.7 -Date: 2021-04-11 - Changes: - - Added experimental setting to not use crushed stone with Bio Industries. - This is meant only for massive megabases, and is not recommended otherwise. ---------------------------------------------------------------------------------------------------- -Version: 0.6.6 -Date: 2021-03-20 - Changes: - - Rebalance: circuit network components always use silicon, not wafers - This makes them craftable when they are unlocked, and also improves mod compatibility. - - Programmable speaker also uses 1 silicon. - - When using Extended Research System with Bio Industries, unlock some stuff earlier. ---------------------------------------------------------------------------------------------------- -Version: 0.6.5 -Date: 2021-03-19 - Features: - - Omnimatter recipe for silica ---------------------------------------------------------------------------------------------------- -Version: 0.6.4 -Date: 2021-03-15 - Fixes: - - Fix tech deadlock in K2 with intermediates on (type SiliconRecipes) ---------------------------------------------------------------------------------------------------- -Version: 0.6.3 -Date: 2021-03-14 - Features: - - More combinator recipes ---------------------------------------------------------------------------------------------------- -Version: 0.6.2 -Date: 2021-03-13 - Fixes: - - Fix Crash with angels mods ---------------------------------------------------------------------------------------------------- -Version: 0.6.1 -Date: 2021-03-13 - Fixes: - - Minor tech tree fix when intermediates on. - Changes: - - Space Exploration: Added silica to chemical gel, materials testing pack ---------------------------------------------------------------------------------------------------- -Version: 0.6.0 -Date: 2021-03-13 - Changes: - - Less silicon (or wafers) needed in processing units - - If using intermediates, wafers now required for advanced circuits - - Increase map's richness of stone slightly. - - Bio industries, crushed stone -> silica recipe is smelting now. More changes to come... ---------------------------------------------------------------------------------------------------- -Version: 0.5.2 -Date: 2021-03-11 - Changes: - - Enable prod modules on all recipes ---------------------------------------------------------------------------------------------------- -Version: 0.5.1 -Date: 2021-03-11 - Changes: - - UsefulCombinators recipes ---------------------------------------------------------------------------------------------------- -Version: 0.5.0 -Date: 2021-03-08 - Changes: - - New visuals by snouz (icons, technologies) - - New mod icon - - Added icon mipmaps - Features: - - Beta Bio Industries compatibility: silica from crushed stone, concrete recipe update. ---------------------------------------------------------------------------------------------------- -Version: 0.4.1 -Date: 2021-02-28 - Features: - - Deadlock stacking and crating, with thanks to GeneralTank ---------------------------------------------------------------------------------------------------- -Version: 0.4.0 -Date: 2021-02-27 - Features: - - New optional intermediates: Silicon wafer & Solar cell. ---------------------------------------------------------------------------------------------------- -Version: 0.3.7 -Date: 2021-02-15 - Changes: - - Loose compabitility with IR2 ---------------------------------------------------------------------------------------------------- -Version: 0.3.6 -Date: 2021-02-13 - Changes: - - Use K2 silicon icon. ---------------------------------------------------------------------------------------------------- -Version: 0.3.5 -Date: 2021-02-12 - Fixes: - - Fix silicon vulcanite smelting recipe. ---------------------------------------------------------------------------------------------------- -Version: 0.3.4 -Date: 2021-01-31 - Changes: - - Concrete will always try to keep stone brick in some step of the chain. - Concrete will also use sand where possible. I.e concrete "realism". - This may be further adjusted but these goals will remain. ---------------------------------------------------------------------------------------------------- -Version: 0.3.3 -Date: 2021-01-31 - Changes: - - SE Delivery cannon capsules - - K2 Silica matter ---------------------------------------------------------------------------------------------------- -Version: 0.3.2 -Date: 2021-01-30 - Fixes: - - K2+AAI concrete recipe ---------------------------------------------------------------------------------------------------- -Version: 0.3.1 -Date: 2021-01-30 - Changes: - - SE Vulcanite silicon smelting - - K2+SE Vulcanite silicon smelting ---------------------------------------------------------------------------------------------------- -Version: 0.3.0 -Date: 2021-01-30 - Changes: - - Support K2+SE ---------------------------------------------------------------------------------------------------- -Version: 0.2.0 -Date: 2020-11-23 - Changes: - - Support 1.1 ---------------------------------------------------------------------------------------------------- -Version: 0.1.0 -Date: 2020-09-15 - Changes: - - Initial version +Version: 2.0.19 +Date: 20.10.2025 + Legacy version meant to be played with my other forks and ATOM. + + Bug Fixes: + - Various mod compatibility fixes \ No newline at end of file diff --git a/bzsilicon2/info.json b/bzsilicon2/info.json index 867fe37..fbc5230 100644 --- a/bzsilicon2/info.json +++ b/bzsilicon2/info.json @@ -1,22 +1,22 @@ { - "name": "bzsilicon2", - "version": "2.0.16", - "factorio_version": "2.0", - "title": "Silica & Silicon", - "author": "Brevven", - "contact": "", - "homepage": "", - "dependencies": [ - "? space-age", - "? Krastorio2", - "? Krastorio2-spaced-out", - "? space-exploration", - "? 248k-Redux", - "? aai-industry", - "? modmashsplinterelectronics", - "? bztitanium", - "(?) IndustrialRevolution", - "base" - ], + "name": "bzsilicon2", + "version": "2.0.19", + "factorio_version": "2.0", + "title": "Silica & Silicon - Legacy", + "description": "Adds silica, silicon, and basic fiber optics to the game.", + "author": "Brevven, cackling fiend", + "homepage": "https://discord.gg/ufvFUJtVwk", + "dependencies": [ + "base", + "? Krastorio2", + "? Krastorio2-spaced-out", + "? space-exploration", + "? 248k-Redux", + "? aai-industry", + "? modmashsplinterelectronics", + "? bztitanium", + "(?) IndustrialRevolution", + "! space-age" + ] }