From 3d368bea905f6278787c74427c223b19fa86d0e0 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 11 Oct 2025 18:22:29 +0200 Subject: [PATCH 01/10] K2 fix --- lead-asteroid-updates.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lead-asteroid-updates.lua b/lead-asteroid-updates.lua index bb2ab06..79b64c9 100644 --- a/lead-asteroid-updates.lua +++ b/lead-asteroid-updates.lua @@ -22,7 +22,7 @@ if mods["space-age"] then {icon="__base__/graphics/icons/iron-ore.png", size=64, scale=0.25, shift={-8,0}}, {icon="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.25, shift={8,0}}, }, - category = "crushing", + category = "kr-crushing", subgroup="space-crushing", order = "b-a-z-b", auto_recycle = false, From eabb69f95b2984bcf0d5ba9fbf4566a2a43fa7f8 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 13 Oct 2025 12:26:46 +0200 Subject: [PATCH 02/10] 248k renaming fix --- compatibility/248k.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compatibility/248k.lua b/compatibility/248k.lua index 5e69008..1e0125f 100644 --- a/compatibility/248k.lua +++ b/compatibility/248k.lua @@ -3,7 +3,7 @@ local util = require("data-util"); local pb2 = "fu_lead_item" -if mods["248k"] then +if mods["248k-Redux"] then -- Swap out all 248k titanium for BZ titanium_plate for i, recipe in pairs(data.raw.recipe) do util.replace_ingredient(recipe.name, pb2, "lead-plate") From 01d55f3b620a60a0517d42b3d50e3d19d475a443 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 13 Oct 2025 17:36:09 +0200 Subject: [PATCH 03/10] Fix ingredients --- lead-recipe-se.lua | 2 +- lead-recipe-updates.lua | 2 +- lead-recipe.lua | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lead-recipe-se.lua b/lead-recipe-se.lua index 16f8766..cf5b0a4 100644 --- a/lead-recipe-se.lua +++ b/lead-recipe-se.lua @@ -104,7 +104,7 @@ if mods["space-exploration"] then data.raw.recipe["enriched-lead-plate"].order= "d[lead-plate]" se_delivery_cannon_recipes["enriched-lead"] = {name= "enriched-lead"} else - if util.me.byproduct() then util.add_product("molten-lead", {"copper-ore", 6}) end + if util.me.byproduct() then util.add_product("molten-lead", { type = "item", name = "copper-ore", amount = 6 }) end end se_delivery_cannon_recipes["lead-ingot"] = {name="lead-ingot"} end \ No newline at end of file diff --git a/lead-recipe-updates.lua b/lead-recipe-updates.lua index 9a29d0b..e693144 100644 --- a/lead-recipe-updates.lua +++ b/lead-recipe-updates.lua @@ -282,7 +282,7 @@ util.add_ingredient("storehouse-basic", "lead-plate", 8) -- Leighzer's scrap if mods.leighzerscrapyards then util.add_to_product("scrap-processing", "iron-plate", -1) - util.add_product("scrap-processing", {"lead-plate", 1}) + util.add_product("scrap-processing", { type = "item", name = "lead-plate", amount = 1 }) end util.add_minable_result("simple-entity", "huge-volcanic-rock", {type="item", name="lead-ore", amount_min=10, amount_max=24}) diff --git a/lead-recipe.lua b/lead-recipe.lua index c2a7564..dbfda83 100644 --- a/lead-recipe.lua +++ b/lead-recipe.lua @@ -374,7 +374,7 @@ data:extend({ { enabled = true, energy_required = 16, - ingredients = {{"lead-ore", 10}}, + ingredients = {{ type = "item", name = "lead-ore", amount = 10 }}, results = { {type="item", name = "lead-ingot", amount_min=4, amount_max=5}, {type="item", name = "copper-ore", amount_min=1, amount_max=2}, @@ -383,7 +383,7 @@ data:extend({ { enabled = true, energy_required = 6.4, - ingredients = {{"lead-ore", 2}}, + ingredients = {{ type = "item", name = "lead-ore", amount = 2 }}, results = { {type="item", name = "lead-ingot", amount=2, probability=5/6}, {type="item", name = "copper-ore", amount=1, probability=1/3}, @@ -393,7 +393,7 @@ data:extend({ { enabled = true, energy_required = 12.8, - ingredients = {{"lead-ore", 4}}, + ingredients = {{ type = "item", name = "lead-ore", amount = 4 }}, results = { {type="item", name = "lead-ingot", amount=2, probability=5/6}, {type="item", name = "copper-ore", amount=2, probability=1/3}, From 90c296785c69a8db0cad972e7a08cead9b5ee7bd Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 13 Oct 2025 22:58:34 +0200 Subject: [PATCH 04/10] Fix name kr-iron-beam --- data-final-fixes.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-final-fixes.lua b/data-final-fixes.lua index abe6676..e24546b 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -18,7 +18,7 @@ if util.k2() then local lead_bolt = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" util.replace_ingredient("kr-rifle-magazine", "iron-plate", "lead-plate") util.replace_ingredient("kr-anti-materiel-rifle-magazine", "iron-plate", "lead-plate") - util.replace_some_ingredient("kr-crusher", "iron-beam", 5, lead_bolt, 5) + util.replace_some_ingredient("kr-crusher", "kr-iron-beam", 5, lead_bolt, 5) util.replace_ingredient("kr-shelter", "iron-plate", lead_bolt) util.add_ingredient("kr-advanced-furnace", lead_bolt, 20) util.replace_ingredient("uranium-fuel-cell", "steel-plate", "lead-plate") From 9a10c1a2692bc00c4d2c7df71d36438748e6e0af Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 16 Oct 2025 00:24:35 +0200 Subject: [PATCH 05/10] Fix picture sizes --- lead-enriched.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lead-enriched.lua b/lead-enriched.lua index 7597222..26bc32f 100644 --- a/lead-enriched.lua +++ b/lead-enriched.lua @@ -11,10 +11,10 @@ data:extend( icon = "__bzlead__/graphics/icons/enriched-lead.png", icon_mipmaps = 3, pictures = { - {filename="__bzlead__/graphics/icons/enriched-lead.png", size=64, scale=0.25}, - {filename="__bzlead__/graphics/icons/enriched-lead-1.png", size=64, scale=0.25}, - {filename="__bzlead__/graphics/icons/enriched-lead-2.png", size=64, scale=0.25}, - {filename="__bzlead__/graphics/icons/enriched-lead-3.png", size=64, scale=0.25}, + {filename="__bzlead__/graphics/icons/enriched-lead.png", size=64, scale=0.5}, + {filename="__bzlead__/graphics/icons/enriched-lead-1.png", size=64, scale=0.5}, + {filename="__bzlead__/graphics/icons/enriched-lead-2.png", size=64, scale=0.5}, + {filename="__bzlead__/graphics/icons/enriched-lead-3.png", size=64, scale=0.5}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-lead]", From d968cc1ef1593b038a3af1a84d2f665fca3a11ed Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 18 Oct 2025 22:14:02 +0200 Subject: [PATCH 06/10] Fix SA compatibility --- lead-asteroid-updates.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lead-asteroid-updates.lua b/lead-asteroid-updates.lua index 79b64c9..bb2ab06 100644 --- a/lead-asteroid-updates.lua +++ b/lead-asteroid-updates.lua @@ -22,7 +22,7 @@ if mods["space-age"] then {icon="__base__/graphics/icons/iron-ore.png", size=64, scale=0.25, shift={-8,0}}, {icon="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.25, shift={8,0}}, }, - category = "kr-crushing", + category = "crushing", subgroup="space-crushing", order = "b-a-z-b", auto_recycle = false, From eac0727ab6e0b92210e85fc2ae2c6afe57f7d53d Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 09:56:31 +0200 Subject: [PATCH 07/10] Update to bzfoundry2 --- data-util.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-util.lua b/data-util.lua index 98ed044..1aac670 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) From e6daa69ccd2014922b3f6c8ee8d7c2033d463319 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:00:44 +0200 Subject: [PATCH 08/10] Restructure repository --- .editorconfig | 3 ++ .github/CODEOWNERS | 1 - Makefile | 37 ------------------ LICENSE.md => bzlead2/LICENSE.md | 0 changelog.txt => bzlead2/changelog.txt | 0 .../compatibility}/248k.lua | 0 .../compatibility}/data/hot-metals.lua | 0 .../compatibility}/sciencecosttweakerm.lua | 0 control-util.lua => bzlead2/control-util.lua | 0 control.lua => bzlead2/control.lua | 0 .../data-final-fixes.lua | 0 data-updates.lua => bzlead2/data-updates.lua | 0 data-util.lua => bzlead2/data-util.lua | 0 data.lua => bzlead2/data.lua | 0 .../entity/hr-lead-chest-remnants.png | Bin .../graphics}/entity/hr-lead-chest-shadow.png | Bin .../graphics}/entity/hr-lead-chest.png | Bin .../hr-lead-ore-particle-1.png | Bin .../hr-lead-ore-particle-2.png | Bin .../hr-lead-ore-particle-3.png | Bin .../hr-lead-ore-particle-4.png | Bin .../hr-lead-ore-particle-shadow-1.png | Bin .../hr-lead-ore-particle-shadow-2.png | Bin .../hr-lead-ore-particle-shadow-3.png | Bin .../hr-lead-ore-particle-shadow-4.png | Bin .../graphics}/entity/ores/hr-lead-ore.png | Bin .../graphics}/icons/enriched-lead-1.png | Bin .../graphics}/icons/enriched-lead-2.png | Bin .../graphics}/icons/enriched-lead-3.png | Bin .../graphics}/icons/enriched-lead.png | Bin .../graphics}/icons/lead-chest.png | Bin .../graphics}/icons/lead-expansion-bolt.png | Bin .../graphics}/icons/lead-ingot.png | Bin .../graphics}/icons/lead-ore-1.png | Bin .../graphics}/icons/lead-ore-2.png | Bin .../graphics}/icons/lead-ore-3.png | Bin .../graphics}/icons/lead-ore.png | Bin .../graphics}/icons/lead-plate.png | Bin .../graphics}/icons/lead-powder.png | Bin .../graphics}/icons/molten-lead-sa.png | Bin .../graphics}/icons/molten-lead.png | Bin .../icons/stacked/enriched-lead-stacked.png | Bin .../icons/stacked/lead-ore-stacked.png | Bin .../icons/stacked/lead-plate-stacked.png | Bin info.json => bzlead2/info.json | 0 .../lead-asteroid-updates.lua | 0 .../lead-compressed.lua | 0 .../lead-enriched.lua | 0 lead-matter.lua => bzlead2/lead-matter.lua | 0 .../lead-ore-particle.lua | 0 lead-ore.lua => bzlead2/lead-ore.lua | 0 .../lead-recipe-colors.lua | 0 .../lead-recipe-final-5d.lua | 0 .../lead-recipe-final-rrr.lua | 0 .../lead-recipe-final-stacking.lua | 0 .../lead-recipe-final.lua | 0 .../lead-recipe-se.lua | 0 .../lead-recipe-updates.lua | 0 lead-recipe.lua => bzlead2/lead-recipe.lua | 0 lead-sim.lua => bzlead2/lead-sim.lua | 0 {locale => bzlead2/locale}/cs/lead.cfg | 0 {locale => bzlead2/locale}/de/lead.cfg | 0 {locale => bzlead2/locale}/en/lead.cfg | 0 {locale => bzlead2/locale}/ja/lead.cfg | 0 {locale => bzlead2/locale}/ko/lead.cfg | 0 {locale => bzlead2/locale}/pl/lead.cfg | 0 {locale => bzlead2/locale}/ru/lead.cfg | 0 {locale => bzlead2/locale}/zh-CN/lead.cfg | 0 .../map-gen-preset-updates.lua | 0 me.lua => bzlead2/me.lua | 0 .../menu-simulations}/lead-ammo-sim.zip | Bin omni.lua => bzlead2/omni.lua | 0 .../other-entities.lua | 0 .../settings-util.lua | 0 settings.lua => bzlead2/settings.lua | 0 .../strange-matter.lua | 0 thumbnail.png => bzlead2/thumbnail.png | Bin graphics/old-files/hr-lead-ore.png | Bin 6607 -> 0 bytes graphics/old-files/iron-chest.png | Bin 11937 -> 0 bytes graphics/old-files/lead-ore - Copy.png | Bin 6607 -> 0 bytes graphics/old-files/lead-ore-n.png | Bin 4402 -> 0 bytes graphics/old-files/lead-plate-old.png | Bin 4888 -> 0 bytes graphics/old-files/lead-processing.png | Bin 18606 -> 0 bytes graphics/old-files/lead-thumbnail.png | Bin 10765 -> 0 bytes migrations/bzlead.1.1.0.json | 7 ---- .../graphics}/icons/lead-expansion-bolt.blend | Bin .../icons/lead-expansion-bolt.blend1 | Bin .../graphics}/icons/lead-ingot.xcf | Bin .../graphics}/icons/molten-lead-sa.xcf | Bin .../graphics}/icons/molten-lead.xcf | Bin .../graphics}/old-files/enriched-lead-1.xcf | Bin .../graphics}/old-files/enriched-lead-2.xcf | Bin .../graphics}/old-files/enriched-lead-3.xcf | Bin .../graphics}/old-files/enriched-lead-4.xcf | Bin .../old-files/enriched-lead-stacked.xcf | Bin .../graphics}/old-files/enriched-lead.xcf | Bin .../graphics}/old-files/hr-lead-chest.xcf | Bin .../graphics}/old-files/hr-lead-ore.xcf | Bin .../graphics}/old-files/lead-chest.xcf | Bin .../graphics}/old-files/lead-ore-n-2.xcf | Bin .../graphics}/old-files/lead-ore-n-3.xcf | Bin .../graphics}/old-files/lead-ore-n-4.xcf | Bin .../graphics}/old-files/lead-ore-n.xcf | Bin .../graphics}/old-files/lead-ore-stacked.xcf | Bin .../graphics}/old-files/lead-ore-x-2.xcf | Bin .../graphics}/old-files/lead-ore-x-3.xcf | Bin .../graphics}/old-files/lead-ore-x-4.xcf | Bin .../graphics}/old-files/lead-ore-x.xcf | Bin .../graphics}/old-files/lead-ore.xcf | Bin .../graphics}/old-files/lead-plate-2.xcf | Bin .../graphics}/old-files/lead-plate-3.xcf | Bin .../old-files/lead-plate-stacked.xcf | Bin .../graphics}/old-files/lead-plate.xcf | Bin .../graphics}/old-files/lead-powder.xcf | Bin .../graphics}/old-files/lead-processing.xcf | Bin .../graphics}/old-files/lead-thumbnail.xcf | Bin 116 files changed, 3 insertions(+), 45 deletions(-) create mode 100644 .editorconfig delete mode 100644 .github/CODEOWNERS delete mode 100644 Makefile rename LICENSE.md => bzlead2/LICENSE.md (100%) rename changelog.txt => bzlead2/changelog.txt (100%) rename {compatibility => bzlead2/compatibility}/248k.lua (100%) rename {compatibility => bzlead2/compatibility}/data/hot-metals.lua (100%) rename {compatibility => bzlead2/compatibility}/sciencecosttweakerm.lua (100%) rename control-util.lua => bzlead2/control-util.lua (100%) rename control.lua => bzlead2/control.lua (100%) rename data-final-fixes.lua => bzlead2/data-final-fixes.lua (100%) rename data-updates.lua => bzlead2/data-updates.lua (100%) rename data-util.lua => bzlead2/data-util.lua (100%) rename data.lua => bzlead2/data.lua (100%) rename {graphics => bzlead2/graphics}/entity/hr-lead-chest-remnants.png (100%) rename {graphics => bzlead2/graphics}/entity/hr-lead-chest-shadow.png (100%) rename {graphics => bzlead2/graphics}/entity/hr-lead-chest.png (100%) rename {graphics => bzlead2/graphics}/entity/lead-ore-particle/hr-lead-ore-particle-1.png (100%) rename {graphics => bzlead2/graphics}/entity/lead-ore-particle/hr-lead-ore-particle-2.png (100%) rename {graphics => bzlead2/graphics}/entity/lead-ore-particle/hr-lead-ore-particle-3.png (100%) rename {graphics => bzlead2/graphics}/entity/lead-ore-particle/hr-lead-ore-particle-4.png (100%) rename {graphics => bzlead2/graphics}/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png (100%) rename {graphics => bzlead2/graphics}/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png (100%) rename {graphics => bzlead2/graphics}/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png (100%) rename {graphics => bzlead2/graphics}/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png (100%) rename {graphics => bzlead2/graphics}/entity/ores/hr-lead-ore.png (100%) rename {graphics => bzlead2/graphics}/icons/enriched-lead-1.png (100%) rename {graphics => bzlead2/graphics}/icons/enriched-lead-2.png (100%) rename {graphics => bzlead2/graphics}/icons/enriched-lead-3.png (100%) rename {graphics => bzlead2/graphics}/icons/enriched-lead.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-chest.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-expansion-bolt.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-ingot.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-ore-1.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-ore-2.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-ore-3.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-ore.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-plate.png (100%) rename {graphics => bzlead2/graphics}/icons/lead-powder.png (100%) rename {graphics => bzlead2/graphics}/icons/molten-lead-sa.png (100%) rename {graphics => bzlead2/graphics}/icons/molten-lead.png (100%) rename {graphics => bzlead2/graphics}/icons/stacked/enriched-lead-stacked.png (100%) rename {graphics => bzlead2/graphics}/icons/stacked/lead-ore-stacked.png (100%) rename {graphics => bzlead2/graphics}/icons/stacked/lead-plate-stacked.png (100%) rename info.json => bzlead2/info.json (100%) rename lead-asteroid-updates.lua => bzlead2/lead-asteroid-updates.lua (100%) rename lead-compressed.lua => bzlead2/lead-compressed.lua (100%) rename lead-enriched.lua => bzlead2/lead-enriched.lua (100%) rename lead-matter.lua => bzlead2/lead-matter.lua (100%) rename lead-ore-particle.lua => bzlead2/lead-ore-particle.lua (100%) rename lead-ore.lua => bzlead2/lead-ore.lua (100%) rename lead-recipe-colors.lua => bzlead2/lead-recipe-colors.lua (100%) rename lead-recipe-final-5d.lua => bzlead2/lead-recipe-final-5d.lua (100%) rename lead-recipe-final-rrr.lua => bzlead2/lead-recipe-final-rrr.lua (100%) rename lead-recipe-final-stacking.lua => bzlead2/lead-recipe-final-stacking.lua (100%) rename lead-recipe-final.lua => bzlead2/lead-recipe-final.lua (100%) rename lead-recipe-se.lua => bzlead2/lead-recipe-se.lua (100%) rename lead-recipe-updates.lua => bzlead2/lead-recipe-updates.lua (100%) rename lead-recipe.lua => bzlead2/lead-recipe.lua (100%) rename lead-sim.lua => bzlead2/lead-sim.lua (100%) rename {locale => bzlead2/locale}/cs/lead.cfg (100%) rename {locale => bzlead2/locale}/de/lead.cfg (100%) rename {locale => bzlead2/locale}/en/lead.cfg (100%) rename {locale => bzlead2/locale}/ja/lead.cfg (100%) rename {locale => bzlead2/locale}/ko/lead.cfg (100%) rename {locale => bzlead2/locale}/pl/lead.cfg (100%) rename {locale => bzlead2/locale}/ru/lead.cfg (100%) rename {locale => bzlead2/locale}/zh-CN/lead.cfg (100%) rename map-gen-preset-updates.lua => bzlead2/map-gen-preset-updates.lua (100%) rename me.lua => bzlead2/me.lua (100%) rename {menu-simulations => bzlead2/menu-simulations}/lead-ammo-sim.zip (100%) rename omni.lua => bzlead2/omni.lua (100%) rename other-entities.lua => bzlead2/other-entities.lua (100%) rename settings-util.lua => bzlead2/settings-util.lua (100%) rename settings.lua => bzlead2/settings.lua (100%) rename strange-matter.lua => bzlead2/strange-matter.lua (100%) rename thumbnail.png => bzlead2/thumbnail.png (100%) delete mode 100644 graphics/old-files/hr-lead-ore.png delete mode 100644 graphics/old-files/iron-chest.png delete mode 100644 graphics/old-files/lead-ore - Copy.png delete mode 100644 graphics/old-files/lead-ore-n.png delete mode 100644 graphics/old-files/lead-plate-old.png delete mode 100644 graphics/old-files/lead-processing.png delete mode 100644 graphics/old-files/lead-thumbnail.png delete mode 100644 migrations/bzlead.1.1.0.json rename {graphics => sources/graphics}/icons/lead-expansion-bolt.blend (100%) rename {graphics => sources/graphics}/icons/lead-expansion-bolt.blend1 (100%) rename {graphics => sources/graphics}/icons/lead-ingot.xcf (100%) rename {graphics => sources/graphics}/icons/molten-lead-sa.xcf (100%) rename {graphics => sources/graphics}/icons/molten-lead.xcf (100%) rename {graphics => sources/graphics}/old-files/enriched-lead-1.xcf (100%) rename {graphics => sources/graphics}/old-files/enriched-lead-2.xcf (100%) rename {graphics => sources/graphics}/old-files/enriched-lead-3.xcf (100%) rename {graphics => sources/graphics}/old-files/enriched-lead-4.xcf (100%) rename {graphics => sources/graphics}/old-files/enriched-lead-stacked.xcf (100%) rename {graphics => sources/graphics}/old-files/enriched-lead.xcf (100%) rename {graphics => sources/graphics}/old-files/hr-lead-chest.xcf (100%) rename {graphics => sources/graphics}/old-files/hr-lead-ore.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-chest.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-n-2.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-n-3.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-n-4.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-n.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-stacked.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-x-2.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-x-3.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-x-4.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore-x.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-ore.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-plate-2.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-plate-3.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-plate-stacked.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-plate.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-powder.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-processing.xcf (100%) rename {graphics => sources/graphics}/old-files/lead-thumbnail.xcf (100%) 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 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 b5e4c50..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 zorro - -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/bzlead2/LICENSE.md similarity index 100% rename from LICENSE.md rename to bzlead2/LICENSE.md diff --git a/changelog.txt b/bzlead2/changelog.txt similarity index 100% rename from changelog.txt rename to bzlead2/changelog.txt diff --git a/compatibility/248k.lua b/bzlead2/compatibility/248k.lua similarity index 100% rename from compatibility/248k.lua rename to bzlead2/compatibility/248k.lua diff --git a/compatibility/data/hot-metals.lua b/bzlead2/compatibility/data/hot-metals.lua similarity index 100% rename from compatibility/data/hot-metals.lua rename to bzlead2/compatibility/data/hot-metals.lua diff --git a/compatibility/sciencecosttweakerm.lua b/bzlead2/compatibility/sciencecosttweakerm.lua similarity index 100% rename from compatibility/sciencecosttweakerm.lua rename to bzlead2/compatibility/sciencecosttweakerm.lua diff --git a/control-util.lua b/bzlead2/control-util.lua similarity index 100% rename from control-util.lua rename to bzlead2/control-util.lua diff --git a/control.lua b/bzlead2/control.lua similarity index 100% rename from control.lua rename to bzlead2/control.lua diff --git a/data-final-fixes.lua b/bzlead2/data-final-fixes.lua similarity index 100% rename from data-final-fixes.lua rename to bzlead2/data-final-fixes.lua diff --git a/data-updates.lua b/bzlead2/data-updates.lua similarity index 100% rename from data-updates.lua rename to bzlead2/data-updates.lua diff --git a/data-util.lua b/bzlead2/data-util.lua similarity index 100% rename from data-util.lua rename to bzlead2/data-util.lua diff --git a/data.lua b/bzlead2/data.lua similarity index 100% rename from data.lua rename to bzlead2/data.lua diff --git a/graphics/entity/hr-lead-chest-remnants.png b/bzlead2/graphics/entity/hr-lead-chest-remnants.png similarity index 100% rename from graphics/entity/hr-lead-chest-remnants.png rename to bzlead2/graphics/entity/hr-lead-chest-remnants.png diff --git a/graphics/entity/hr-lead-chest-shadow.png b/bzlead2/graphics/entity/hr-lead-chest-shadow.png similarity index 100% rename from graphics/entity/hr-lead-chest-shadow.png rename to bzlead2/graphics/entity/hr-lead-chest-shadow.png diff --git a/graphics/entity/hr-lead-chest.png b/bzlead2/graphics/entity/hr-lead-chest.png similarity index 100% rename from graphics/entity/hr-lead-chest.png rename to bzlead2/graphics/entity/hr-lead-chest.png diff --git a/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png b/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png similarity index 100% rename from graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png rename to bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png diff --git a/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png b/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png similarity index 100% rename from graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png rename to bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png diff --git a/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png b/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png similarity index 100% rename from graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png rename to bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png diff --git a/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png b/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png similarity index 100% rename from graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png rename to bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png diff --git a/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png b/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png similarity index 100% rename from graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png rename to bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png diff --git a/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png b/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png similarity index 100% rename from graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png rename to bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png diff --git a/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png b/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png similarity index 100% rename from graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png rename to bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png diff --git a/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png b/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png similarity index 100% rename from graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png rename to bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png diff --git a/graphics/entity/ores/hr-lead-ore.png b/bzlead2/graphics/entity/ores/hr-lead-ore.png similarity index 100% rename from graphics/entity/ores/hr-lead-ore.png rename to bzlead2/graphics/entity/ores/hr-lead-ore.png diff --git a/graphics/icons/enriched-lead-1.png b/bzlead2/graphics/icons/enriched-lead-1.png similarity index 100% rename from graphics/icons/enriched-lead-1.png rename to bzlead2/graphics/icons/enriched-lead-1.png diff --git a/graphics/icons/enriched-lead-2.png b/bzlead2/graphics/icons/enriched-lead-2.png similarity index 100% rename from graphics/icons/enriched-lead-2.png rename to bzlead2/graphics/icons/enriched-lead-2.png diff --git a/graphics/icons/enriched-lead-3.png b/bzlead2/graphics/icons/enriched-lead-3.png similarity index 100% rename from graphics/icons/enriched-lead-3.png rename to bzlead2/graphics/icons/enriched-lead-3.png diff --git a/graphics/icons/enriched-lead.png b/bzlead2/graphics/icons/enriched-lead.png similarity index 100% rename from graphics/icons/enriched-lead.png rename to bzlead2/graphics/icons/enriched-lead.png diff --git a/graphics/icons/lead-chest.png b/bzlead2/graphics/icons/lead-chest.png similarity index 100% rename from graphics/icons/lead-chest.png rename to bzlead2/graphics/icons/lead-chest.png diff --git a/graphics/icons/lead-expansion-bolt.png b/bzlead2/graphics/icons/lead-expansion-bolt.png similarity index 100% rename from graphics/icons/lead-expansion-bolt.png rename to bzlead2/graphics/icons/lead-expansion-bolt.png diff --git a/graphics/icons/lead-ingot.png b/bzlead2/graphics/icons/lead-ingot.png similarity index 100% rename from graphics/icons/lead-ingot.png rename to bzlead2/graphics/icons/lead-ingot.png diff --git a/graphics/icons/lead-ore-1.png b/bzlead2/graphics/icons/lead-ore-1.png similarity index 100% rename from graphics/icons/lead-ore-1.png rename to bzlead2/graphics/icons/lead-ore-1.png diff --git a/graphics/icons/lead-ore-2.png b/bzlead2/graphics/icons/lead-ore-2.png similarity index 100% rename from graphics/icons/lead-ore-2.png rename to bzlead2/graphics/icons/lead-ore-2.png diff --git a/graphics/icons/lead-ore-3.png b/bzlead2/graphics/icons/lead-ore-3.png similarity index 100% rename from graphics/icons/lead-ore-3.png rename to bzlead2/graphics/icons/lead-ore-3.png diff --git a/graphics/icons/lead-ore.png b/bzlead2/graphics/icons/lead-ore.png similarity index 100% rename from graphics/icons/lead-ore.png rename to bzlead2/graphics/icons/lead-ore.png diff --git a/graphics/icons/lead-plate.png b/bzlead2/graphics/icons/lead-plate.png similarity index 100% rename from graphics/icons/lead-plate.png rename to bzlead2/graphics/icons/lead-plate.png diff --git a/graphics/icons/lead-powder.png b/bzlead2/graphics/icons/lead-powder.png similarity index 100% rename from graphics/icons/lead-powder.png rename to bzlead2/graphics/icons/lead-powder.png diff --git a/graphics/icons/molten-lead-sa.png b/bzlead2/graphics/icons/molten-lead-sa.png similarity index 100% rename from graphics/icons/molten-lead-sa.png rename to bzlead2/graphics/icons/molten-lead-sa.png diff --git a/graphics/icons/molten-lead.png b/bzlead2/graphics/icons/molten-lead.png similarity index 100% rename from graphics/icons/molten-lead.png rename to bzlead2/graphics/icons/molten-lead.png diff --git a/graphics/icons/stacked/enriched-lead-stacked.png b/bzlead2/graphics/icons/stacked/enriched-lead-stacked.png similarity index 100% rename from graphics/icons/stacked/enriched-lead-stacked.png rename to bzlead2/graphics/icons/stacked/enriched-lead-stacked.png diff --git a/graphics/icons/stacked/lead-ore-stacked.png b/bzlead2/graphics/icons/stacked/lead-ore-stacked.png similarity index 100% rename from graphics/icons/stacked/lead-ore-stacked.png rename to bzlead2/graphics/icons/stacked/lead-ore-stacked.png diff --git a/graphics/icons/stacked/lead-plate-stacked.png b/bzlead2/graphics/icons/stacked/lead-plate-stacked.png similarity index 100% rename from graphics/icons/stacked/lead-plate-stacked.png rename to bzlead2/graphics/icons/stacked/lead-plate-stacked.png diff --git a/info.json b/bzlead2/info.json similarity index 100% rename from info.json rename to bzlead2/info.json diff --git a/lead-asteroid-updates.lua b/bzlead2/lead-asteroid-updates.lua similarity index 100% rename from lead-asteroid-updates.lua rename to bzlead2/lead-asteroid-updates.lua diff --git a/lead-compressed.lua b/bzlead2/lead-compressed.lua similarity index 100% rename from lead-compressed.lua rename to bzlead2/lead-compressed.lua diff --git a/lead-enriched.lua b/bzlead2/lead-enriched.lua similarity index 100% rename from lead-enriched.lua rename to bzlead2/lead-enriched.lua diff --git a/lead-matter.lua b/bzlead2/lead-matter.lua similarity index 100% rename from lead-matter.lua rename to bzlead2/lead-matter.lua diff --git a/lead-ore-particle.lua b/bzlead2/lead-ore-particle.lua similarity index 100% rename from lead-ore-particle.lua rename to bzlead2/lead-ore-particle.lua diff --git a/lead-ore.lua b/bzlead2/lead-ore.lua similarity index 100% rename from lead-ore.lua rename to bzlead2/lead-ore.lua diff --git a/lead-recipe-colors.lua b/bzlead2/lead-recipe-colors.lua similarity index 100% rename from lead-recipe-colors.lua rename to bzlead2/lead-recipe-colors.lua diff --git a/lead-recipe-final-5d.lua b/bzlead2/lead-recipe-final-5d.lua similarity index 100% rename from lead-recipe-final-5d.lua rename to bzlead2/lead-recipe-final-5d.lua diff --git a/lead-recipe-final-rrr.lua b/bzlead2/lead-recipe-final-rrr.lua similarity index 100% rename from lead-recipe-final-rrr.lua rename to bzlead2/lead-recipe-final-rrr.lua diff --git a/lead-recipe-final-stacking.lua b/bzlead2/lead-recipe-final-stacking.lua similarity index 100% rename from lead-recipe-final-stacking.lua rename to bzlead2/lead-recipe-final-stacking.lua diff --git a/lead-recipe-final.lua b/bzlead2/lead-recipe-final.lua similarity index 100% rename from lead-recipe-final.lua rename to bzlead2/lead-recipe-final.lua diff --git a/lead-recipe-se.lua b/bzlead2/lead-recipe-se.lua similarity index 100% rename from lead-recipe-se.lua rename to bzlead2/lead-recipe-se.lua diff --git a/lead-recipe-updates.lua b/bzlead2/lead-recipe-updates.lua similarity index 100% rename from lead-recipe-updates.lua rename to bzlead2/lead-recipe-updates.lua diff --git a/lead-recipe.lua b/bzlead2/lead-recipe.lua similarity index 100% rename from lead-recipe.lua rename to bzlead2/lead-recipe.lua diff --git a/lead-sim.lua b/bzlead2/lead-sim.lua similarity index 100% rename from lead-sim.lua rename to bzlead2/lead-sim.lua diff --git a/locale/cs/lead.cfg b/bzlead2/locale/cs/lead.cfg similarity index 100% rename from locale/cs/lead.cfg rename to bzlead2/locale/cs/lead.cfg diff --git a/locale/de/lead.cfg b/bzlead2/locale/de/lead.cfg similarity index 100% rename from locale/de/lead.cfg rename to bzlead2/locale/de/lead.cfg diff --git a/locale/en/lead.cfg b/bzlead2/locale/en/lead.cfg similarity index 100% rename from locale/en/lead.cfg rename to bzlead2/locale/en/lead.cfg diff --git a/locale/ja/lead.cfg b/bzlead2/locale/ja/lead.cfg similarity index 100% rename from locale/ja/lead.cfg rename to bzlead2/locale/ja/lead.cfg diff --git a/locale/ko/lead.cfg b/bzlead2/locale/ko/lead.cfg similarity index 100% rename from locale/ko/lead.cfg rename to bzlead2/locale/ko/lead.cfg diff --git a/locale/pl/lead.cfg b/bzlead2/locale/pl/lead.cfg similarity index 100% rename from locale/pl/lead.cfg rename to bzlead2/locale/pl/lead.cfg diff --git a/locale/ru/lead.cfg b/bzlead2/locale/ru/lead.cfg similarity index 100% rename from locale/ru/lead.cfg rename to bzlead2/locale/ru/lead.cfg diff --git a/locale/zh-CN/lead.cfg b/bzlead2/locale/zh-CN/lead.cfg similarity index 100% rename from locale/zh-CN/lead.cfg rename to bzlead2/locale/zh-CN/lead.cfg diff --git a/map-gen-preset-updates.lua b/bzlead2/map-gen-preset-updates.lua similarity index 100% rename from map-gen-preset-updates.lua rename to bzlead2/map-gen-preset-updates.lua diff --git a/me.lua b/bzlead2/me.lua similarity index 100% rename from me.lua rename to bzlead2/me.lua diff --git a/menu-simulations/lead-ammo-sim.zip b/bzlead2/menu-simulations/lead-ammo-sim.zip similarity index 100% rename from menu-simulations/lead-ammo-sim.zip rename to bzlead2/menu-simulations/lead-ammo-sim.zip diff --git a/omni.lua b/bzlead2/omni.lua similarity index 100% rename from omni.lua rename to bzlead2/omni.lua diff --git a/other-entities.lua b/bzlead2/other-entities.lua similarity index 100% rename from other-entities.lua rename to bzlead2/other-entities.lua diff --git a/settings-util.lua b/bzlead2/settings-util.lua similarity index 100% rename from settings-util.lua rename to bzlead2/settings-util.lua diff --git a/settings.lua b/bzlead2/settings.lua similarity index 100% rename from settings.lua rename to bzlead2/settings.lua diff --git a/strange-matter.lua b/bzlead2/strange-matter.lua similarity index 100% rename from strange-matter.lua rename to bzlead2/strange-matter.lua diff --git a/thumbnail.png b/bzlead2/thumbnail.png similarity index 100% rename from thumbnail.png rename to bzlead2/thumbnail.png diff --git a/graphics/old-files/hr-lead-ore.png b/graphics/old-files/hr-lead-ore.png deleted file mode 100644 index 40d4bc7725cff97caaaf93721c00071d8734c1cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6607 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 N002ovPDHLkV1jP@xnKYQ diff --git a/graphics/old-files/iron-chest.png b/graphics/old-files/iron-chest.png deleted file mode 100644 index 5d7a5c0b6b5b53d423ba6b39e2828b158ab11c27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11937 zcmV;SE?&`zP)f;Ctk8SWKT-tKuE!;ltwC0QBm5W3aJ7iu@xz?D6|rY z(54M-MUh&m6l%33G!a=%9D{PdpzUu>~pvO{;X%Kl~++LCsB~%H+Uwz=K=YCD|jsBJZ!j%ipzw^|S zUwhrzlaHJ6`dAFtHk7bI^!j~Otc``KD%Xb45k;b>6Y6qCmSo5v!>lQzpd;N+^I*FY ztunWr`0qqGWA zDwfj)YuiV}YPs?oS)ygSb`E$gFnjE=&+J@z{`4>3d~~B&+u8>2adpYb=PvQNFMQ#@ zYyK7hAp|9a@MXDwkCw@wugV1ve)%D;zu_8=Y_Bu!<%s?^qHWl{cpe!?tRFqfqU=~s zrvxb}=S$YM*2(iBZ8ziM>C+@p#5#`aw{PMz_wW8R@b>TmAp`*T-g~eA^?&j1oyWfX z#dlpkb6Wn`-EWTLJQJ;jtmuIh)X5%sk#l};Pt^vxV6FpR2i*V34}Ww^dZe<>J^kFd zuxO3Abvz(XQ(u>hZOwORc5v}cO;i2WnP;EBVfW%?asJHHp_gf*v?rvJV!W}YlQ@gK zv)&r7`bDnt!BDk0iZsKP74xbrrAq5aBb`(T5y;b+NJf;iIgK-4Kbxf)-WclE1doe? z6g@8^DP$l^Q(~#87E4<1NYaEXN~z05SGC;&spV?A|J<2ppZ@KqPo2I0zx>IE1K*L) z3Lwm;?6G)g3gCSX{jz$_t`2XL02+S&`8jji@_AJ)I-dlx9`2 zHtx|I_9+`jHJ>plEAD>d>%u?&>F<+gE}VaD-0$Bcgg6CAzymz~)o0i5`aAQDG}0tm zF}~(zY}XJ)2~sM|X#MNo>vTlDEZxP{N?;qnUcGd~k?XHdr;9yym#x^H&M{XbuZv;S zEXtcS-+`{4{7jUNKeRe~I`!Uzg4L>Iwd&YD9+4**RlTCFN@DMcdkMsnK+Je;4Oe>t z4Y6(pNKcaFM1zc2CtxkEu_U@f#f~@&l#2s|fZEkWIwegDTolkE2Gbx&kY+)CmLEWq{pSQee{fI<3?@o3{C7;CJ|re7_4J$S*(mvA3=bE1J5}Z@S}l^|L?z56B9I zn_gw+dc=87IJ|(52do`Ch6DV;IhL(PDoLDWq-o0J@bK$_&zyOlwXJKB#VB;vXWepn zGjIwJ0076fHb+^aaS%dUP&WS%c^%K-!gTgsdEk&=F3|6a_x88m< z|8JjuQ0y+d5G#odfoGKnk;-r{!ypKgwTx`qL;WxcP=_ z>G%6=9_yinBo%?{Z@Hdkxulz3U`y>#?H+KryGL2AfS7AeY@ug4DlO2tWOn`vv%@Ka z^-Zks9A4f-0zp|eHjl8my-Bw+L^3AH6AmsPaQ3NFbjGsQ9}p#q<%RRye(V~y?|3uQ zs-rZ5bC-92_B#puzW2RP3L*TDz2?Zf{`s%}n|H0R9Sbt+$x%N;EOrUeHfp%T7)g}% zsPddhX^LKtPH0Lr@ob+W76=4hN{UFa42H%!(j-UYg0NOxdvx{a<3XD(PHEPh5L!>)iQEyL<;8 zdw#DuoUg!Iu{@jx(@$9KU#5vN^5Gg<7^G`ZQqu*=s;Wq0jdKCr8=-0NK5#IZ5nIdV zu;6T3KvyBEd5~IBw(UCKq^ruCA|)we?PJ@>^LrDXxHx56&DlP(!59AeVZLGmKY!2L zFnTCZE&aTA;&8SQKl2ZNP#vy}7!EQ~#1cZFv0jx9WC&XGZPayhi*xNd!E^4pvpn_K zS11<;C?q$XIKlCq4LWORtfDGg{BlAF7OxYKn*LzGs_s~i76ezL(gGDHBuRwSirPrp zxMd@qfe-|p;eoB5!E}}=*7TADFBL*cOs9!ekLx!hw31jMsXGs8&h{%_Pdq$M+x->R zEohBB>O=Uuz@P9foIH6_04SNH!8_6UK-L=wgTnVV$k&e`^EI4z%&Qg7R>(MG_i)Z& zP~fG+IFC!$$oqYUMTrst-Ik1=c@7!HWWy1?BIR&W+HbtE1N@ykZ@S}f_cU*K!z)4V+w!vULBpaSMC>Jd^$XxkwLD5X(J0>L5y zF9etO_Q|}#b{#9Ln9OE8)J$m>OO$|OG(hSejWJPOx3Bwlf!_<<2i$hUPS(p(ktn>> zK@NHe{a*a_xW;tUO+zFC&KRVO8H@&a=Kzh0G)e_bQxOS48pX_3OGcvs>!Tc_6Cw@0 zBH3K6DgX}%AiVVrcdh=@pMR2B+b|pra6utOz=uH7SbVT32~F$CQytEnx*!I5y8PqM zKGQw))Rm6_AK@ivzJB<@%k1;`lH^ew}e?a6Eh>YHNOq!$!B~e8WktlrZXv>D!YFg)zNru##q{xvf zB32157}~mJz1Lydiq>mPS<=r^GGUQ%k02!?2%J@f;PIVX=i9mufYIj08*mO4#R2QN zdRQ@EHEdT0)U6}3mbGC@anl?4oe%v7UUAzoy3W!zHFv-5J*@VwGAv?RCqWc^Jy2`0 z)?n*O1T;sFtZn`9y+4fu0=;FDmV_i zmQgQfRkedt4?GY97T~)IJm0(gPh4$&s^1?Xq{bSDNHRL1(aJH%6-5!#lygucqO?aa zU?Pd>98x-@PLLsBRDoaXp$!D*5dr|pd5MT}e11KRKfulBC=5cxgrLDVgtdf3lJrN| z?f}>ocgr~Kh zuBqwf3(RDWYb}NHz?A2jKx-l*rNBCb)`(!CUJ@&db)KS#-#XsN|26OnyoC1?!o3J= z8+4MSq)CGJmfmO`FBI)^PKxE(GZ$IA{Vtw=;!(<~=G}MS&5>g}T)A|WN1pr&hpQEz zfB37c_hR07$IbZa5E~SxT;Xj?wQ6Zw6L}vB06+ljm6B!W*dFE~8)qa!GBSc$)&nFX zt61eJoe2mt5;LQaIwZ%Bqc2|k){!OO!i@Y=PDQ3`Y6u=JEbZYQ?W#n(4pGi%rw7E% zlI3KVs#+m{R6!y-5*^THLa6o$ro*{FS+y*y7FRD3!4hN8p&}BVJW0s20Us&3TxM9T3EjMCwk4^=r&t2iZ z&wquloP371tcdavzL_&yED_CIXko&zmm{S(&Nq1eV3EwG6*C)&vUCuj69QScB&Gvz zQJuq;9eb-lEI|mu3vt8WXoCC0@oKrO@xRL%EKwus^oWn>$f>vE;&3n;P-#?_eipcu5~QS79}M0 zvZ8e(mc~%Hh*<+SjQcdp1+J-GQRF&~_3MHA0016-{F#L@#?MXTRMiuSX^4CmP*&7k zppyjLfoQA>o$GvAqNIx&!2OK^OZ=_2>y*|K1Q=qn;RcC1Pt_TgK4u(e#6gk-K@ux` z(1f^8RE!A5Q45c0Yl5{10&ygzJxOyz71MdvAR2z4sY_gUQ~u_ML1x6YoxDjvu zl#maG#Cealb2ub%oYMLwUE^^qvD@l0=vQN$yCrBBS?CvVo1^#M3F`ywT`13DS0Up@UOo0 z*j+cj{yO#0)2H3zXP;Cjj%<>RN5n-zJ{SPdRyCVK(;p2{QA}eD^Vx*5X;{~S&VYy< zZoa~&YqZAD8;m(LEzg{OmggrGLO@m32>=iP=Ci{O2NCy$j>{l|t?ODPs)gt^Y<7tb^C77PL)62!SXxNDV?t;z%>}75ykijCat* zI_MNkg>Or$dX5VYXCajkM8Gx{fFj7-PwbG~*@Qe*4J)a7`v2EH<|} z`Naq2`RN|xL7$?R5(Eep(RKn$AXb5uP$-;tC_JHUz#2$V*k} zz;an4ss(LYV1-Kg9+A9+Kl+2;7_aZF-`-h4@Ct7lL|TB*IAiI`lKnd3uu^!_q1}wA zn-SXvyg`MI3`c^YUF>n&>)*ujSG<=0`-#u7FBXh%9Fbl#BCIKn+`7g3Eo)4|K9y^D z<*Q#y(>XfRkf$+{4$~}YgTzWjNK$lvh!6q0T4KE*L<(E(Bf2@x8iI(?!m&OYaN_vZ zHs8ijHe#~~I3+&gL3NPMi>pgRXA!5P|>#FY-N_;Kv{N+MTQ2tFJLuB19l~kJJgH^-b{5 z)eY0>jJ!Bb&l=KditlgHwJlT?NnVg*FjYfPf@3$ony|OWUwrNXPF{YBJ8nC{;lZ3m zRk6M{BG!uY7q9Z}cihc8-uXj(?dj7TTOZMnQ}BVNG03Vx)N?{UphIArnxMWP1 z6NJ5h_+lt!{tY+uyMH`M-K-pKr3cd7A(jjJU%Z8#?6Lf;DR}6Y7vt@%mtcjw8L_u4ZEapoN4iCBM_!b-M zV=-GKR7-!$J@?#`0oBVE_}r<}JJt}5H@AtRm>?D9;*jy6kGCEK^b^H!l!J^YOM_Jn zG%a~M#hC^pLHHIgBMvS;!T27KH{=oA$^As7N3hm$#z+3Hp$^{v2* z0)PMh?EyeYdFs-^lEtEt(pu`aBSCPipHs^~=QTPlh)hG*lnggEK}xK(6vF`-21Wyt zeop5cxWK5FFx}my*Hf&zhNv<=iXx>%^T9GwSkk9|G@)aew@GerdRWWZ+ab#RP0@u zK+}=*BMui0+6pk1Pk!;!geYeB%08ESLwr{f#W8snGZ?QC;qdb-bgKoG_p}{&l_G3~ zZ7aIABldzwYTC{bB{Ge)+~&o&kNW_~lH$^{m*&Kg6=m({r;*?;aCg!3eMj?fy{R4f~Z3MK2QzzT`!3~jmK`KwcQoo46Q3F0VYW6-Cq z4HtL!N%|v3<28(N#JvPP5*%E<%K3{|P&+-=*ZLR{vs%?G7BdEULR(6*tWRHDhRGE| z<-rAljA*+STQ3kH;Dlx}U9ebMq!1_}&{`FI3wxJKma7(BXsU%Fmyl$zP&q1tJ60(lNDQYh!iwSrFImBu=c5FR0*wVrs;V-&BLPXk&j(lli@T{!?Cylj`OZq=>N z%9?65MM_Xop#)5-8mUvfb%>~kPI7V$C`}h91S#-U#s2<^{nB&SJKw__f8agr9Npo$ zr+4|&Pko6$`q=0A@~LxF!vSiiKyPnQT)WPGQ}gJP&+@geJj!f7<>GwB=}F0BXP@Wc zQx|B_GFrA}Y7+TK}bkR(*A1tEA2CNp-IOR`al^p@OP*0Pjg zV$f-yTJ`AWQ`)GZa-PB38b`K|61j@S-X;2D&pki-W-eXWBMo~JQ^Bwu4K zU1Jah`fTl?QnIkq3D4(fc{|_!oHWp(l9a(Pwz%;V0SKEh&new(FQQ2J0NN z{VOQnVO>QmJz7V|U}(K$v0M`J92Lcw=^}g^dlcYI90InlZF>Tcl=ZZ#1 zRt~yFO+CLr?KN#3aCHrFL_4kc*nR&8oA%gP>vK5icPKSN3oQWCtN zZ9T?#?*B|jnx*vmIm`KyW!@16lFjWMUUl28oV##=c2#lp@I~XDVhLCFCd_9gkM_dV7#%#iEEDYlka*9v&u2bBSu-EY8y6+gj5G;myF^8QM`pN4|w%;YrNx) zchH&^85~MQbV1^brRyxnh~cP@a1|(MTT5^bRE{iXMAET}H?S&ZXIzj+lGIn!rAK(l zoi}drnmcdiniJQ-a>m8W&oM|P!c{b#qwOq8DdI?@;{GkL`zYUFZ*NZk#Dn3R!(u`( zwQHA^7Lml6Ln@V`(iBNRdrvP-Fg^~lYEe-ntbiIt-F3k_A<`(OH3=dFOg9hK)DU1Y zDaCMoC<`4^B=V+T{KfaCANat1_4hpRJ8#-p-_H5f<@tTC-ALHpK7#cflf$cYRZScT z#@m~$`IPY>!F3g~s)>^nsT6`C0}lw0ZAOTDTszz#=!hiNC<&%4aY;l&gzP{|3Buxo zL)HyKJ6tk?wnTLmrZ)g5@J)q8fGJtc76hp&j%?A0l#A0PlgU1@wzzJ|`GY09i9&+Vh76viweh;aS!akzMOMi4?qLC`fFFZ|mZiECH$sF}>py(sSY zD)3w1^N!=QeaR7 z(}D3gDX^|3?42V^VxoSZI8DgCJ{T7!;~1XN7Y8j4{7OUSbrw4$0zGOS+Xo) z>*#ROmZg&3ug+iG6=h|6MV2JCZqKMx)w`3`?d9|P-NrcUTo98eNz!_`>V5Xhr;}kX z65DBd)`$2hDdi1cdgRnAQzhdU&R&UA`PWeLy&!lo{@`E!$Zy{L_BZ{;rFqB0C(rPi zCr(0S*c_+CGA0ny>lY*mEEXL}0f>lTG)_6{22><4&XY=w#nW|;;4NrP7ALfAgE0429hi$(*olILVAisW39%x3W6tynBW!8w)hZ;bVRS05yg-xh?Hi3Her8KbLom< zaxlSEB}o(!1Ze!PoxZ&P@BV-L=I*OYmY((B`>spXSKqhyK9_Ev?lYbqdB#H<288XA z7=#c=SOSU6j>rfIOoBv={7;yaoD7f<0fN9n1eOdVe1UiJh#Pb`b^)8kAG9gRn( z*SAQ5%cT$mS`^#^Qib!{&>^DYYzF~T_WLtIBYDb5G}cR@EO4HUs15?XJHzMn?uPCUHX@&1z!dHL!E$HS=uyz_vo z1YwwX^5_vi`r^P^Pqf;(tc_{~5XR7m5tbqVR0;tlt5V$XV`Wrji6Gi3tI({HW&=06 z0S=`slnyy5&5TkbN2y?q+KnK>m=kEln$vK^!Mg#%v4E-o!cs2G^8!?uD?@f#TX^~U zHS1atjpIFFz{AjoX~RcP9&>7+vOgUe^T6Yqk-QnX+Faq*IF}3CVWgG9G+i-W2g=g0 z?w~@gE4UJKrdP*(rQ6ChO;|Hp7f6uPz%-6{P~P6|spkbVN279ewPUxL$b+)q&%C{T zg?M1h*G#*}>2$s;7N&6`r$8%(ub#i=?VHym6%NOhw=bXZ@aCE!hj0%V7}fMDROSdB zrFtOwog3gdb68iNJicK)S6-ekOq+pi>m1IN-U`wKh*GT3Y9-Ez5C)E?JwXgmyeq94 znw3_BW$n0k&bNDVp6;COOCg0oZ;(r5f4pVAtVqbza?5;yaTs{=3s-#goe+QB}BNnQc@632j}$m1)DMO3lBzamz6KRe9g`E zHE)KQ^V*3aBI4u#OX-}Bw|x7FUU^8EGBXbs;I_G*ZjVvOn_icb;DS~Oc=G5Wd78K$uc13m+3+YO!jLJ^h|$SW=?y&S^LHNbt2eKozxneoe&`RD@4tHaio;T|>V!$S z?TxSZXIui-kKK1DdxqNvvjcbFhY*g9||dF>kO^vCEO`>qtzQV=rifG$`k)G@O(o8lB79|M@!) z_}~8U^H;z9o4@g|>-Asy{@e5Ku|J&HM8Rh$rDA40yva;?0LeTaA?3i)GG|e&DGHby z)rI7p>$T(KHG2tk*)UEMCdOPUaR(X%??Q~ijWkj#>~*B0Y;Q6QnPn-gYbUuq zK)9uFPAe{%Z3@imOj&2h0jm)VBt>E=aDT`GfI*jymjiFkl@J>@+YNCotYw9$JjlxX zn}|DXc0wCQmL+nXAi8p%jioEw2)pLo;D{>8N6vXex)PAYl_{$=tVaTg%@!WE3qu!1 zcP_mXwt->0p>H#FT@it`I%A0B-bts(bg0QW9WmAjZNb zLWn|45Iy0hsCBkO;534Sig(CErmGQy61&l@v9cjX0S#1)piVGY=~U}Tg^u9^#9hL- z56N{V9#;-$p?9ZLBTWNiubk&Z@rrhPbPpKFq5D|gV9SNJW@Zhf(P_=d2mv8vurbgz zQ!9u>`cOzIG7|9K2uT^^fOMs+fh-V!t{{Q~Wi9k3jJwPr!e9k}OB=b^2JMPAD7F%! z5JI2>y*Jj`p(?en^f3^|fw&YfK^!t2iwTtoK(+q*enbP|@kdL!`4)%$fmUWhj7W+! zhb)04MlX%FI^GIaR(!268%Etpt`!M}ncD6QwY; zBcU~_N7e}7u+9v#GD;&wXETk&m?#C7(m5X*%dJorK{bI2NsMKNWnGbAL{(a;5AH8I z{=wgQ@0UORmEZDl;MMKSes3)MLOE4Zh=gHFC9`^9_6P*JIqRh$#R)4IitdbI>u7RP z>I~6vhi(qu?qF`FK;G?e%>Z27C=!S?hL}kjNEj(8stpb+sjRp_2oa6KxptaH+S*xH z#{soYY0kPdYB2<**2dEhAO7|`KcY9mp6+7%wYSfH%Kmo7C33g_;-qMVAS^W#6L&Dg z3~|ut^kDRw@X$yh;vOj3$St#}7jjji?wFgCd&a56*pW*?FM@+?T6cYgI` zogrrc%Ch2ZLGpx)(R!d&L93I3lcJz0b8<)efE+u`Rzk=~gNm|f#9Jks(!3)raFY`? z8AFal>jYM$c0^A2EVP)3c|>!jkBY1dgFENaDYZd>6OoZd@($if2x$<)6q$=N&jpFX z*Dv1w?mIuCfA`<~*O&8L{{3Ms%-TrF0L7cp)=Kqumt}7mIIcodA*2K*SP*i~)YiF} zv0A5BV+|Y5VGG@ft&prCy^$~|hW1G70STEnY*^D41$1@h#i+|njFpr+76PfQgyuv| z)Gk~MW|ZEI(&1u4=}yRjm?93)4R` zaId%qtaYpu7z@NqH%A;+cUlwT-WYRbcMYy!K}oR^&lhl`jUy5xxfhhiY63J=1z#^* z&NEAQ5>Ch~vAyLArL7BfR%#Ept?VztLd07qy3?&8TERM^in!q(NL?wVf(aog<}UYu zfmgTt@aA=+nIKfeA;giG5<#FAgOt#a$aLt=5S$P?n^90vmctaNK=gcyXL0ves9x_jpV|Ks2K8}B`u9{s&fe)z}OumcNNtMt;yID zt*y8%*wQI+fS6H*)gbgp1d2QKhJ;8l;p~|hIs!; z_I_vi^-?>8ilvIz1uxEWIWsGaL%^i7v<2k|!xmMA6i7MX)o8UcZU%O#bHFGbkP7Y< z!3a7LW}(-ahI8k%3awl~BZ5&%LFR}C#mZe>Nm8NJj`fE1jROrC!qwFV z@j~y3wwz&Jk)SW$c?W;_;`H*XKY#W|miViRQ!hvQdSNypTwRk|;q99fc}#?qu%J*o zNXM3ilN(VJo0Pchk1WGT+GIo=bEnRRyP?aT>WPPsuZiWv?S3WzZ7oO+xC3>@5pYOD zVjP6S;Yja+5EMZ`1l7h6GFBQ@A|F0|fOvzDz#SlEAmW`5xc@-Y+su z1INRGa#?Wi5EM-b6=gmxJlHBf_})jn_uz)(+cTIkj2m#lO2@$C&Q z4%85M^8Q4SLa#=f3tk%lDGAdU?qd?b%i8~oqCiDei81p0*`7a$&vBExe0lZYA;T2u zUI8&cbA-$3$md@PdCa`{>NUL?UJZKhVaNgPU#B5M=Nn&q`Gyy73a86lg7vH_XjZgw za&#xj5bvD!Gk@~q1EmyhFBe3NB#H(-SNFGquj9B`+TrlMAOG2bXM5PcJz(>Sr;MhA zhR|hczjqH9IClSc9@0NcG5$kK{XC{*$MdrN{L`OGh#?FqEIEhIYFUGKjxKrI+@E;0 zf7z@3_1Di{O&u>~sZ&bvyQqFvTKylga8&pcy8X3k{_CgxCBJ=j{J^dK=Nx#1N^Yfp zZk;a#d4l!#MD#CSmifPb^2uk9JMwW9UT?R<^JTdlMB{&I&Hl76<<_lyGY|RizIplj zZ#{eV>WiTLqiGm-t;ru|`hROpe%yQekN+0{_xjeuQNQ!vRsaD0!qaQz|3M!;`q>&k nukSv66uAn6B>??J`^RyJn00000NkvXXu0mjflcU|i diff --git a/graphics/old-files/lead-ore - Copy.png b/graphics/old-files/lead-ore - Copy.png deleted file mode 100644 index 40d4bc7725cff97caaaf93721c00071d8734c1cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6607 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 N002ovPDHLkV1jP@xnKYQ diff --git a/graphics/old-files/lead-ore-n.png b/graphics/old-files/lead-ore-n.png deleted file mode 100644 index 5ea22210e629f561a566e4aac32902ccf67aadc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4402 zcmV-25zX$2P)r8-{-0ipYP`5JW`(*$4dx5daVbQFsMJQSpiZ zg21b*t3?DsAzTFn5PS|L!B7r`${+`S{A-Dj4Fnlv!K7sa1C>HUsi~}dZU*8oYdWND(;VsTuG_Gy8Q9)f@7DTB? zF~%HKWlEVON;*z>6yvto5gJ;eY}M&JV=N5v5ho>-lt|W8YMKU4O9nPfo7B-ZE()d{ z^rTZ3U8|{dHEpP3uIFa04011ZtA1f9sGN6yUQ(K}M{qfh2`YVGwPZ`4^1O8!B{N8t ztlQ#x&*-W!VVg;HJ(apr-HlG_Xxcz&s3V7>C`O9OYH~QL71rZoc_H=(DOvPC^GPk6 z>@cIQ?UE5|+SV9R9cZq3(KuS;*pZ*U+_rA}P025bH@A5ogK-Dab)KZRAUs;@jkOjw{l@F|Zohu(wbPsGwc?=7!w2&( zf6;!l3bq-s)%Bq?swo;XF!Tw9BYCSSbx<;J%w2|}Xw(4@%E+QD3o4gv=(ymF8Cl&_hwa+ng9r*p)7gcGX};Lws>banGV@nZk{+a7p{B!^-sKE`|kH%)0jBk zSgM^2*Vd*dn@?Q$@QV*M>~ve)mp2KzQPS@qIY}rX;cB|!WYPM@Nbyp0ut)F;& zc6Idj+Pu078HLu%gM8(a-}}}UHybf;;DX><1LwlAcwH63;e67l33bueUL9aoL?z0y z`z7u0W6Q=xBYD3~x+W}uXJl*FJ@tz#wH?I`#+51o1APsR)AgODB{gF<8MR;b6GQFd zx$3MJy)Y5d z_0aIHX%nU$6p@TtGhS`+yfG8Tl$w%&68ea6H9tF@*UxVX154g$L~sbneh-<@R^^vX z*kw|Xx!OD{)wH$m9LaIp+PMuk%ChKyU)V5ovyED7aMG$tbrB_OsANGFKybi$qe8wb zT*xggHJtUAhIVNfx&JwJGv<`8rbm`UOrtV5I}Fi4As{*^yP#)vFr^`y&=e4%ay5r6 zDG=NysGH2YlxlAEZ4c_IoKi~P=$Nrn7DWM&5hX*FWQa*miUI!SO0rwECG|Y%dVB3f3BTuzt_4{T6tXPHDqq)E6P9`tRe9c`Qu{ltu%M|c%C9z8 zfh-%k?39*69}WK|2m*pi7Bsxg_c1OYA@GOZC#o_aoBR)7#y%VbS*;x1zt4Q(EnP`HKCvn%2`-=}D$+R#Pa=8~Tw4MI*94vc8%_ z;bKVP&anUREB9rUWk+=dg`iN#GFCw3lv7UUi%O50vfI%I&b0HeH-6>b_1tM4u-i3u zTF^0Vrzr*3*z&MAi+bISdN4IMv~0AxvW5k!tU z>Zw#KvbJFKo}XVjww|h?tn1Q7arbn1kN180j^jHNu2qv2T9T7qQZw_-UH@&*@9aCW z=7;|F*N)~^zMPML=YpY9OJDbF`|cIzT|^Mk^&?OFuOPC;Ry&8y9hdcFd82#z{93Os z({|X;AGl&HOn)KnzrmE6p(N=#=CCCj)~cRjqp4aF@Yg7LtDqXJyS!^Q4hLaSc3$YMq?%Pf(KahsH=(T=4&|t$(DgG9Syc0~Z+>R~ zZy%dIX~~3}EI4REO%`NHRH37h2O(QFgTkuJHO^;5rc9Y!nHtOu7t=~(RkY#9E;{Fu zY4f(4^k!K!5(cx6`nGSq(tge!TOISA+4JVy?%nQjmmTVWARr2+9J8k72!h}xr=8ky z%1M-zfc<$$W^B($6r5HPF|{?4I`!{Xa8v4 zxJ8ef)itRuc!y;hTIS7ZDu(5Wc+N~-FcX*a2@A$62>=tuJboysxktd1%n1@oKq`i< z_LlCjH>_`ZWY0VQqG+4fHSa~2z1I&7WnFSl5={97{)Tn0)ix~xz@B&05|)ozMl6X@C`wTrG_F6Y&h?dUjC_}Nw;W*LR0+G z(kJ_R`i5#s(Lh_nR^#ewf*`JiPM!(NkXzMwk`N4CQkeNv?T?}l3Lsf>tJ5ec5OPq( zO7uQoG-4*)^R2Luzgm5vW!Y+8x2~zsRJU$TM9qxsyltANLo06zozT%CE{EmZvL}y| zRo0c}ztZ}nrlu@_@CqpDi$Y9cP}2#5yFF}Dd|y`6wRU&)Ku0vGqpP7UXc&sNnqSMG zfBv(h#!iG8n*z&$R$Pwfax1sOzHH!%E3Q+1tPtHQ^6Ci!C|MVkMJtI}z*fKIF_oHC z7Z=(ORI&o4hOE$0nYP8m!=r!JURhMPa5#Lnd^mh#_{HLgg>Wu>D1$;dv${M`$SSvK zBDh*2D5;CYZqcj9^|~Zz8qv3E_12BYHe@v!g`{twWwSA3f73c#ER-`XOS*TDd_5R` zF)0t{yL~Jo2*$OR8&(8`+f5)KfFOX9mLR20y(mfneMfbzTRC{;v5SJ5B)CdpvngXA zZ~i>okoUCQ`StJK^YEct4sH6A_;5LsKbjYYox%Y-RZd#9-TMUu0a*Y5lvKz?j-#DI z6g;J8&FV)kf3+uw0y2_H($X^e2O}@#Tk=9ybf!KuZIh|h#ZQ*De5E*%_mJ!ayJQgr z0SN&>03|DeP%DdSwV`3fDLoqpuY7ey>(xUzmCDdS&96OTYjtZp5tq}R#_zuK3zyU; z8XC%X4ek#Ur5Y%Z5fEfv3njAxLv4~<{hgW>i%)N$ZBmqxB-JYhva~g|!ntrFOAFz9 zYyWcXi^H!BK319gZk|Y@+g@!fA;>ZUymkkI8XGk=(?%qPu_w-{D_l`XDj69;-86ci zN+*KY3bO7;Uby!@<-LdQEyAc-mv#Kmm|Kj>f(Wl^4iS`mz+WqsW?he_zTW$WXM>s% zeHlqcRv0&n-l4&vD2Pwy@2-9HX)i0R+m+WoTK`&wtm`3fGB3QE{xy#wf&kk+VOEgw zv|sv}PM*J-Jt__K5zU!W2!doN>s#@(BQBXxn(_{BKH_#pKRx`yK*K*aD)8Fv$0cud z93_NT%K;CWm8`0xrDsD_SDMyR3Mxt8S!bN~lD3WsTWq!64O%D4?|NkTx&G&i&~Vh- z1q5D81Q8+tq6OP*esV_Eu`cVWv`ib-kR%K}=V1@|m1N$Xe#a+#`1m{S*m7HAx$*OI zcWw>%-M+RS|4#u#C;(*HsHWCUGm9-rkc^l%ZbYF{NeWHZm{FQ@i+jD>{!eZHC!0Py zb3^k3VIeiEkJmree0~4(JvBf5dj}|?01!mC`=Q9@RvuR~R1;7Lh9W3!_QB(O_do9S zHksU0za`v2>Qv7RAE|E1j}JdE{B->*BOeK0>-@t90ASMX9@Hm{ zKfHEVC2JY6BD^AM8Ph$NKh%BV;=VI3TeqR3j|)bWrq$(t*Z=_lMA?Ejxaj=3Zm6qi zTCl?@$s+<*5)f9fmFOOlNI z+OGhDETM3tciZ6_HN*T%t6p?Wv05k`)sS^dg}UK8eCa!+?VgI z_QCgcB}vbH9`FO}k^~~u0FVJ$c0^VgUO48Wx*e`pjEB!<*-<@Yliux4O-yQr9pPqE z8W^)|V+4l8vZdg{)fXxZu( zTSQs&=W8FZ`En^CyMnnl206_+v)R#0|Z@)1lQGqlw zTqqY3$N*M6su1+Qw0fV_)b3q+{^ab1W-rC{+{xLt@N({0cRtOARzM)5gdqU0{=Mzg z6I^58Vxu$MQHm;sq_;2aOLvWHAj<*<9y2i1J$U8M`t71K=>KB)Oz$6cQZ-0*QA5m? zzJbLwh^-t$0F*F5763t(vB`>S!(4965Ri~mN<(obE;m4s1iw;R)!Dpsde{r8m!9-= z&d%l=6p~WIc*r^HI&XlG6QG1e%K$RSq7V5yW11nnFxXKTs5AuhbQQ}@^Oj^JQCoC5 zzOb}WO=)<+vzEkU^FK8CmiP{~uic7YMbl8O_u{_5c6?07*qoM6N<$g5%Fv9RL6T diff --git a/graphics/old-files/lead-plate-old.png b/graphics/old-files/lead-plate-old.png deleted file mode 100644 index aba7eeab161f584974daf61efe8420cdcad3e7e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4888 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 LNkvXXu0mjf%QAkw diff --git a/migrations/bzlead.1.1.0.json b/migrations/bzlead.1.1.0.json deleted file mode 100644 index 05c8ea3..0000000 --- a/migrations/bzlead.1.1.0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "item": - [ - ["fu_lead_item", "lead-plate"] - ] -} - diff --git a/graphics/icons/lead-expansion-bolt.blend b/sources/graphics/icons/lead-expansion-bolt.blend similarity index 100% rename from graphics/icons/lead-expansion-bolt.blend rename to sources/graphics/icons/lead-expansion-bolt.blend diff --git a/graphics/icons/lead-expansion-bolt.blend1 b/sources/graphics/icons/lead-expansion-bolt.blend1 similarity index 100% rename from graphics/icons/lead-expansion-bolt.blend1 rename to sources/graphics/icons/lead-expansion-bolt.blend1 diff --git a/graphics/icons/lead-ingot.xcf b/sources/graphics/icons/lead-ingot.xcf similarity index 100% rename from graphics/icons/lead-ingot.xcf rename to sources/graphics/icons/lead-ingot.xcf diff --git a/graphics/icons/molten-lead-sa.xcf b/sources/graphics/icons/molten-lead-sa.xcf similarity index 100% rename from graphics/icons/molten-lead-sa.xcf rename to sources/graphics/icons/molten-lead-sa.xcf diff --git a/graphics/icons/molten-lead.xcf b/sources/graphics/icons/molten-lead.xcf similarity index 100% rename from graphics/icons/molten-lead.xcf rename to sources/graphics/icons/molten-lead.xcf diff --git a/graphics/old-files/enriched-lead-1.xcf b/sources/graphics/old-files/enriched-lead-1.xcf similarity index 100% rename from graphics/old-files/enriched-lead-1.xcf rename to sources/graphics/old-files/enriched-lead-1.xcf diff --git a/graphics/old-files/enriched-lead-2.xcf b/sources/graphics/old-files/enriched-lead-2.xcf similarity index 100% rename from graphics/old-files/enriched-lead-2.xcf rename to sources/graphics/old-files/enriched-lead-2.xcf diff --git a/graphics/old-files/enriched-lead-3.xcf b/sources/graphics/old-files/enriched-lead-3.xcf similarity index 100% rename from graphics/old-files/enriched-lead-3.xcf rename to sources/graphics/old-files/enriched-lead-3.xcf diff --git a/graphics/old-files/enriched-lead-4.xcf b/sources/graphics/old-files/enriched-lead-4.xcf similarity index 100% rename from graphics/old-files/enriched-lead-4.xcf rename to sources/graphics/old-files/enriched-lead-4.xcf diff --git a/graphics/old-files/enriched-lead-stacked.xcf b/sources/graphics/old-files/enriched-lead-stacked.xcf similarity index 100% rename from graphics/old-files/enriched-lead-stacked.xcf rename to sources/graphics/old-files/enriched-lead-stacked.xcf diff --git a/graphics/old-files/enriched-lead.xcf b/sources/graphics/old-files/enriched-lead.xcf similarity index 100% rename from graphics/old-files/enriched-lead.xcf rename to sources/graphics/old-files/enriched-lead.xcf diff --git a/graphics/old-files/hr-lead-chest.xcf b/sources/graphics/old-files/hr-lead-chest.xcf similarity index 100% rename from graphics/old-files/hr-lead-chest.xcf rename to sources/graphics/old-files/hr-lead-chest.xcf diff --git a/graphics/old-files/hr-lead-ore.xcf b/sources/graphics/old-files/hr-lead-ore.xcf similarity index 100% rename from graphics/old-files/hr-lead-ore.xcf rename to sources/graphics/old-files/hr-lead-ore.xcf diff --git a/graphics/old-files/lead-chest.xcf b/sources/graphics/old-files/lead-chest.xcf similarity index 100% rename from graphics/old-files/lead-chest.xcf rename to sources/graphics/old-files/lead-chest.xcf diff --git a/graphics/old-files/lead-ore-n-2.xcf b/sources/graphics/old-files/lead-ore-n-2.xcf similarity index 100% rename from graphics/old-files/lead-ore-n-2.xcf rename to sources/graphics/old-files/lead-ore-n-2.xcf diff --git a/graphics/old-files/lead-ore-n-3.xcf b/sources/graphics/old-files/lead-ore-n-3.xcf similarity index 100% rename from graphics/old-files/lead-ore-n-3.xcf rename to sources/graphics/old-files/lead-ore-n-3.xcf diff --git a/graphics/old-files/lead-ore-n-4.xcf b/sources/graphics/old-files/lead-ore-n-4.xcf similarity index 100% rename from graphics/old-files/lead-ore-n-4.xcf rename to sources/graphics/old-files/lead-ore-n-4.xcf diff --git a/graphics/old-files/lead-ore-n.xcf b/sources/graphics/old-files/lead-ore-n.xcf similarity index 100% rename from graphics/old-files/lead-ore-n.xcf rename to sources/graphics/old-files/lead-ore-n.xcf diff --git a/graphics/old-files/lead-ore-stacked.xcf b/sources/graphics/old-files/lead-ore-stacked.xcf similarity index 100% rename from graphics/old-files/lead-ore-stacked.xcf rename to sources/graphics/old-files/lead-ore-stacked.xcf diff --git a/graphics/old-files/lead-ore-x-2.xcf b/sources/graphics/old-files/lead-ore-x-2.xcf similarity index 100% rename from graphics/old-files/lead-ore-x-2.xcf rename to sources/graphics/old-files/lead-ore-x-2.xcf diff --git a/graphics/old-files/lead-ore-x-3.xcf b/sources/graphics/old-files/lead-ore-x-3.xcf similarity index 100% rename from graphics/old-files/lead-ore-x-3.xcf rename to sources/graphics/old-files/lead-ore-x-3.xcf diff --git a/graphics/old-files/lead-ore-x-4.xcf b/sources/graphics/old-files/lead-ore-x-4.xcf similarity index 100% rename from graphics/old-files/lead-ore-x-4.xcf rename to sources/graphics/old-files/lead-ore-x-4.xcf diff --git a/graphics/old-files/lead-ore-x.xcf b/sources/graphics/old-files/lead-ore-x.xcf similarity index 100% rename from graphics/old-files/lead-ore-x.xcf rename to sources/graphics/old-files/lead-ore-x.xcf diff --git a/graphics/old-files/lead-ore.xcf b/sources/graphics/old-files/lead-ore.xcf similarity index 100% rename from graphics/old-files/lead-ore.xcf rename to sources/graphics/old-files/lead-ore.xcf diff --git a/graphics/old-files/lead-plate-2.xcf b/sources/graphics/old-files/lead-plate-2.xcf similarity index 100% rename from graphics/old-files/lead-plate-2.xcf rename to sources/graphics/old-files/lead-plate-2.xcf diff --git a/graphics/old-files/lead-plate-3.xcf b/sources/graphics/old-files/lead-plate-3.xcf similarity index 100% rename from graphics/old-files/lead-plate-3.xcf rename to sources/graphics/old-files/lead-plate-3.xcf diff --git a/graphics/old-files/lead-plate-stacked.xcf b/sources/graphics/old-files/lead-plate-stacked.xcf similarity index 100% rename from graphics/old-files/lead-plate-stacked.xcf rename to sources/graphics/old-files/lead-plate-stacked.xcf diff --git a/graphics/old-files/lead-plate.xcf b/sources/graphics/old-files/lead-plate.xcf similarity index 100% rename from graphics/old-files/lead-plate.xcf rename to sources/graphics/old-files/lead-plate.xcf diff --git a/graphics/old-files/lead-powder.xcf b/sources/graphics/old-files/lead-powder.xcf similarity index 100% rename from graphics/old-files/lead-powder.xcf rename to sources/graphics/old-files/lead-powder.xcf diff --git a/graphics/old-files/lead-processing.xcf b/sources/graphics/old-files/lead-processing.xcf similarity index 100% rename from graphics/old-files/lead-processing.xcf rename to sources/graphics/old-files/lead-processing.xcf diff --git a/graphics/old-files/lead-thumbnail.xcf b/sources/graphics/old-files/lead-thumbnail.xcf similarity index 100% rename from graphics/old-files/lead-thumbnail.xcf rename to sources/graphics/old-files/lead-thumbnail.xcf From ec272b2135d64b9c9d5c62c1b1dee2f6f5a5241e Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:10:27 +0200 Subject: [PATCH 09/10] Rename mod --- bzlead2/compatibility/data/hot-metals.lua | 8 ++--- bzlead2/data-final-fixes.lua | 2 +- bzlead2/info.json | 6 ++-- bzlead2/lead-asteroid-updates.lua | 2 +- bzlead2/lead-compressed.lua | 2 +- bzlead2/lead-enriched.lua | 16 ++++----- bzlead2/lead-matter.lua | 2 +- bzlead2/lead-ore-particle.lua | 16 ++++----- bzlead2/lead-ore.lua | 16 ++++----- bzlead2/lead-recipe-colors.lua | 2 +- bzlead2/lead-recipe-final-5d.lua | 12 +++---- bzlead2/lead-recipe-final-rrr.lua | 2 +- bzlead2/lead-recipe-final-stacking.lua | 8 ++--- bzlead2/lead-recipe-se.lua | 8 ++--- bzlead2/lead-recipe-updates.lua | 2 +- bzlead2/lead-recipe.lua | 44 +++++++++++------------ bzlead2/lead-sim.lua | 2 +- bzlead2/me.lua | 2 +- bzlead2/omni.lua | 4 +-- bzlead2/other-entities.lua | 14 ++++---- bzlead2/strange-matter.lua | 4 +-- 21 files changed, 87 insertions(+), 87 deletions(-) diff --git a/bzlead2/compatibility/data/hot-metals.lua b/bzlead2/compatibility/data/hot-metals.lua index 03b1e1e..821a467 100644 --- a/bzlead2/compatibility/data/hot-metals.lua +++ b/bzlead2/compatibility/data/hot-metals.lua @@ -2,12 +2,12 @@ local util = require("data-util"); util.add_hot_metals({ {name="lead-plate", icons={ - { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64}, - { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, tint={.9,.3,0, .5}}, + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64}, + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, tint={.9,.3,0, .5}}, }}, {name="lead-expansion-bolt", icons={ - { icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128}, - { icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, tint={.9,.3,0, .5}}, + { icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128}, + { icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, tint={.9,.3,0, .5}}, }}, }) diff --git a/bzlead2/data-final-fixes.lua b/bzlead2/data-final-fixes.lua index e24546b..cd87934 100644 --- a/bzlead2/data-final-fixes.lua +++ b/bzlead2/data-final-fixes.lua @@ -4,7 +4,7 @@ require("lead-recipe-final-rrr") require("lead-recipe-final-stacking") ---- -local util = require("__bzlead__.data-util"); +local util = require("__bzlead2__.data-util"); if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then diff --git a/bzlead2/info.json b/bzlead2/info.json index e915e3c..1f571c5 100644 --- a/bzlead2/info.json +++ b/bzlead2/info.json @@ -1,13 +1,13 @@ { - "name": "bzlead", - "version": "2.0.27", + "name": "bzlead2", + "version": "2.0.29", "factorio_version": "2.0", "title": "Lead", "author": "Brevven", "contact": "", "homepage": "", "dependencies": [ - "base >= 1.1.0", + "base >= 2.0.0", "? space-age", "? bzsilicon", "? hot-metals", diff --git a/bzlead2/lead-asteroid-updates.lua b/bzlead2/lead-asteroid-updates.lua index bb2ab06..30eee0d 100644 --- a/bzlead2/lead-asteroid-updates.lua +++ b/bzlead2/lead-asteroid-updates.lua @@ -20,7 +20,7 @@ if mods["space-age"] then { {icon="__space-age__/graphics/icons/metallic-asteroid-crushing.png", size=64}, {icon="__base__/graphics/icons/iron-ore.png", size=64, scale=0.25, shift={-8,0}}, - {icon="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.25, shift={8,0}}, + {icon="__bzlead2__/graphics/icons/lead-ore.png", size=64, scale=0.25, shift={8,0}}, }, category = "crushing", subgroup="space-crushing", diff --git a/bzlead2/lead-compressed.lua b/bzlead2/lead-compressed.lua index 05bbf7e..1e7b417 100644 --- a/bzlead2/lead-compressed.lua +++ b/bzlead2/lead-compressed.lua @@ -29,7 +29,7 @@ if simpleCompress then } or { {type="item", name = "lead-plate", amount=simpleCompress.CompressedSmeltAmount}, } - leadRecipe.icons = {{ icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64 }} + leadRecipe.icons = {{ icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64 }} leadRecipe.subgroup = "raw-material" leadRecipe.order = "d[lead-plate]" end diff --git a/bzlead2/lead-enriched.lua b/bzlead2/lead-enriched.lua index 26bc32f..d62f037 100644 --- a/bzlead2/lead-enriched.lua +++ b/bzlead2/lead-enriched.lua @@ -8,13 +8,13 @@ data:extend( type = "item", name = "enriched-lead", icon_size = 64, - icon = "__bzlead__/graphics/icons/enriched-lead.png", + icon = "__bzlead2__/graphics/icons/enriched-lead.png", icon_mipmaps = 3, pictures = { - {filename="__bzlead__/graphics/icons/enriched-lead.png", size=64, scale=0.5}, - {filename="__bzlead__/graphics/icons/enriched-lead-1.png", size=64, scale=0.5}, - {filename="__bzlead__/graphics/icons/enriched-lead-2.png", size=64, scale=0.5}, - {filename="__bzlead__/graphics/icons/enriched-lead-3.png", size=64, scale=0.5}, + {filename="__bzlead2__/graphics/icons/enriched-lead.png", size=64, scale=0.5}, + {filename="__bzlead2__/graphics/icons/enriched-lead-1.png", size=64, scale=0.5}, + {filename="__bzlead2__/graphics/icons/enriched-lead-2.png", size=64, scale=0.5}, + {filename="__bzlead2__/graphics/icons/enriched-lead-3.png", size=64, scale=0.5}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-lead]", @@ -24,7 +24,7 @@ data:extend( type = "recipe", name = "enriched-lead", main_product = "enriched-lead", - icon = "__bzlead__/graphics/icons/enriched-lead.png", + icon = "__bzlead2__/graphics/icons/enriched-lead.png", icon_size = 64, icon_mipmaps = 3, category = "chemistry", @@ -60,8 +60,8 @@ data:extend( name = "enriched-lead-plate", icons = { - { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3 }, - { icon = "__bzlead__/graphics/icons/enriched-lead.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3 }, + { icon = "__bzlead2__/graphics/icons/enriched-lead.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, category = "smelting", energy_required = 16, diff --git a/bzlead2/lead-matter.lua b/bzlead2/lead-matter.lua index 9d8f239..3a1b1b3 100644 --- a/bzlead2/lead-matter.lua +++ b/bzlead2/lead-matter.lua @@ -14,7 +14,7 @@ data:extend( icon_size = 256, }, { - icon = "__bzlead__/graphics/icons/lead-ore.png", + icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale = 1.25, } diff --git a/bzlead2/lead-ore-particle.lua b/bzlead2/lead-ore-particle.lua index 5d094dc..bb4d645 100644 --- a/bzlead2/lead-ore-particle.lua +++ b/bzlead2/lead-ore-particle.lua @@ -8,7 +8,7 @@ data:extend( pictures = { { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png", + filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png", priority = "extra-high", width = 32, height = 32, @@ -16,7 +16,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png", + filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png", priority = "extra-high", width = 32, height = 32, @@ -24,7 +24,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png", + filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png", priority = "extra-high", width = 32, height = 32, @@ -32,7 +32,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png", + filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png", priority = "extra-high", width = 32, height = 32, @@ -43,7 +43,7 @@ data:extend( shadows = { { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png", + filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png", priority = "extra-high", width = 32, height = 32, @@ -51,7 +51,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png", + filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png", priority = "extra-high", width = 32, height = 32, @@ -59,7 +59,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png", + filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png", priority = "extra-high", width = 32, height = 32, @@ -67,7 +67,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png", + filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png", priority = "extra-high", width = 32, height = 32, diff --git a/bzlead2/lead-ore.lua b/bzlead2/lead-ore.lua index 4868082..8f1672c 100644 --- a/bzlead2/lead-ore.lua +++ b/bzlead2/lead-ore.lua @@ -1,5 +1,5 @@ local resource_autoplace = require('resource-autoplace') -local util = require("__bzlead__.data-util"); +local util = require("data-util"); local item_sounds = require('__base__.prototypes.item_sounds') data.raw.planet.nauvis.map_gen_settings.autoplace_controls["lead-ore"] = {} @@ -29,7 +29,7 @@ data:extend({ icon_size = 64, icon_mipmaps = 3, category="basic-solid", name = "lead-ore", - icon = "__bzlead__/graphics/icons/lead-ore.png", + icon = "__bzlead2__/graphics/icons/lead-ore.png", flags = {"placeable-neutral"}, order="a-b-a", map_color = {r=0.35, g=0.10, b=0.10}, @@ -57,7 +57,7 @@ data:extend({ stages = { sheet = { - filename = "__bzlead__/graphics/entity/ores/hr-lead-ore.png", + filename = "__bzlead2__/graphics/entity/ores/hr-lead-ore.png", priority = "extra-high", size = 128, frame_count = 8, @@ -70,12 +70,12 @@ data:extend({ type = "item", name = "lead-ore", icon_size = 64, icon_mipmaps = 3, - icon = "__bzlead__/graphics/icons/lead-ore.png", + icon = "__bzlead2__/graphics/icons/lead-ore.png", pictures = { - {filename="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.5}, - {filename="__bzlead__/graphics/icons/lead-ore-1.png", size=64, scale=0.5}, - {filename="__bzlead__/graphics/icons/lead-ore-2.png", size=64, scale=0.5}, - {filename="__bzlead__/graphics/icons/lead-ore-3.png", size=64, scale=0.5}, + {filename="__bzlead2__/graphics/icons/lead-ore.png", size=64, scale=0.5}, + {filename="__bzlead2__/graphics/icons/lead-ore-1.png", size=64, scale=0.5}, + {filename="__bzlead2__/graphics/icons/lead-ore-2.png", size=64, scale=0.5}, + {filename="__bzlead2__/graphics/icons/lead-ore-3.png", size=64, scale=0.5}, }, subgroup = "raw-resource", order = "t-c-a", diff --git a/bzlead2/lead-recipe-colors.lua b/bzlead2/lead-recipe-colors.lua index b1f07e1..eaa0c05 100644 --- a/bzlead2/lead-recipe-colors.lua +++ b/bzlead2/lead-recipe-colors.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.data-util"); +local util = require("data-util"); diff --git a/bzlead2/lead-recipe-final-5d.lua b/bzlead2/lead-recipe-final-5d.lua index 7694bb4..ccedb9e 100644 --- a/bzlead2/lead-recipe-final-5d.lua +++ b/bzlead2/lead-recipe-final-5d.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.data-util"); +local util = require("data-util"); if mods["5dim_core"] then local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" @@ -16,7 +16,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" category = "industrial-furnace", subgroup = "plates-industrial-ore", order = "ad[lead-plate]", - icon = "__bzlead__/graphics/icons/lead-plate.png", + icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, enabled = true, energy_required = 65, @@ -35,14 +35,14 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" name = "lead-dust", subgroup = "plates-dust", order = "d[lead-plate]", - icon = "__bzlead__/graphics/icons/lead-powder.png", + icon = "__bzlead2__/graphics/icons/lead-powder.png", icon_size = 64, icon_mipmaps = 3, stack_size = 200 }, { type = "recipe", name = "lead-plate-dust", - icon = "__bzlead__/graphics/icons/lead-plate.png", + icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, subgroup = "plates-plates2", order = "d[lead-plate]", @@ -60,7 +60,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" type = "recipe", name = "lead-dust", main_product = "lead-dust", - icon = "__bzlead__/graphics/icons/lead-powder.png", + icon = "__bzlead2__/graphics/icons/lead-powder.png", icon_size = 64, icon_mipmaps = 3, category = "mashering", subgroup = "", @@ -80,7 +80,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" category = "industrial-furnace", subgroup = "plates-industrial-dust", order = "ad[lead-plate]", - icon = "__bzlead__/graphics/icons/lead-plate.png", + icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, enabled = true, energy_required = 65, diff --git a/bzlead2/lead-recipe-final-rrr.lua b/bzlead2/lead-recipe-final-rrr.lua index 6e57a43..134e9ab 100644 --- a/bzlead2/lead-recipe-final-rrr.lua +++ b/bzlead2/lead-recipe-final-rrr.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.data-util"); +local util = require("data-util"); if mods["Rich-Rocks-Requiem"] then if data.raw.recipe["rrr-stone-processing"] then diff --git a/bzlead2/lead-recipe-final-stacking.lua b/bzlead2/lead-recipe-final-stacking.lua index 4619c65..16b59d0 100644 --- a/bzlead2/lead-recipe-final-stacking.lua +++ b/bzlead2/lead-recipe-final-stacking.lua @@ -1,11 +1,11 @@ -local util = require("__bzlead__.data-util"); +local util = require("data-util"); -- Deadlock stacking recipes if deadlock and deadlock["add_stack"] then - deadlock.add_stack("lead-ore", "__bzlead__/graphics/icons/stacked/lead-ore-stacked.png", "deadlock-stacking-1", 64) - deadlock.add_stack("lead-plate", "__bzlead__/graphics/icons/stacked/lead-plate-stacked.png" , "deadlock-stacking-1", 64) + deadlock.add_stack("lead-ore", "__bzlead2__/graphics/icons/stacked/lead-ore-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("lead-plate", "__bzlead2__/graphics/icons/stacked/lead-plate-stacked.png" , "deadlock-stacking-1", 64) if util.k2() then - deadlock.add_stack("enriched-lead", "__bzlead__/graphics/icons/stacked/enriched-lead-stacked.png" , "deadlock-stacking-1", 64) + deadlock.add_stack("enriched-lead", "__bzlead2__/graphics/icons/stacked/enriched-lead-stacked.png" , "deadlock-stacking-1", 64) end if data.raw.item["lead-ingot"] then deadlock.add_stack("lead-ingot", nil, "deadlock-stacking-1", nil) diff --git a/bzlead2/lead-recipe-se.lua b/bzlead2/lead-recipe-se.lua index cf5b0a4..c1626eb 100644 --- a/bzlead2/lead-recipe-se.lua +++ b/bzlead2/lead-recipe-se.lua @@ -20,7 +20,7 @@ if mods["space-exploration"] then { type = "item", name = "lead-ingot", - icons = {{icon = "__bzlead__/graphics/icons/lead-ingot.png", icon_size = 128}}, + icons = {{icon = "__bzlead2__/graphics/icons/lead-ingot.png", icon_size = 128}}, order = "b-b", stack_size = 50, subgroup = "lead", @@ -32,7 +32,7 @@ if mods["space-exploration"] then max_temperature = 600, base_color = {r=121, g=80, b=80}, flow_color = {r=121, g=80, b=80}, - icons = {{icon = "__bzlead__/graphics/icons/molten-lead.png", icon_size = 128}}, + icons = {{icon = "__bzlead2__/graphics/icons/molten-lead.png", icon_size = 128}}, order = "a[molten]-a", pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, @@ -77,8 +77,8 @@ if mods["space-exploration"] then name = "lead-ingot-to-plate", icons = { - {icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3}, - {icon = "__bzlead__/graphics/icons/lead-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + {icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3}, + {icon = "__bzlead2__/graphics/icons/lead-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { {type="item", name = "lead-plate", amount = 10}, diff --git a/bzlead2/lead-recipe-updates.lua b/bzlead2/lead-recipe-updates.lua index e693144..1ea9603 100644 --- a/bzlead2/lead-recipe-updates.lua +++ b/bzlead2/lead-recipe-updates.lua @@ -1,6 +1,6 @@ -- Titanium recipe & tech changes -- -local util = require("__bzlead__.data-util"); +local util = require("data-util"); local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" diff --git a/bzlead2/lead-recipe.lua b/bzlead2/lead-recipe.lua index dbfda83..2131137 100644 --- a/bzlead2/lead-recipe.lua +++ b/bzlead2/lead-recipe.lua @@ -1,6 +1,6 @@ -- Lead smelting -local util = require("__bzlead__.data-util"); +local util = require("data-util"); local item_sounds = require('__base__.prototypes.item_sounds') if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] and not mods["IndustrialRevolution"]) then @@ -12,10 +12,10 @@ data:extend({ order = "d[lead-plate]", icons = (util.k2() and { - { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, }, - { icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, }, + { icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or { - { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, }, + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, }, } ), main_product = util.me.lead_plate, @@ -59,7 +59,7 @@ data:extend({ { type = "item", name = util.me.lead_plate, - icon = "__bzlead__/graphics/icons/lead-plate.png", + icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, subgroup = "raw-material", order = "b[lead-plate]", @@ -107,7 +107,7 @@ data:extend({ subgroup = "intermediate-product", rocket_capacity = 1000, stack_size=100, - icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", + icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, order = "a[basic-intermediates]-e[expansion-bolt]", weight = 2*kg, @@ -136,9 +136,9 @@ data:extend({ subgroup = "vulcanus-processes", order = "z[casting]-d[casting-solder]", icons = { - {icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, shift={0,8}}, + {icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, shift={0,8}}, {icon = "__space-age__/graphics/icons/fluid/molten-iron.png", icon_size = 64, shift={-4,-4}}, - {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", icon_size = 64, shift={4,-4}}, + {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", icon_size = 64, shift={4,-4}}, }, enabled = false, ingredients = { @@ -162,7 +162,7 @@ data:extend({ { type = "fluid", name = "molten-lead", - icon = "__bzlead__/graphics/icons/molten-lead-sa.png", + icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", subgroup = "fluid", order = "b[new-fluid]-b[vulcanus]-d[molten-lead]", default_temperature = 1500, @@ -177,7 +177,7 @@ data:extend({ name = "molten-lead-from-lava", icons = { {icon = "__base__/graphics/icons/stone.png", icon_size=64, shift={-8,8}}, - {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", icon_size=64, shift={8,8}}, + {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", icon_size=64, shift={8,8}}, {icon = "__space-age__/graphics/icons/fluid/lava.png", icon_size=64, shift={0,-8}}, }, category = "metallurgy", @@ -231,8 +231,8 @@ data:extend({ subgroup = "vulcanus-processes", order = "b[casting]-d[casting-lead]", icons = { - {icon = "__bzlead__/graphics/icons/lead-plate.png", size = 64, shift={-4,4}}, - {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", size = 64, shift={4,-4}}, + {icon = "__bzlead2__/graphics/icons/lead-plate.png", size = 64, shift={-4,4}}, + {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", size = 64, shift={4,-4}}, }, enabled = false, ingredients = @@ -256,7 +256,7 @@ data:extend({ type = "item", name = "chelated-lead", icons = { - {icon="__bzlead__/graphics/icons/lead-powder.png", icon_size = 64} + {icon="__bzlead2__/graphics/icons/lead-powder.png", icon_size = 64} }, subgroup = "agriculture-processes", order = "b[agriculture]-c[lead]", @@ -275,7 +275,7 @@ data:extend({ order = "e[chelation]-a[lead]", icons = { {icon = "__space-age__/graphics/icons/yumako-mash.png", size=64, shift={-4,-4}}, - {icon="__bzlead__/graphics/icons/lead-powder.png", icon_size = 64, shift={4,4}}, + {icon="__bzlead2__/graphics/icons/lead-powder.png", icon_size = 64, shift={4,4}}, }, enabled = false, allow_productivity = true, @@ -301,7 +301,7 @@ data:extend({ auto_recycle_helper = false, icons = { {icon = "__base__/graphics/icons/fluid/sulfuric-acid.png", size = 64, shift={-4,-4}}, - {icon = "__bzlead__/graphics/icons/lead-ore.png", size = 64, shift={4,4}}, + {icon = "__bzlead2__/graphics/icons/lead-ore.png", size = 64, shift={4,4}}, }, enabled = false, allow_productivity = true, @@ -366,7 +366,7 @@ data:extend({ icons = (util.k2() and { { icon = "__IndustrialRevolution__/graphics/icons/64/lead-ingot.png", icon_size = 64, icon_mipmaps = 4, }, - { icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or { { icon = "__IndustrialRevolution__/graphics/icons/64/lead-ingot.png", icon_size = 64, icon_mipmaps = 4, }, }), @@ -419,7 +419,7 @@ data:extend({ { icon = util.k2assets().."/icons/items/pistol-ammo-1.png", icon_size = 64}, { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64, scale=0.25, shift= {8, -6}}, - { icon = "__bzlead__/graphics/icons/lead-plate.png", + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}}, }, }, @@ -451,7 +451,7 @@ data:extend({ { icon = util.k2assets().."/icons/items/pistol-ammo-1.png", icon_size = 64}, { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale=0.25, shift= {8, -6}}, - { icon = "__bzlead__/graphics/icons/lead-plate.png", + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}}, }, }, @@ -468,7 +468,7 @@ data:extend({ { icon = util.k2assets().."/icons/ammo/rifle-magazine.png", icon_size = 64}, { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64, scale=0.25, shift= {8, -6}}, - { icon = "__bzlead__/graphics/icons/lead-plate.png", + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}}, }, }, @@ -500,7 +500,7 @@ data:extend({ { icon = util.k2assets().."/icons/ammo/rifle-magazine.png", icon_size = 64}, { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale=0.25, shift= {8, -6}}, - { icon = "__bzlead__/graphics/icons/lead-plate.png", + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}}, }, }, @@ -522,7 +522,7 @@ data:extend({ { icon = "__base__/graphics/icons/firearm-magazine.png", icon_size = 64}, { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64, scale=0.25, shift= {8, -8}}, - { icon = "__bzlead__/graphics/icons/lead-plate.png", + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, }, @@ -556,7 +556,7 @@ data:extend({ { icon = "__base__/graphics/icons/firearm-magazine.png", icon_size = 64}, { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale=0.25, shift= {8, -8}}, - { icon = "__bzlead__/graphics/icons/lead-plate.png", + { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, }, diff --git a/bzlead2/lead-sim.lua b/bzlead2/lead-sim.lua index 9cc3551..2503bfd 100644 --- a/bzlead2/lead-sim.lua +++ b/bzlead2/lead-sim.lua @@ -11,7 +11,7 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then data.raw["utility-constants"]["default"].main_menu_simulations["lead-ammo"] = { checkboard = false, - save = "__bzlead__/menu-simulations/lead-ammo-sim.zip", length = 15*60, + save = "__bzlead2__/menu-simulations/lead-ammo-sim.zip", length = 15*60, init = [[ local logo = game.surfaces.nauvis.find_entities_filtered{ diff --git a/bzlead2/me.lua b/bzlead2/me.lua index 0864b75..bfcc419 100644 --- a/bzlead2/me.lua +++ b/bzlead2/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bzlead" +me.name = "bzlead2" me.resources = {{"lead-ore", "nauvis"}} me.fluid_mining = false me.lead_ore = "lead-ore" diff --git a/bzlead2/omni.lua b/bzlead2/omni.lua index a80c779..3f54567 100644 --- a/bzlead2/omni.lua +++ b/bzlead2/omni.lua @@ -1,4 +1,4 @@ -local util = require("__bzlead__.data-util"); +local util = require("data-util"); if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then if omni and omni.matter then @@ -10,7 +10,7 @@ if omni and omni.matter then data.raw.recipe["omnicium-plate-mix"].icons = { {icon = data.raw.item["omnicium-plate"].icons[1].icon}, - {icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, -8}}, + {icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, -8}}, {icon = "__base__/graphics/icons/iron-ore.png", scale =0.25, icon_size=64, shift={-6, 6}}, } end diff --git a/bzlead2/other-entities.lua b/bzlead2/other-entities.lua index ecfae7e..4e6babb 100644 --- a/bzlead2/other-entities.lua +++ b/bzlead2/other-entities.lua @@ -1,4 +1,4 @@ -local leadutil = require("__bzlead__.data-util"); +local leadutil = require("data-util"); require("data-util") if leadutil.me.more_entities() and data.raw.item["lead-plate"] then @@ -7,7 +7,7 @@ data:extend({ { type = "item", name = "lead-chest", - icon = "__bzlead__/graphics/icons/lead-chest.png", + icon = "__bzlead2__/graphics/icons/lead-chest.png", icon_size = 64, icon_mipmaps = 3, subgroup = "storage", order = "a[items]-az[lead-chest]", @@ -24,7 +24,7 @@ data:extend({ { type = "container", name = "lead-chest", - icon = "__bzlead__/graphics/icons/lead-chest.png", + icon = "__bzlead2__/graphics/icons/lead-chest.png", icon_size = 64, icon_mipmaps = 3, flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 0.2, result = "lead-chest"}, @@ -55,7 +55,7 @@ data:extend({ layers = { { - filename = "__bzlead__/graphics/entity/hr-lead-chest.png", + filename = "__bzlead2__/graphics/entity/hr-lead-chest.png", priority = "extra-high", width = 66, height = 76, @@ -63,7 +63,7 @@ data:extend({ scale = 0.5 }, { - filename = "__bzlead__/graphics/entity/hr-lead-chest-shadow.png", + filename = "__bzlead2__/graphics/entity/hr-lead-chest-shadow.png", priority = "extra-high", width = 110, height = 50, @@ -80,7 +80,7 @@ data:extend({ { type = "corpse", name = "lead-chest-remnants", - icon = "__bzlead__/graphics/icons/lead-chest.png", + icon = "__bzlead2__/graphics/icons/lead-chest.png", icon_size = 64, icon_mipmaps = 3, flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"}, subgroup = "storage-remnants", @@ -95,7 +95,7 @@ data:extend({ hidden_in_factoriopedia = true, animation = { - filename = "__bzlead__/graphics/entity/hr-lead-chest-remnants.png", + filename = "__bzlead2__/graphics/entity/hr-lead-chest-remnants.png", line_length = 1, width = 126, height = 78, diff --git a/bzlead2/strange-matter.lua b/bzlead2/strange-matter.lua index 450c8d7..3480b4d 100644 --- a/bzlead2/strange-matter.lua +++ b/bzlead2/strange-matter.lua @@ -1,8 +1,8 @@ -local util = require("__bzlead__.data-util"); +local util = require("data-util"); local ore = "lead-ore" -local ore_icon = "__bzlead__/graphics/icons/lead-ore.png" +local ore_icon = "__bzlead2__/graphics/icons/lead-ore.png" if mods["StrangeMatter"] then data:extend({ From 2cd2b3feb7ddb0e1f6a0d7ddb000af9efe6cfbad Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 10:17:48 +0200 Subject: [PATCH 10/10] info/readme/changelog --- README.md | 21 +- bzlead2/changelog.txt | 635 +----------------------------------------- bzlead2/info.json | 43 ++- 3 files changed, 38 insertions(+), 661 deletions(-) diff --git a/README.md b/README.md index 93150d2..f35886e 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,24 @@ +**This is an unofficial forked version and it stays until Brevven takes over again.** + +**Compatibility with Space Age is explicitly excluded. Stick to the original mod for Space Age.** + # Lead -[factorio mod page](https://mods.factorio.com/mod/bzlead) +This mod adds lead ore and lead plates to the base game, and optionally lead expansion bolts. Lead is an early game resource. It's meant to make the early game a little more challenging without fundamentally changing it. It also adds small amounts of complexity later in the game. Lead can be mined without fluid and by hand. Smelting lead ore will yield lead plates, with (optionally) copper ore as a byproduct. -Adds lead ore and plates to the base game, an early-game resource. -Modifies ammunition, pipes, batteries and a few other things. Further mod compatibility is planned. +Lead is common near the starting area, but does not scale as much with distance as other resources. -## Version History -See changelog.txt +If you enjoy vanilla Factorio but want something a little bit more complex, try out this mod! See Titanium for a similar mod with more of a "mid game" focus. -## Created by - -- [brevven](https://mods.factorio.com/user/brevven) (code, design, graphics) +## Credits +- Brevven ([Original mod](https://mods.factorio.com/mod/bzcarbon)) +- [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (mod integrations and maintenance) - [snouz](https://github.com/snouz) (graphics) ### Compatibility & bug fixes - [nihilistzsche](https://github.com/nihilistzsche) - [orangedude27](https://github.com/orangedude27) - ### Localization - [Sakuro](https://github.com/sakuro) (ja) - [TheoMarque](https://github.com/TheoMarque) (pl) @@ -28,4 +29,4 @@ See changelog.txt - [x2605](https://github.com/x2605) (ko) - [Pergamum663](https://github.com/Pergamum663) (ru) - [RiCZrd](https://mods.factorio.com/user/RiCZrd) (cs) -- [sunnytan53](https://github.com/sunnytan53) (zh\_CN) +- [sunnytan53](https://github.com/sunnytan53) (zh\_CN) \ No newline at end of file diff --git a/bzlead2/changelog.txt b/bzlead2/changelog.txt index 6d47194..3ca53b5 100644 --- a/bzlead2/changelog.txt +++ b/bzlead2/changelog.txt @@ -1,630 +1,7 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.27 -Date: 2025-06-15 - Fixes: - - Krastorio2: Update more tier 1 magazine recipes for 2.0, with thanks to Tvede-dk - - Fix load error with certain loadouts, especially with K2SO - Changes: - - Cerys: fuel cell recipe update ---------------------------------------------------------------------------------------------------- -Version: 2.0.26 -Date: 2025-05-05 - Fixes: - - Fix startup with deadlock stacking introduced in 2.0.25 ---------------------------------------------------------------------------------------------------- -Version: 2.0.25 -Date: 2025-05-04 - Changes: - - Support for Krastorio2 spaced out - - Tweaks for k2 2 integration ---------------------------------------------------------------------------------------------------- -Version: 2.0.24 -Date: 2025-05-03 - Fixes: - - Fix load issue with Bob's - Changes: - - K2 compatibility updates, thanks to autechr3 and pla ---------------------------------------------------------------------------------------------------- -Version: 2.0.23 -Date: 2025-04-08 - Changes: - - Space Age: Asteroid crushing recipe now affected by productivity research ---------------------------------------------------------------------------------------------------- -Version: 2.0.22 -Date: 2025-03-22 - Changes: - - Set custom inventory sounds for some items - Fixes: - - Loads with Crafting Efficiency - - Improved compatibility with Muluna ---------------------------------------------------------------------------------------------------- -Version: 2.0.21 -Date: 2025-03-10 - Fixes: - - Add missing locale string - Changes: - - Minor graphical tweaks ---------------------------------------------------------------------------------------------------- -Version: 2.0.20 -Date: 2025-02-20 - Fixes: - - Plutionium Energy MOX fuel recipe now uses lead ---------------------------------------------------------------------------------------------------- -Version: 2.0.19 -Date: 2025-02-13 - Changes: - - Show asteroid crushing recipe in signal GUI ---------------------------------------------------------------------------------------------------- -Version: 2.0.18 -Date: 2025-02-11 - Fixes: - - Allow productivity modules for lead plates in all circumstances. ---------------------------------------------------------------------------------------------------- -Version: 2.0.17 -Date: 2025-02-01 - Changes: - - Add shiftite recipe for Janus mod ---------------------------------------------------------------------------------------------------- -Version: 2.0.16 -Date: 2025-01-25 - Fixes: - - Improve compatibility with mods that change armor recipes in certain ways - Changes: - - When byproducts are turned off, don't add extra furnace output ---------------------------------------------------------------------------------------------------- -Version: 2.0.15 -Date: 2025-01-16 - Fixes: - - Fix recycling alongside some other mods, including Deadlock's Stacking Beltboxes ---------------------------------------------------------------------------------------------------- -Version: 2.0.14 -Date: 2025-01-14 - Changes: - - Minor tweaks to recipe order - - Support for Asteroid Mining mod ---------------------------------------------------------------------------------------------------- -Version: 2.0.13 -Date: 2025-01-07 - Fixes: - - Improve some mod compatibility ---------------------------------------------------------------------------------------------------- -Version: 2.0.12 -Date: 2025-01-06 - Changes: - - Do more to respect disabling of recycling recipes - - Lead ore no longer recycles into chelated lead. ---------------------------------------------------------------------------------------------------- -Version: 2.0.11 -Date: 2025-01-05 - Changes: - - Vulcanus rocks now have some lead ore to avoids possible soft locks - - Gleba highlands have rocks with lead ore to avoid possible soft locks ---------------------------------------------------------------------------------------------------- -Version: 2.0.10 -Date: 2025-01-04 - Changes: - - Update weights for rockets - - Hot metals: use default cooling time - - Tweaks for upcoming Silica & Silicon update ---------------------------------------------------------------------------------------------------- -Version: 2.0.9 -Date: 2025-01-01 - Fixes: - - Fix surface condition error in vanilla - Features: - - Hot metals mod support - - Casting for lead expansion bolts ---------------------------------------------------------------------------------------------------- -Version: 2.0.8 -Date: 2025-01-01 - Fixes: - - Fix some localization for alternate ammunition recipes - - Use old hr version for entities (now that hr is the only resolution supported) ---------------------------------------------------------------------------------------------------- -Version: 2.0.7 -Date: 2025-01-01 - Fixes: - - Lead chests can no longer be built on space platforms - - Hide lead chest remnant in Factoriopedia ---------------------------------------------------------------------------------------------------- -Version: 2.0.6 -Date: 2024-12-31 - Localization: - - ja locale updates for 2.0 thanks to Sakuro - - some de locale updates thanks to NathaU ---------------------------------------------------------------------------------------------------- -Version: 2.0.5 -Date: 2024-12-29 - Fixes: - - Fix alternative ammunition recipes ---------------------------------------------------------------------------------------------------- -Version: 2.0.4 -Date: 2024-12-29 - Changes: - - Recipe updates for Transplutonic mod ---------------------------------------------------------------------------------------------------- -Version: 2.0.3 -Date: 2024-12-29 - Changes: - - Added "/bz-regenerate" command for regenerating ore patches, especially useful when adding to an existing game ---------------------------------------------------------------------------------------------------- -Version: 2.0.2 -Date: 2024-12-28 - Changes: - - Compatible with Tenebris ---------------------------------------------------------------------------------------------------- -Version: 2.0.1 -Date: 2024-12-28 - Fixes: - - Fix soft lock on thruster oxidizer by unlocking alternative crushing at the right time. ---------------------------------------------------------------------------------------------------- -Version: 2.0.0 -Date: 2024-12-28 - Features: - - Working with Factorio 2.0 and Space Age - - Brand new common intermediate: lead expansion bolt, used primarily in structures (can be disabled in settings) - - Alternate processes for creating lead plates on Vulcans and Gleba, and recycling on Fulgora. - - A few new uses for lead in Space Age, including in the fusion system - - Confirmed compatible with Cerys and 5dim's - - Compatibility with other mods is not confirmed, but many will still work ---------------------------------------------------------------------------------------------------- -Version: 1.2.20 -Date: 2023-12-24 - Fixes: - - SE: Fix issue with scrap recycling, thanks to orangedude27 ---------------------------------------------------------------------------------------------------- -Version: 1.2.19 -Date: 2023-12-24 - Localization: - - ja locale updates thanks to Sakuro ---------------------------------------------------------------------------------------------------- -Version: 1.2.18 -Date: 2023-02-12 - Changes: - - Crafting efficiency improvements, thanks to nihilistzsche ---------------------------------------------------------------------------------------------------- -Version: 1.2.17 -Date: 2023-01-17 - Features: - - (Beta) Crafting efficiency compatibility ---------------------------------------------------------------------------------------------------- -Version: 1.2.16 -Date: 2022-12-24 - Localization: - - zh-CN by sunnytan53 - Changes: - - SE ingot in delivery cannon ---------------------------------------------------------------------------------------------------- -Version: 1.2.15 -Date: 2022-10-30 - Fixes: - - When Lead + K2 are used with some mods like GDIW, prod modules can be used as expected. ---------------------------------------------------------------------------------------------------- -Version: 1.2.14 -Date: 2022-08-34 - Changes: - - SE: Support for Shivero's Nuclear ---------------------------------------------------------------------------------------------------- -Version: 1.2.13 -Date: 2022-08-17 - Fixes: - - SE: Disable matter recipes at start ---------------------------------------------------------------------------------------------------- -Version: 1.2.12 -Date: 2022-08-16 - Features: - - Support for SE matter fusion and SE+K2 matter liberation ---------------------------------------------------------------------------------------------------- -Version: 1.2.11 -Date: 2022-08-05 - Features: - - Some support for ScienceCostTweaker - green science ---------------------------------------------------------------------------------------------------- -Version: 1.2.10 -Date: 2022-07-22 - Localization: - - cs (Czech) locale updates thanks to RiCZrd - Fixes: - - Fix in-game changelog ---------------------------------------------------------------------------------------------------- -Version: 1.2.9 -Date: 2022-07-10 - Changes: - - Leighzer's scrap compatibility - Localization: - - ru l10n updates thanks to Pergamum663 ---------------------------------------------------------------------------------------------------- -Version: 1.2.8 -Date: 2022-07-09 - Changes: - - Atomic Overhaul compatibility ---------------------------------------------------------------------------------------------------- -Version: 1.2.7 -Date: 2022-07-09 - Localization: - - Japanese (ja) locale updates thanks to sakuro - Changes: - - Space Exploration: efficiency module uses battery instead of copper cable. This gets lead - A little more involved in science production. (Use bypass recipes setting if needed) ---------------------------------------------------------------------------------------------------- -Version: 1.2.6 -Date: 2022-07-03 - Fixes: - - SE: Productivity modules in molten lead - - SE: Time for ingot ---------------------------------------------------------------------------------------------------- -Version: 1.2.5 -Date: 2022-07-02 - Fixes: - - Fix for subgroup fix ---------------------------------------------------------------------------------------------------- -Version: 1.2.4 -Date: 2022-07-02 - Fixes: - - SE ingot -> plate recipe - - SE/K2 subgroup fixes ---------------------------------------------------------------------------------------------------- -Version: 1.2.3 -Date: 2022-07-02 - Features: - - Setting to turn off copper byproduct in lead production ---------------------------------------------------------------------------------------------------- -Version: 1.2.2 -Date: 2022-07-02 - Changes: - - SE: Pyroflux tech compatibility ---------------------------------------------------------------------------------------------------- -Version: 1.2.1 -Date: 2022-07-01 - Fixes: - - Deadlock stacking / crating fix ---------------------------------------------------------------------------------------------------- -Version: 1.2.0 -Date: 2022-07-01 - Changes: - - Compatible with Space Exploration 0.6 ---------------------------------------------------------------------------------------------------- -Version: 1.1.0 -Date: 2022-06-26 - Features: - - Beta support for 248k. This is an initial release and may change in the future - Lead plate items merged into one. Multiple production chains ---------------------------------------------------------------------------------------------------- -Version: 1.0.5 -Date: 2022-06-01 - Fixes: - - K2: Dirty water filtration description icons - Changes: - - K2: Dirty water filtration outputs smoothed out. Overall ratios remain the same. ---------------------------------------------------------------------------------------------------- -Version: 1.0.4 -Date: 2022-05-30 - Changes: - - Compat with large electric pole ---------------------------------------------------------------------------------------------------- -Version: 1.0.3 -Date: 2022-02-25 - Changes: - - Compatibility with some more containers (warehouses, etc). ---------------------------------------------------------------------------------------------------- -Version: 1.0.2 -Date: 2022-02-22 - Localization: - - Korean (ko) l10n thanks to x2605 ---------------------------------------------------------------------------------------------------- -Version: 1.0.1 -Date: 2022-02-04 - Changes: - - K2: Filter dirty water quantity - Fixes: - - Fix for some possible 5dim's loadouts ---------------------------------------------------------------------------------------------------- -Version: 1.0.0 -Date: 2022-01-20 - Changes: - - We're calling this 1.0.0 - - MadClown's vanilla nuclear compatibility - Localization: - - Japanese (ja) locale updates thanks to sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.6.5 -Date: 2022-01-10 - Fixes: - - Fix ammuntion options for K2 ---------------------------------------------------------------------------------------------------- -Version: 0.6.4 -Date: 2022-01-06 - Localization: - - Polish (pl) l10n updates, thanks to S3BA ---------------------------------------------------------------------------------------------------- -Version: 0.6.3 -Date: 2022-01-05 - Localization: - - Simplified Chinese (zh_CN) l10n, thanks to PlexPt ---------------------------------------------------------------------------------------------------- -Version: 0.6.2 -Date: 2022-01-03 - Changes: - - Add an option for more ammunition recipes. ---------------------------------------------------------------------------------------------------- -Version: 0.6.1 -Date: 2022-01-01 - Changes: - - Remove sulfuric acid setting. Use Bypass recipes setting instead - - More turret & artillery compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.6.0 -Date: 2021-11-06 - Changes: - - K2: Compatible with beta ---------------------------------------------------------------------------------------------------- -Version: 0.5.9 -Date: 2021-10-11 - Fixes: - - SE: Balance core mining - - SE: Landfill recipe ---------------------------------------------------------------------------------------------------- -Version: 0.5.8 -Date: 2021-08-05 - Changes: - - SE Vulcanite lead recipe balanced - - SE meteor defense recipes updated ---------------------------------------------------------------------------------------------------- -Version: 0.5.7 -Date: 2021-07-26 - Changes: - - SE: Experimental alloy data recipe - - Minor refactor ---------------------------------------------------------------------------------------------------- -Version: 0.5.6 -Date: 2021-07-25 - Features: - - Schall's, more compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.5.5 -Date: 2021-07-21 - Features: - - True Nukes compatibility - Changes: - - Solar panel recipe when bzsilicon is active. ---------------------------------------------------------------------------------------------------- -Version: 0.5.4 -Date: 2021-07-06 - Features: - - Very basic Industrial Revolution 2 compatibility. - - Nuclear Reprocessing Rebalance compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.5.3 -Date: 2021-07-01 - Features: - - Strange matter compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.5.2 -Date: 2021-06-29 - Features: - - RITEG compatibility - - Car turret compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.5.1 -Date: 2021-06-26 - Localization: - - ja locale updates thanks to Sakuro - Features: - - Plutonium Energy compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.5.0 -Date: 2021-06-16 - Features: - - Recipe bypass setting - Localization: - - Tweak to pl l10n, thanks to TheoMarque ---------------------------------------------------------------------------------------------------- -Version: 0.4.11 -Date: 2021-06-13 - Features: - - Endgame Combat Compatibility - - Rocket turrets, K2 Turrets standalone - - Realistic Reactors, Nuclear Locomotive, Unranium Rework, etc ---------------------------------------------------------------------------------------------------- -Version: 0.4.10 -Date: 2021-06-13 - Features: - - Nuclear Fuel compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.4.9 -Date: 2021-06-05 - Changes: - - More very minor recipe tweaks - Localization: - - More l10n (sakuro) ---------------------------------------------------------------------------------------------------- -Version: 0.4.8 -Date: 2021-05-25 - Changes: - - Very minor recipe tweaks - Features: - - Additional turrets, howitzer compat ---------------------------------------------------------------------------------------------------- -Version: 0.4.7 -Date: 2021-05-25 - Features: - - King Jo's compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.4.6 -Date: 2021-05-23 - Features: - - Nuclear furnace, mega furnace compat ---------------------------------------------------------------------------------------------------- -Version: 0.4.5 -Date: 2021-05-22 - Fixes: - - Issue with lead chest image size non-hr ---------------------------------------------------------------------------------------------------- -Version: 0.4.4 -Date: 2021-05-21 - Features: - - SE: Lead ore in scrap recycling ---------------------------------------------------------------------------------------------------- -Version: 0.4.3 -Date: 2021-05-21 - Features: - - Add option for lead in sulfuric acid introduced on 0.4.0. To be removed in 2022 - Localization: - - Minor pl l10n per TheoMarque ---------------------------------------------------------------------------------------------------- -Version: 0.4.2 -Date: 2021-05-21 - Features: - - Compatibility: Geothermal ---------------------------------------------------------------------------------------------------- -Version: 0.4.1 -Date: 2021-05-18 - Features: - - Compatibility: More Ammo, Rampant Arsenal, Light artillery, Bigger artillery, HMG Turret ---------------------------------------------------------------------------------------------------- -Version: 0.4.0 -Date: 2021-05-17 - Changes: - - Minor "breaking" change - lead required for sulfuric acid (i.e. lead chamber process) ---------------------------------------------------------------------------------------------------- -Version: 0.3.14 -Date: 2021-05-05 - Features: - - Minor space exploration recipe updates ---------------------------------------------------------------------------------------------------- -Version: 0.3.13 -Date: 2021-04-30 - Localization: - - German localization, thanks to user yokmp ---------------------------------------------------------------------------------------------------- -Version: 0.3.12 -Date: 2021-04-28 - Localization: - - Russian localization, thanks to user Spectrus1702 ---------------------------------------------------------------------------------------------------- -Version: 0.3.11 -Date: 2021-04-19 - Localization: - - Polish localization, thanks to user TheoMarque ---------------------------------------------------------------------------------------------------- -Version: 0.3.10 -Date: 2021-04-15 - Localization: - - Japanese l10n fixes, thanks to user sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.3.9 -Date: 2021-04-13 - Features: - - ModMash+K2 ammunition recipes ---------------------------------------------------------------------------------------------------- -Version: 0.3.8 -Date: 2021-04-11 - Localization: - - Japanese localization, thanks to user sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.3.7 -Date: 2021-03-18 - Features: - - Omnimatter initial compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.3.6 -Date: 2021-03-15 - Fixes: - - Optimize menu simulation a bit ---------------------------------------------------------------------------------------------------- -Version: 0.3.4 -Date: 2021-03-14 - Features: - - Menu simulation for lead ammo - - Modular turret mount recipes ---------------------------------------------------------------------------------------------------- -Version: 0.3.3 -Date: 2021-03-12 - Features: - - VTK Cannon Turret recipes - - Vanilla Flamethrower and Artillery Turret recipes - - K2 Turret recipes ---------------------------------------------------------------------------------------------------- -Version: 0.3.2 -Date: 2021-03-11 - Features: - - Map gen presets handling - Changes: - - Slightly increase starting area lead, greatly reduce distant lead. ---------------------------------------------------------------------------------------------------- -Version: 0.3.1 -Date: 2021-03-09 - Features: - - SimpleCompress support - - StorageTank2 recipe ---------------------------------------------------------------------------------------------------- -Version: 0.3.0 -Date: 2021-03-07 - Changes: - - Graphics revamp by snouz (new icons, entities, chest remnant, mipmaps) - - New mod icon ---------------------------------------------------------------------------------------------------- -Version: 0.2.6 -Date: 2021-03-06 - Features: - - Inifinite Buffer Fluid Tank recipe - - eve-weaponry recipe ---------------------------------------------------------------------------------------------------- -Version: 0.2.5 -Date: 2021-03-06 - Features: - - WeaponPack recipes ---------------------------------------------------------------------------------------------------- -Version: 0.2.4 -Date: 2021-03-06 - Features: - - The Big Furnace recipe ---------------------------------------------------------------------------------------------------- -Version: 0.2.3 -Date: 2021-02-28 - Features: - - Optional entity: lead chest. Default off ---------------------------------------------------------------------------------------------------- -Version: 0.2.2 -Date: 2021-01-29 - Fixes: - - K2 stack size fix for no changes ---------------------------------------------------------------------------------------------------- -Version: 0.2.1 -Date: 2021-01-27 - Fixes: - - Rich Rocks Requiem dependency ---------------------------------------------------------------------------------------------------- -Version: 0.2.0 -Date: 2021-01-25 - Features: - - Rich Rocks Requiem for K2 compatibility - - 5dims compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.1.4 -Date: 2021-01-22 - Fixes: - - Attempt to fix a load error by failing gracefully ---------------------------------------------------------------------------------------------------- -Version: 0.1.3 -Date: 2021-01-19 - Changes: - - SE Delivery Cannon Capsules ---------------------------------------------------------------------------------------------------- -Version: 0.1.2 -Date: 2021-01-18 - Fixes: - - Breakage with only SE ---------------------------------------------------------------------------------------------------- -Version: 0.1.1 -Date: 2021-01-18 - Fixes: - - L10n of main recipe - Changes: - - Organization of plates in Space Exploration ---------------------------------------------------------------------------------------------------- -Version: 0.1.0 -Date: 2021-01-18 - Features: - - Lead added to game. - - Compatible with space exploration, krastorio2, deadlock stacking/crating +Version: 2.0.29 +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/bzlead2/info.json b/bzlead2/info.json index 1f571c5..a7464e6 100644 --- a/bzlead2/info.json +++ b/bzlead2/info.json @@ -1,24 +1,23 @@ { - "name": "bzlead2", - "version": "2.0.29", - "factorio_version": "2.0", - "title": "Lead", - "author": "Brevven", - "contact": "", - "homepage": "", - "dependencies": [ - "base >= 2.0.0", - "? space-age", - "? bzsilicon", - "? hot-metals", - "? space-exploration", - "? Krastorio2", - "? Krastorio2-spaced-out", - "? Rich-Rocks-Requiem", - "? 248k-Redux", - "? tenebris", - "? deadlock-beltboxes-loaders", - "? DeadlockCrating" - ], - "description": "Adds lead ore to the base game as an early game resource.\n\nLead is used in ammunition, pipes, batteries and more. Compatible with Space Age, RSO, and other mods.\n\nA standalone piece of BZ Mods, with graphics by snouz." + "name": "bzlead2", + "version": "2.0.29", + "factorio_version": "2.0", + "title": "Lead", + "description": "Adds lead ore to the base game as an early game resource.\n\nLead is used in ammunition, pipes, batteries and more.", + "author": "Brevven, cackling fiend", + "homepage": "https://discord.gg/ufvFUJtVwk", + "dependencies": [ + "base >= 2.0.0", + "? bzsilicon", + "? hot-metals", + "? space-exploration", + "? Krastorio2", + "? Krastorio2-spaced-out", + "? Rich-Rocks-Requiem", + "? 248k-Redux", + "? tenebris", + "? deadlock-beltboxes-loaders", + "? DeadlockCrating", + "! space-age" + ] }