From d1d471c416f18299b6de4db8c70a2dee90d23e44 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 11 Oct 2025 18:23:34 +0200 Subject: [PATCH 01/10] Mod compatibility fixes --- data-final-fixes.lua | 2 +- tin-recipe-updates.lua | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 7095892..f546f25 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -6,7 +6,7 @@ local util = require("data-util"); util.add_product("jellynut-processing", util.item("jellyskin", 1, .25)) -- in case of clobbering -util.replace_some_ingredient("se-glass-vulcanite", "sand", 1, "tin-plate", 1) +util.replace_some_ingredient("se-glass-vulcanite", mods["Krastorio2"] and "kr-sand" or "sand", 1, "tin-plate", 1) util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8}) util.set_main_product("se-glass-vulcanite", mods["Krastorio2"] and "kr-glass" or "glass") diff --git a/tin-recipe-updates.lua b/tin-recipe-updates.lua index 0e59e6d..92f0a4b 100644 --- a/tin-recipe-updates.lua +++ b/tin-recipe-updates.lua @@ -55,17 +55,11 @@ util.add_ingredient("se-pylon-substation", "solder", 2) util.add_ingredient("se-pylon", "solder", 2) util.add_ingredient("se-holmium-solenoid", "solder", 2) --- -- Elecrontics circuit recipes are updated in final fixes: --- util.multiply_recipe("electronic-circuit", 2) --- util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "solder", 1) --- util.multiply_recipe("electronic-circuit-stone", 2) --- util.replace_some_ingredient("electronic-circuit-stone", "copper-cable", 1, "solder", 1) - -- glass if mods.Krastorio2 then - util.replace_some_ingredient("glass", "sand", 1, "tin-plate", 1) - util.add_product("glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8}) - util.set_main_product("glass", "glass") + util.replace_some_ingredient("kr-glass", "kr-sand", 1, "tin-plate", 1) + util.add_product("kr-glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8}) + util.set_main_product("kr-glass", "kr-glass") else if mods.bzfoundry then if not mods.bzaluminum then @@ -86,12 +80,6 @@ else util.set_category("sng-glass-plate", "basic-founding") end end --- -- NOTE: K2 seems to reset this recipe, so moved to final fixes: --- util.replace_some_ingredient("se-glass-vulcanite", "sand", 1, "tin-plate", 1) --- util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1, probability=0.8}) --- util.set_main_product("se-glass-vulcanite", "glass") --- --- 248k in /compatibility dir -- end glass util.add_ingredient("kr-fuel-refinery", "solder", 5) From 2d3fcf48f15ca1e6f11393ad128f3bb3e6f682f5 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 13 Oct 2025 12:28:14 +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 7fa3302..3b2b755 100644 --- a/compatibility/248k.lua +++ b/compatibility/248k.lua @@ -1,6 +1,6 @@ local util = require("data-util"); -if mods["248k"] then +if mods["248k-Redux"] then util.add_ingredient("gr_circuit_recipe", "solder", 2) -- glass From 6a99862a12e87929b6f8b9805d11a07068fca985 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Tue, 14 Oct 2025 12:10:01 +0200 Subject: [PATCH 03/10] Remove deprecated filter inserter code --- tin-recipe-updates.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/tin-recipe-updates.lua b/tin-recipe-updates.lua index 92f0a4b..3f4b5f4 100644 --- a/tin-recipe-updates.lua +++ b/tin-recipe-updates.lua @@ -168,7 +168,6 @@ if util.me.use_bronze() then local fast_i = mods.bzaluminum and "aluminum-plate" or "iron-plate" util.replace_some_ingredient("fast-inserter", fast_i, 1, "bronze-plate", 1) if mods.Krastorio2 then - util.replace_some_ingredient("filter-inserter", fast_i, 1, "bronze-plate", 1) util.replace_ingredient("kr-steel-pump", "steel-beam", "bronze-plate", 4) end From 05b698f24bcb4a7be1f674873b08fdef8ffbd850 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 16 Oct 2025 00:25:22 +0200 Subject: [PATCH 04/10] Fix picture sizes --- tin-enriched.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tin-enriched.lua b/tin-enriched.lua index 535e3a9..5b6d218 100644 --- a/tin-enriched.lua +++ b/tin-enriched.lua @@ -10,10 +10,10 @@ data:extend( icon_size = 128, icon = "__bztin__/graphics/icons/enriched-tin.png", pictures = { - {filename="__bztin__/graphics/icons/enriched-tin.png", size=128, scale=0.125}, - {filename="__bztin__/graphics/icons/enriched-tin-1.png", size=128, scale=0.125}, - {filename="__bztin__/graphics/icons/enriched-tin-2.png", size=128, scale=0.125}, - {filename="__bztin__/graphics/icons/enriched-tin-3.png", size=128, scale=0.125}, + {filename="__bztin__/graphics/icons/enriched-tin.png", size=128, scale=0.25}, + {filename="__bztin__/graphics/icons/enriched-tin-1.png", size=128, scale=0.25}, + {filename="__bztin__/graphics/icons/enriched-tin-2.png", size=128, scale=0.25}, + {filename="__bztin__/graphics/icons/enriched-tin-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-tin]", From 9ccae8427034127480681a48a289ca63a28d5be8 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 23:39:19 +0200 Subject: [PATCH 05/10] Update bz mods to version 2 --- data-util.lua | 2 +- info.json | 10 +++++----- tin-enriched.lua | 2 +- tin-recipe-updates.lua | 12 ++++++------ tin-recipe.lua | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data-util.lua b/data-util.lua index 87a0816..6684519 100644 --- a/data-util.lua +++ b/data-util.lua @@ -99,7 +99,7 @@ if get_setting("bz-recipe-bypass") then end function util.is_foundry() - return mods.bzfoundry and not me.get_setting("bzfoundry-minimal") + return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal") end function should_force(options) diff --git a/info.json b/info.json index 9aa1d71..a73284c 100644 --- a/info.json +++ b/info.json @@ -8,13 +8,13 @@ "homepage": "", "dependencies": [ "base >= 1.1.0", - "? bzfoundry >= 0.2.1", + "? bzfoundry2 >= 2.0.0", "? bztitanium >= 1.2.0", - "? bzlead >= 1.2.0", + "? bzlead2 >= 2.0.29", "? bzzirconium >= 0.6.0", - "? bztungsten >= 0.6.0", - "? bzcarbon >= 0.5.5", - "? bzaluminum >= 0.4.9", + "? bztungsten2 >= 2.0.0", + "? bzcarbon2 >= 2.0.22", + "? bzaluminum2 >= 0.4.9", "? space-exploration >= 0.5.100", "(?) aai-industry", "? aai-industry", diff --git a/tin-enriched.lua b/tin-enriched.lua index 5b6d218..211737e 100644 --- a/tin-enriched.lua +++ b/tin-enriched.lua @@ -34,7 +34,7 @@ data:extend( subgroup = "raw-material", ingredients = { - mods.bzcarbon and {type = "item", name = "graphite", amount = 1} + mods["bzcarbon2"] and {type = "item", name = "graphite", amount = 1} or {type = "fluid", name = "sulfuric-acid", amount = 3}, {type = "fluid", name = "water", amount = 25, catalyst_amount = 25}, {type = "item", name = "tin-ore", amount = 9} diff --git a/tin-recipe-updates.lua b/tin-recipe-updates.lua index 3f4b5f4..8a957fa 100644 --- a/tin-recipe-updates.lua +++ b/tin-recipe-updates.lua @@ -3,7 +3,7 @@ local util = require("data-util"); -- Space Age -if mods.bzlead and data.raw.item["lead-expansion-bolt"] then +if mods["bzlead2"] and data.raw.item["lead-expansion-bolt"] then util.replace_product("scrap-recycling", "lead-expansion-bolt", "solder") else util.add_product("scrap-recycling", util.item("solder", 1, .01)) @@ -36,7 +36,7 @@ util.add_ingredient("slowdown-capsule", "organotins", 5) util.set_category("poison-capsule", "crafting-with-fluid") util.set_category("slowdown-capsule", "crafting-with-fluid") -util.replace_ingredient("pipe-to-ground", mods.bzlead and "lead-plate" or "iron-plate", "solder", 4) +util.replace_ingredient("pipe-to-ground", mods["bzlead2"] and "lead-plate" or "iron-plate", "solder", 4) util.remove_ingredient("chemical-plant", "tungsten-plate") -- keep ingredients managable util.replace_some_ingredient("advanced-circuit", "copper-cable", 1, "solder", 1) @@ -61,8 +61,8 @@ if mods.Krastorio2 then util.add_product("kr-glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8}) util.set_main_product("kr-glass", "kr-glass") else - if mods.bzfoundry then - if not mods.bzaluminum then + if mods.bzfoundry2 then + if not mods.bzaluminum2 then util.multiply_recipe("glass-from-sand", 4) -- aai util.multiply_recipe("sng-glass-plate", 4) -- sand and glass end @@ -165,7 +165,7 @@ if util.me.use_bronze() then util.add_ingredient("maraxsis-nuclear-submarine", "bronze-plate", 10) util.add_ingredient("maraxsis-salt-reactor", "bronze-plate", 10) util.add_ingredient("maraxsis-hydro-plant", "bronze-plate", 10) - local fast_i = mods.bzaluminum and "aluminum-plate" or "iron-plate" + local fast_i = mods.bzaluminum2 and "aluminum-plate" or "iron-plate" util.replace_some_ingredient("fast-inserter", fast_i, 1, "bronze-plate", 1) if mods.Krastorio2 then util.replace_ingredient("kr-steel-pump", "steel-beam", "bronze-plate", 4) @@ -181,7 +181,7 @@ if util.me.use_bronze() then end -if mods.bztungsten and not mods.bzaluminum then +if mods.bztungsten2 and not mods.bzaluminum2 then util.replace_ingredient("small-lamp", "copper-cable", "tinned-cable") util.add_prerequisite("optics", "tinned-cable") end diff --git a/tin-recipe.lua b/tin-recipe.lua index c8ae830..f9ea15b 100644 --- a/tin-recipe.lua +++ b/tin-recipe.lua @@ -65,7 +65,7 @@ data:extend({ local solder_ingredients = {util.item("tin-plate", 4), util.item("copper-plate", 1)} local solder_casting = {util.fluid("molten-tin", 40), util.fluid("molten-copper", 10)} -if mods.bzlead then +if mods["bzlead2"] then solder_ingredients = {util.item("tin-plate", 3), util.item("lead-plate", 2)} solder_casting = {util.fluid("molten-tin", 30), util.fluid("molten-lead", 20)} end @@ -126,7 +126,7 @@ data:extend({ icons = { {icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, scale = 0.33, shift = {0,-6}}, {icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128, scale = 0.25, shift = {-6,4}}, - mods.bzlead and {icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}} or + mods["bzlead2"] and {icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}} or {icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}}, }, effects = {}, @@ -143,7 +143,7 @@ data:extend({ }) util.add_effect("foundry", { type = "unlock-recipe", recipe = "casting-solder" }) end -if mods.bzaluminum and not mods.bzlead then +if mods.bzaluminum2 and not mods["bzlead2"] then data:extend({ { type = "technology", @@ -306,7 +306,7 @@ data:extend({ for item, count in pairs(bronze_i) do util.add_ingredient("bronze-plate", item, count, {force=true}) end -if mods.bzfoundry and data.raw.item["foundry"] then +if mods.bzfoundry2 and data.raw.item["foundry"] then util.add_effect("foundry", { type = "unlock-recipe", recipe = "bronze-plate" }) util.add_prerequisite("fast-inserter", "foundry") util.set_to_founding("bronze-plate", {force=true}) From c5ee695a577b3c31d9d97c06773ad17adc4ce1df Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 23:41:48 +0200 Subject: [PATCH 06/10] Restructure repository --- Makefile | 37 ------------------ LICENSE.md => bztin2/LICENSE.md | 0 .../alloy-separation.lua | 0 cables.lua => bztin2/cables.lua | 0 changelog.txt => bztin2/changelog.txt | 0 .../compatibility}/248k.lua | 0 .../compatibility}/data/hot-metals.lua | 0 .../compatibility}/sciencecosttweakerm.lua | 0 control-util.lua => bztin2/control-util.lua | 0 control.lua => bztin2/control.lua | 0 .../data-final-fixes.lua | 0 data-updates.lua => bztin2/data-updates.lua | 0 data-util.lua => bztin2/data-util.lua | 0 data.lua => bztin2/data.lua | 0 .../graphics}/entity/ores/hr-tin-ore.png | Bin .../graphics}/icons/bronze-plate.png | Bin .../graphics}/icons/enriched-tin-1.png | Bin .../graphics}/icons/enriched-tin-2.png | Bin .../graphics}/icons/enriched-tin-3.png | Bin .../graphics}/icons/enriched-tin.png | Bin .../graphics}/icons/jellyskin.png | Bin .../graphics}/icons/molten-tin-sa.png | Bin .../graphics}/icons/molten-tin.png | Bin .../graphics}/icons/organotins.png | Bin .../graphics}/icons/solder.png | Bin .../icons/stacked/bronze-plate-stacked.png | Bin .../stacked/enriched-tin-ore-stacked.png | Bin .../icons/stacked/enriched-tin-stacked.png | Bin .../icons/stacked/solder-stacked.png | Bin .../icons/stacked/tin-ore-stacked.png | Bin .../icons/stacked/tin-plate-stacked.png | Bin .../graphics}/icons/tin-ingot.png | Bin .../graphics}/icons/tin-ore-1.png | Bin .../graphics}/icons/tin-ore-2.png | Bin .../graphics}/icons/tin-ore-3.png | Bin .../graphics}/icons/tin-ore-powder.png | Bin .../graphics}/icons/tin-ore.png | Bin .../graphics}/icons/tin-plate.png | Bin .../graphics}/icons/tinned-cable.png | Bin .../graphics}/technology/organotins.jpg | Bin .../graphics}/technology/organotins.png | Bin .../graphics}/technology/reinforced-cable.png | Bin info.json => bztin2/info.json | 0 {locale => bztin2/locale}/cs/tin.cfg | 0 {locale => bztin2/locale}/en/tin.cfg | 0 {locale => bztin2/locale}/ja/tin.cfg | 0 {locale => bztin2/locale}/ru/tin.cfg | 0 {locale => bztin2/locale}/zh-CN/bztin.cfg | 0 .../map-gen-preset-updates.lua | 0 me.lua => bztin2/me.lua | 0 ruins.lua => bztin2/ruins.lua | 0 settings-util.lua => bztin2/settings-util.lua | 0 settings.lua => bztin2/settings.lua | 0 .../strange-matter.lua | 0 thumbnail.png => bztin2/thumbnail.png | Bin tin-enriched.lua => bztin2/tin-enriched.lua | 0 tin-matter.lua => bztin2/tin-matter.lua | 0 tin-ore.lua => bztin2/tin-ore.lua | 0 .../tin-recipe-final-rrr.lua | 0 .../tin-recipe-final-stacking.lua | 0 tin-recipe-se.lua => bztin2/tin-recipe-se.lua | 0 .../tin-recipe-updates.lua | 0 tin-recipe.lua => bztin2/tin-recipe.lua | 0 .../graphics}/entity/ores/hr-tin-ore.xcf | Bin .../graphics}/icons/bronze-plate.xcf | Bin .../graphics}/icons/enriched-tin-1.xcf | Bin .../graphics}/icons/enriched-tin-2.xcf | Bin .../graphics}/icons/enriched-tin-3.xcf | Bin .../graphics}/icons/enriched-tin.xcf | Bin .../graphics}/icons/jellyskin.xcf | Bin .../graphics}/icons/molten-tin.xcf | Bin .../graphics}/icons/organotins.xcf | Bin .../icons/stacked/bronze-plate-stacked.xcf | Bin .../stacked/enriched-tin-ore-stacked.xcf | Bin .../icons/stacked/enriched-tin-stacked.xcf | Bin .../icons/stacked/solder-stacked.xcf | Bin .../icons/stacked/tin-ore-stacked.xcf | Bin .../icons/stacked/tin-plate-stacked.xcf | Bin .../graphics}/icons/tin-ingot.xcf | Bin .../graphics}/icons/tin-ore-1.xcf | Bin .../graphics}/icons/tin-ore-2.xcf | Bin .../graphics}/icons/tin-ore-3.xcf | Bin .../graphics}/icons/tin-ore-powder.xcf | Bin .../graphics}/icons/tin-ore.xcf | Bin .../graphics}/icons/tin-plate.xcf | Bin .../graphics}/icons/tinned-cable.xcf | Bin .../graphics}/molten-tin-sa.xcf | Bin sources/graphics/technology/organotins.jpg | Bin 0 -> 14853 bytes .../graphics}/technology/organotins.xcf | Bin .../graphics}/technology/reinforced-cable.xcf | Bin thumbnail.xcf => sources/thumbnail.xcf | Bin 91 files changed, 37 deletions(-) delete mode 100644 Makefile rename LICENSE.md => bztin2/LICENSE.md (100%) rename alloy-separation.lua => bztin2/alloy-separation.lua (100%) rename cables.lua => bztin2/cables.lua (100%) rename changelog.txt => bztin2/changelog.txt (100%) rename {compatibility => bztin2/compatibility}/248k.lua (100%) rename {compatibility => bztin2/compatibility}/data/hot-metals.lua (100%) rename {compatibility => bztin2/compatibility}/sciencecosttweakerm.lua (100%) rename control-util.lua => bztin2/control-util.lua (100%) rename control.lua => bztin2/control.lua (100%) rename data-final-fixes.lua => bztin2/data-final-fixes.lua (100%) rename data-updates.lua => bztin2/data-updates.lua (100%) rename data-util.lua => bztin2/data-util.lua (100%) rename data.lua => bztin2/data.lua (100%) rename {graphics => bztin2/graphics}/entity/ores/hr-tin-ore.png (100%) rename {graphics => bztin2/graphics}/icons/bronze-plate.png (100%) rename {graphics => bztin2/graphics}/icons/enriched-tin-1.png (100%) rename {graphics => bztin2/graphics}/icons/enriched-tin-2.png (100%) rename {graphics => bztin2/graphics}/icons/enriched-tin-3.png (100%) rename {graphics => bztin2/graphics}/icons/enriched-tin.png (100%) rename {graphics => bztin2/graphics}/icons/jellyskin.png (100%) rename {graphics => bztin2/graphics}/icons/molten-tin-sa.png (100%) rename {graphics => bztin2/graphics}/icons/molten-tin.png (100%) rename {graphics => bztin2/graphics}/icons/organotins.png (100%) rename {graphics => bztin2/graphics}/icons/solder.png (100%) rename {graphics => bztin2/graphics}/icons/stacked/bronze-plate-stacked.png (100%) rename {graphics => bztin2/graphics}/icons/stacked/enriched-tin-ore-stacked.png (100%) rename {graphics => bztin2/graphics}/icons/stacked/enriched-tin-stacked.png (100%) rename {graphics => bztin2/graphics}/icons/stacked/solder-stacked.png (100%) rename {graphics => bztin2/graphics}/icons/stacked/tin-ore-stacked.png (100%) rename {graphics => bztin2/graphics}/icons/stacked/tin-plate-stacked.png (100%) rename {graphics => bztin2/graphics}/icons/tin-ingot.png (100%) rename {graphics => bztin2/graphics}/icons/tin-ore-1.png (100%) rename {graphics => bztin2/graphics}/icons/tin-ore-2.png (100%) rename {graphics => bztin2/graphics}/icons/tin-ore-3.png (100%) rename {graphics => bztin2/graphics}/icons/tin-ore-powder.png (100%) rename {graphics => bztin2/graphics}/icons/tin-ore.png (100%) rename {graphics => bztin2/graphics}/icons/tin-plate.png (100%) rename {graphics => bztin2/graphics}/icons/tinned-cable.png (100%) rename {graphics => bztin2/graphics}/technology/organotins.jpg (100%) rename {graphics => bztin2/graphics}/technology/organotins.png (100%) rename {graphics => bztin2/graphics}/technology/reinforced-cable.png (100%) rename info.json => bztin2/info.json (100%) rename {locale => bztin2/locale}/cs/tin.cfg (100%) rename {locale => bztin2/locale}/en/tin.cfg (100%) rename {locale => bztin2/locale}/ja/tin.cfg (100%) rename {locale => bztin2/locale}/ru/tin.cfg (100%) rename {locale => bztin2/locale}/zh-CN/bztin.cfg (100%) rename map-gen-preset-updates.lua => bztin2/map-gen-preset-updates.lua (100%) rename me.lua => bztin2/me.lua (100%) rename ruins.lua => bztin2/ruins.lua (100%) rename settings-util.lua => bztin2/settings-util.lua (100%) rename settings.lua => bztin2/settings.lua (100%) rename strange-matter.lua => bztin2/strange-matter.lua (100%) rename thumbnail.png => bztin2/thumbnail.png (100%) rename tin-enriched.lua => bztin2/tin-enriched.lua (100%) rename tin-matter.lua => bztin2/tin-matter.lua (100%) rename tin-ore.lua => bztin2/tin-ore.lua (100%) rename tin-recipe-final-rrr.lua => bztin2/tin-recipe-final-rrr.lua (100%) rename tin-recipe-final-stacking.lua => bztin2/tin-recipe-final-stacking.lua (100%) rename tin-recipe-se.lua => bztin2/tin-recipe-se.lua (100%) rename tin-recipe-updates.lua => bztin2/tin-recipe-updates.lua (100%) rename tin-recipe.lua => bztin2/tin-recipe.lua (100%) rename {graphics => sources/graphics}/entity/ores/hr-tin-ore.xcf (100%) rename {graphics => sources/graphics}/icons/bronze-plate.xcf (100%) rename {graphics => sources/graphics}/icons/enriched-tin-1.xcf (100%) rename {graphics => sources/graphics}/icons/enriched-tin-2.xcf (100%) rename {graphics => sources/graphics}/icons/enriched-tin-3.xcf (100%) rename {graphics => sources/graphics}/icons/enriched-tin.xcf (100%) rename {graphics => sources/graphics}/icons/jellyskin.xcf (100%) rename {graphics => sources/graphics}/icons/molten-tin.xcf (100%) rename {graphics => sources/graphics}/icons/organotins.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/bronze-plate-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/enriched-tin-ore-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/enriched-tin-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/solder-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/tin-ore-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/tin-plate-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/tin-ingot.xcf (100%) rename {graphics => sources/graphics}/icons/tin-ore-1.xcf (100%) rename {graphics => sources/graphics}/icons/tin-ore-2.xcf (100%) rename {graphics => sources/graphics}/icons/tin-ore-3.xcf (100%) rename {graphics => sources/graphics}/icons/tin-ore-powder.xcf (100%) rename {graphics => sources/graphics}/icons/tin-ore.xcf (100%) rename {graphics => sources/graphics}/icons/tin-plate.xcf (100%) rename {graphics => sources/graphics}/icons/tinned-cable.xcf (100%) rename {graphics => sources/graphics}/molten-tin-sa.xcf (100%) create mode 100644 sources/graphics/technology/organotins.jpg rename {graphics => sources/graphics}/technology/organotins.xcf (100%) rename {graphics => sources/graphics}/technology/reinforced-cable.xcf (100%) rename thumbnail.xcf => sources/thumbnail.xcf (100%) diff --git a/Makefile b/Makefile deleted file mode 100644 index 11be59f..0000000 --- a/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# General makefile for factorio mods. -# -# Presumes the development work is done in a /dev// -# directory where this makefile resides. This directory must be parallel to -# the /mods/ directory where mods are installed. Run `make -# install` from dev/ to install the mod as a zip file. That zip file -# should also be ready to upload to the mod portal - -.PHONY: copy lint-changelog install - -libdir = "../bzlib" -libfiles = $(shell ls $(libdir)/*.lua | grep -o '[^/]*.lua') -pwd = $(shell pwd) -v = $(shell basename "$(pwd)")_$(shell jq -r .version info.json) - -link: - for f in $(libfiles) ; do \ - echo "using $(libdir)/$$f" ;\ - cp $(libdir)/$$f .; \ - done; - -copy: link - rm -rf ../$(v) - mkdir -p ../$(v) - cp -rf * ../$(v) - rm -f ../$(v).zip - cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" -x "*.blend*" - -install: lint-changelog copy - cp -f ../$(v).zip ../../mods/ - -lint-changelog: copy - python3 ../da-changelog-tools_0.0.14/changelog-checker.py --changelog ../$(v).zip - -zorro: - python3 ../da-changelog-tools_0.0.14/changelog-checker.py --zorro --changelog ../$(v).zip - diff --git a/LICENSE.md b/bztin2/LICENSE.md similarity index 100% rename from LICENSE.md rename to bztin2/LICENSE.md diff --git a/alloy-separation.lua b/bztin2/alloy-separation.lua similarity index 100% rename from alloy-separation.lua rename to bztin2/alloy-separation.lua diff --git a/cables.lua b/bztin2/cables.lua similarity index 100% rename from cables.lua rename to bztin2/cables.lua diff --git a/changelog.txt b/bztin2/changelog.txt similarity index 100% rename from changelog.txt rename to bztin2/changelog.txt diff --git a/compatibility/248k.lua b/bztin2/compatibility/248k.lua similarity index 100% rename from compatibility/248k.lua rename to bztin2/compatibility/248k.lua diff --git a/compatibility/data/hot-metals.lua b/bztin2/compatibility/data/hot-metals.lua similarity index 100% rename from compatibility/data/hot-metals.lua rename to bztin2/compatibility/data/hot-metals.lua diff --git a/compatibility/sciencecosttweakerm.lua b/bztin2/compatibility/sciencecosttweakerm.lua similarity index 100% rename from compatibility/sciencecosttweakerm.lua rename to bztin2/compatibility/sciencecosttweakerm.lua diff --git a/control-util.lua b/bztin2/control-util.lua similarity index 100% rename from control-util.lua rename to bztin2/control-util.lua diff --git a/control.lua b/bztin2/control.lua similarity index 100% rename from control.lua rename to bztin2/control.lua diff --git a/data-final-fixes.lua b/bztin2/data-final-fixes.lua similarity index 100% rename from data-final-fixes.lua rename to bztin2/data-final-fixes.lua diff --git a/data-updates.lua b/bztin2/data-updates.lua similarity index 100% rename from data-updates.lua rename to bztin2/data-updates.lua diff --git a/data-util.lua b/bztin2/data-util.lua similarity index 100% rename from data-util.lua rename to bztin2/data-util.lua diff --git a/data.lua b/bztin2/data.lua similarity index 100% rename from data.lua rename to bztin2/data.lua diff --git a/graphics/entity/ores/hr-tin-ore.png b/bztin2/graphics/entity/ores/hr-tin-ore.png similarity index 100% rename from graphics/entity/ores/hr-tin-ore.png rename to bztin2/graphics/entity/ores/hr-tin-ore.png diff --git a/graphics/icons/bronze-plate.png b/bztin2/graphics/icons/bronze-plate.png similarity index 100% rename from graphics/icons/bronze-plate.png rename to bztin2/graphics/icons/bronze-plate.png diff --git a/graphics/icons/enriched-tin-1.png b/bztin2/graphics/icons/enriched-tin-1.png similarity index 100% rename from graphics/icons/enriched-tin-1.png rename to bztin2/graphics/icons/enriched-tin-1.png diff --git a/graphics/icons/enriched-tin-2.png b/bztin2/graphics/icons/enriched-tin-2.png similarity index 100% rename from graphics/icons/enriched-tin-2.png rename to bztin2/graphics/icons/enriched-tin-2.png diff --git a/graphics/icons/enriched-tin-3.png b/bztin2/graphics/icons/enriched-tin-3.png similarity index 100% rename from graphics/icons/enriched-tin-3.png rename to bztin2/graphics/icons/enriched-tin-3.png diff --git a/graphics/icons/enriched-tin.png b/bztin2/graphics/icons/enriched-tin.png similarity index 100% rename from graphics/icons/enriched-tin.png rename to bztin2/graphics/icons/enriched-tin.png diff --git a/graphics/icons/jellyskin.png b/bztin2/graphics/icons/jellyskin.png similarity index 100% rename from graphics/icons/jellyskin.png rename to bztin2/graphics/icons/jellyskin.png diff --git a/graphics/icons/molten-tin-sa.png b/bztin2/graphics/icons/molten-tin-sa.png similarity index 100% rename from graphics/icons/molten-tin-sa.png rename to bztin2/graphics/icons/molten-tin-sa.png diff --git a/graphics/icons/molten-tin.png b/bztin2/graphics/icons/molten-tin.png similarity index 100% rename from graphics/icons/molten-tin.png rename to bztin2/graphics/icons/molten-tin.png diff --git a/graphics/icons/organotins.png b/bztin2/graphics/icons/organotins.png similarity index 100% rename from graphics/icons/organotins.png rename to bztin2/graphics/icons/organotins.png diff --git a/graphics/icons/solder.png b/bztin2/graphics/icons/solder.png similarity index 100% rename from graphics/icons/solder.png rename to bztin2/graphics/icons/solder.png diff --git a/graphics/icons/stacked/bronze-plate-stacked.png b/bztin2/graphics/icons/stacked/bronze-plate-stacked.png similarity index 100% rename from graphics/icons/stacked/bronze-plate-stacked.png rename to bztin2/graphics/icons/stacked/bronze-plate-stacked.png diff --git a/graphics/icons/stacked/enriched-tin-ore-stacked.png b/bztin2/graphics/icons/stacked/enriched-tin-ore-stacked.png similarity index 100% rename from graphics/icons/stacked/enriched-tin-ore-stacked.png rename to bztin2/graphics/icons/stacked/enriched-tin-ore-stacked.png diff --git a/graphics/icons/stacked/enriched-tin-stacked.png b/bztin2/graphics/icons/stacked/enriched-tin-stacked.png similarity index 100% rename from graphics/icons/stacked/enriched-tin-stacked.png rename to bztin2/graphics/icons/stacked/enriched-tin-stacked.png diff --git a/graphics/icons/stacked/solder-stacked.png b/bztin2/graphics/icons/stacked/solder-stacked.png similarity index 100% rename from graphics/icons/stacked/solder-stacked.png rename to bztin2/graphics/icons/stacked/solder-stacked.png diff --git a/graphics/icons/stacked/tin-ore-stacked.png b/bztin2/graphics/icons/stacked/tin-ore-stacked.png similarity index 100% rename from graphics/icons/stacked/tin-ore-stacked.png rename to bztin2/graphics/icons/stacked/tin-ore-stacked.png diff --git a/graphics/icons/stacked/tin-plate-stacked.png b/bztin2/graphics/icons/stacked/tin-plate-stacked.png similarity index 100% rename from graphics/icons/stacked/tin-plate-stacked.png rename to bztin2/graphics/icons/stacked/tin-plate-stacked.png diff --git a/graphics/icons/tin-ingot.png b/bztin2/graphics/icons/tin-ingot.png similarity index 100% rename from graphics/icons/tin-ingot.png rename to bztin2/graphics/icons/tin-ingot.png diff --git a/graphics/icons/tin-ore-1.png b/bztin2/graphics/icons/tin-ore-1.png similarity index 100% rename from graphics/icons/tin-ore-1.png rename to bztin2/graphics/icons/tin-ore-1.png diff --git a/graphics/icons/tin-ore-2.png b/bztin2/graphics/icons/tin-ore-2.png similarity index 100% rename from graphics/icons/tin-ore-2.png rename to bztin2/graphics/icons/tin-ore-2.png diff --git a/graphics/icons/tin-ore-3.png b/bztin2/graphics/icons/tin-ore-3.png similarity index 100% rename from graphics/icons/tin-ore-3.png rename to bztin2/graphics/icons/tin-ore-3.png diff --git a/graphics/icons/tin-ore-powder.png b/bztin2/graphics/icons/tin-ore-powder.png similarity index 100% rename from graphics/icons/tin-ore-powder.png rename to bztin2/graphics/icons/tin-ore-powder.png diff --git a/graphics/icons/tin-ore.png b/bztin2/graphics/icons/tin-ore.png similarity index 100% rename from graphics/icons/tin-ore.png rename to bztin2/graphics/icons/tin-ore.png diff --git a/graphics/icons/tin-plate.png b/bztin2/graphics/icons/tin-plate.png similarity index 100% rename from graphics/icons/tin-plate.png rename to bztin2/graphics/icons/tin-plate.png diff --git a/graphics/icons/tinned-cable.png b/bztin2/graphics/icons/tinned-cable.png similarity index 100% rename from graphics/icons/tinned-cable.png rename to bztin2/graphics/icons/tinned-cable.png diff --git a/graphics/technology/organotins.jpg b/bztin2/graphics/technology/organotins.jpg similarity index 100% rename from graphics/technology/organotins.jpg rename to bztin2/graphics/technology/organotins.jpg diff --git a/graphics/technology/organotins.png b/bztin2/graphics/technology/organotins.png similarity index 100% rename from graphics/technology/organotins.png rename to bztin2/graphics/technology/organotins.png diff --git a/graphics/technology/reinforced-cable.png b/bztin2/graphics/technology/reinforced-cable.png similarity index 100% rename from graphics/technology/reinforced-cable.png rename to bztin2/graphics/technology/reinforced-cable.png diff --git a/info.json b/bztin2/info.json similarity index 100% rename from info.json rename to bztin2/info.json diff --git a/locale/cs/tin.cfg b/bztin2/locale/cs/tin.cfg similarity index 100% rename from locale/cs/tin.cfg rename to bztin2/locale/cs/tin.cfg diff --git a/locale/en/tin.cfg b/bztin2/locale/en/tin.cfg similarity index 100% rename from locale/en/tin.cfg rename to bztin2/locale/en/tin.cfg diff --git a/locale/ja/tin.cfg b/bztin2/locale/ja/tin.cfg similarity index 100% rename from locale/ja/tin.cfg rename to bztin2/locale/ja/tin.cfg diff --git a/locale/ru/tin.cfg b/bztin2/locale/ru/tin.cfg similarity index 100% rename from locale/ru/tin.cfg rename to bztin2/locale/ru/tin.cfg diff --git a/locale/zh-CN/bztin.cfg b/bztin2/locale/zh-CN/bztin.cfg similarity index 100% rename from locale/zh-CN/bztin.cfg rename to bztin2/locale/zh-CN/bztin.cfg diff --git a/map-gen-preset-updates.lua b/bztin2/map-gen-preset-updates.lua similarity index 100% rename from map-gen-preset-updates.lua rename to bztin2/map-gen-preset-updates.lua diff --git a/me.lua b/bztin2/me.lua similarity index 100% rename from me.lua rename to bztin2/me.lua diff --git a/ruins.lua b/bztin2/ruins.lua similarity index 100% rename from ruins.lua rename to bztin2/ruins.lua diff --git a/settings-util.lua b/bztin2/settings-util.lua similarity index 100% rename from settings-util.lua rename to bztin2/settings-util.lua diff --git a/settings.lua b/bztin2/settings.lua similarity index 100% rename from settings.lua rename to bztin2/settings.lua diff --git a/strange-matter.lua b/bztin2/strange-matter.lua similarity index 100% rename from strange-matter.lua rename to bztin2/strange-matter.lua diff --git a/thumbnail.png b/bztin2/thumbnail.png similarity index 100% rename from thumbnail.png rename to bztin2/thumbnail.png diff --git a/tin-enriched.lua b/bztin2/tin-enriched.lua similarity index 100% rename from tin-enriched.lua rename to bztin2/tin-enriched.lua diff --git a/tin-matter.lua b/bztin2/tin-matter.lua similarity index 100% rename from tin-matter.lua rename to bztin2/tin-matter.lua diff --git a/tin-ore.lua b/bztin2/tin-ore.lua similarity index 100% rename from tin-ore.lua rename to bztin2/tin-ore.lua diff --git a/tin-recipe-final-rrr.lua b/bztin2/tin-recipe-final-rrr.lua similarity index 100% rename from tin-recipe-final-rrr.lua rename to bztin2/tin-recipe-final-rrr.lua diff --git a/tin-recipe-final-stacking.lua b/bztin2/tin-recipe-final-stacking.lua similarity index 100% rename from tin-recipe-final-stacking.lua rename to bztin2/tin-recipe-final-stacking.lua diff --git a/tin-recipe-se.lua b/bztin2/tin-recipe-se.lua similarity index 100% rename from tin-recipe-se.lua rename to bztin2/tin-recipe-se.lua diff --git a/tin-recipe-updates.lua b/bztin2/tin-recipe-updates.lua similarity index 100% rename from tin-recipe-updates.lua rename to bztin2/tin-recipe-updates.lua diff --git a/tin-recipe.lua b/bztin2/tin-recipe.lua similarity index 100% rename from tin-recipe.lua rename to bztin2/tin-recipe.lua diff --git a/graphics/entity/ores/hr-tin-ore.xcf b/sources/graphics/entity/ores/hr-tin-ore.xcf similarity index 100% rename from graphics/entity/ores/hr-tin-ore.xcf rename to sources/graphics/entity/ores/hr-tin-ore.xcf diff --git a/graphics/icons/bronze-plate.xcf b/sources/graphics/icons/bronze-plate.xcf similarity index 100% rename from graphics/icons/bronze-plate.xcf rename to sources/graphics/icons/bronze-plate.xcf diff --git a/graphics/icons/enriched-tin-1.xcf b/sources/graphics/icons/enriched-tin-1.xcf similarity index 100% rename from graphics/icons/enriched-tin-1.xcf rename to sources/graphics/icons/enriched-tin-1.xcf diff --git a/graphics/icons/enriched-tin-2.xcf b/sources/graphics/icons/enriched-tin-2.xcf similarity index 100% rename from graphics/icons/enriched-tin-2.xcf rename to sources/graphics/icons/enriched-tin-2.xcf diff --git a/graphics/icons/enriched-tin-3.xcf b/sources/graphics/icons/enriched-tin-3.xcf similarity index 100% rename from graphics/icons/enriched-tin-3.xcf rename to sources/graphics/icons/enriched-tin-3.xcf diff --git a/graphics/icons/enriched-tin.xcf b/sources/graphics/icons/enriched-tin.xcf similarity index 100% rename from graphics/icons/enriched-tin.xcf rename to sources/graphics/icons/enriched-tin.xcf diff --git a/graphics/icons/jellyskin.xcf b/sources/graphics/icons/jellyskin.xcf similarity index 100% rename from graphics/icons/jellyskin.xcf rename to sources/graphics/icons/jellyskin.xcf diff --git a/graphics/icons/molten-tin.xcf b/sources/graphics/icons/molten-tin.xcf similarity index 100% rename from graphics/icons/molten-tin.xcf rename to sources/graphics/icons/molten-tin.xcf diff --git a/graphics/icons/organotins.xcf b/sources/graphics/icons/organotins.xcf similarity index 100% rename from graphics/icons/organotins.xcf rename to sources/graphics/icons/organotins.xcf diff --git a/graphics/icons/stacked/bronze-plate-stacked.xcf b/sources/graphics/icons/stacked/bronze-plate-stacked.xcf similarity index 100% rename from graphics/icons/stacked/bronze-plate-stacked.xcf rename to sources/graphics/icons/stacked/bronze-plate-stacked.xcf diff --git a/graphics/icons/stacked/enriched-tin-ore-stacked.xcf b/sources/graphics/icons/stacked/enriched-tin-ore-stacked.xcf similarity index 100% rename from graphics/icons/stacked/enriched-tin-ore-stacked.xcf rename to sources/graphics/icons/stacked/enriched-tin-ore-stacked.xcf diff --git a/graphics/icons/stacked/enriched-tin-stacked.xcf b/sources/graphics/icons/stacked/enriched-tin-stacked.xcf similarity index 100% rename from graphics/icons/stacked/enriched-tin-stacked.xcf rename to sources/graphics/icons/stacked/enriched-tin-stacked.xcf diff --git a/graphics/icons/stacked/solder-stacked.xcf b/sources/graphics/icons/stacked/solder-stacked.xcf similarity index 100% rename from graphics/icons/stacked/solder-stacked.xcf rename to sources/graphics/icons/stacked/solder-stacked.xcf diff --git a/graphics/icons/stacked/tin-ore-stacked.xcf b/sources/graphics/icons/stacked/tin-ore-stacked.xcf similarity index 100% rename from graphics/icons/stacked/tin-ore-stacked.xcf rename to sources/graphics/icons/stacked/tin-ore-stacked.xcf diff --git a/graphics/icons/stacked/tin-plate-stacked.xcf b/sources/graphics/icons/stacked/tin-plate-stacked.xcf similarity index 100% rename from graphics/icons/stacked/tin-plate-stacked.xcf rename to sources/graphics/icons/stacked/tin-plate-stacked.xcf diff --git a/graphics/icons/tin-ingot.xcf b/sources/graphics/icons/tin-ingot.xcf similarity index 100% rename from graphics/icons/tin-ingot.xcf rename to sources/graphics/icons/tin-ingot.xcf diff --git a/graphics/icons/tin-ore-1.xcf b/sources/graphics/icons/tin-ore-1.xcf similarity index 100% rename from graphics/icons/tin-ore-1.xcf rename to sources/graphics/icons/tin-ore-1.xcf diff --git a/graphics/icons/tin-ore-2.xcf b/sources/graphics/icons/tin-ore-2.xcf similarity index 100% rename from graphics/icons/tin-ore-2.xcf rename to sources/graphics/icons/tin-ore-2.xcf diff --git a/graphics/icons/tin-ore-3.xcf b/sources/graphics/icons/tin-ore-3.xcf similarity index 100% rename from graphics/icons/tin-ore-3.xcf rename to sources/graphics/icons/tin-ore-3.xcf diff --git a/graphics/icons/tin-ore-powder.xcf b/sources/graphics/icons/tin-ore-powder.xcf similarity index 100% rename from graphics/icons/tin-ore-powder.xcf rename to sources/graphics/icons/tin-ore-powder.xcf diff --git a/graphics/icons/tin-ore.xcf b/sources/graphics/icons/tin-ore.xcf similarity index 100% rename from graphics/icons/tin-ore.xcf rename to sources/graphics/icons/tin-ore.xcf diff --git a/graphics/icons/tin-plate.xcf b/sources/graphics/icons/tin-plate.xcf similarity index 100% rename from graphics/icons/tin-plate.xcf rename to sources/graphics/icons/tin-plate.xcf diff --git a/graphics/icons/tinned-cable.xcf b/sources/graphics/icons/tinned-cable.xcf similarity index 100% rename from graphics/icons/tinned-cable.xcf rename to sources/graphics/icons/tinned-cable.xcf diff --git a/graphics/molten-tin-sa.xcf b/sources/graphics/molten-tin-sa.xcf similarity index 100% rename from graphics/molten-tin-sa.xcf rename to sources/graphics/molten-tin-sa.xcf diff --git a/sources/graphics/technology/organotins.jpg b/sources/graphics/technology/organotins.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0e212f01061a8432b322ec26472b2df5a2904e6d GIT binary patch literal 14853 zcmeHu2UL^Ywr%K03%y8*3W7=#0g;v<3Wy4bN=G6hH3A|60YX9#MUBWWC?M5>QX?C{bZ>_!Oo^xe)Vs{Q8 ze%9L78oeC+5a1US5fTv*77`W~6_XSf z6_XGX78aKkmynW{k&zJr%E`-0%S%ejNdNv4E*{Qjc=`75@$Hco6&98LpFVcm0TO~- zaoiC+Tn7N$5?nkIT)W)>5CFi%$La0w4*$!+#m(s>zkuK#Az@B~dT{_Z7Y`3NFVF8@ zb6Ur7-UskX@Ja61JIOEQ=q+#{O!`v_8tGlPS?|uJ=kcFuCL21jZlA4Y^s`?ixGS_Ym3(2Y(5D!v+yY?5){(Fuk{x5mw11Al|GP0TKsCxRK=Caa<;~(=xh*zX75I7NFE8cDUvr#! zlExixcnF&jfuGjzBh)$9hY_KZNu5Pgky-Drw$dMx&bW&nc)!5gdB^B{d#uzh;QU1R zWt4xB4AYYJ7#En2O)8ROhQ*Sb9hBXxYl&FtAgvDf9dY3bLy=GOSdiM)_~Xx|6~Zh) zw;Zjc0sq^~3&`+i4?RHQA$;qG%KMSyr^jUunYpps#h}tNk=GR z5}`us#tyuTw-#K-uHk1|3NZI2m?vm@JR27TLa9+S`cPew)WDo>(k~f&Z)m#RJ4kJv zx~TW{u6^~NhIXV6|KK9a``Oojg2QO4R8-%Upn;xUKs_+iAya36_NuHG*U&e(fw}qH z_8a29-b24Ob@ySPBgGNo6i7Q%sE@eL4Ufck{kl2j%P{ftNaa!det-U3Xrvl#>B=X7 znX`F7?*a^wZ6@CF@+}b~CSbg3_qk!wM zmhJYVqNdWe`C{&jL;twtt<{v7zIJka@bM;K>xD~yQDa|E@Qr{%Wjbh1!If!Ef2=oJ z2Jas%dcF%7_&h3ptITg6zkT}Ytv|T>5Yia7;wf6)XZEp~@5@AV*W>HMW-^NY{jF`} zRkTb$_F?`$o!MmiE&>G zkSQlZ(9Av5X1C0q7(^}#*rqnsnD0;46=|HT{$l^>&_&+a$0ras<%NF6I!yVHK`ZD8 z*(}B>dNk8_F2Xm1KtiPi4Nt-=DK{or4v?a-D>ssoP>cr0;O|S7s+9kdUEoqY1 z(?G91XGN)o1PsIe|=LbR)RRs#2+-$B3s0gX@DB2?`c z@w9 z=BbO^dwTs?RtK-rx65_^^Ha~|t>9~2UB7|{%U*d+FEz!zQP5~^et0cIP1)^9nvi)v z7K3nM+=6G5b<=ba3XG$4+m@)8ma}&2ck53F7$_U28JiA@RGK8TpZJh2AkDQ&=t12n z6sCiSZY@^iA_+Hm?AbfYZ>~Vr)xDV#*2jKA7>D-Iu-Qdqo4%rH8UV)8tc7*H>v{N8(?V0l4D%0C1O;ErtTqg!SZUw$sSU0u^{y=Om0E2OEj2 zaC{pHGL|&@^?Ek*&MrVAq<(G8(SlF!e<(ANw9U26Tnl9gwQQsF4kRJ*zRe2x4 zvl?_HH3=KYJ~Xts>Tlb8Zx?WGOq<+X*OWZ3o<4TWq{#9qs24lLWhH&#&xY7wSRkj{ zxao=&R>WAxC^9~6Jb2y>Zq#*{mOrUxE^Aku)_U{S#J9s(UTWXU0KHP-b-X<09ah5ZE>u0T!1DP0~M4(SSh+8 zEGeyB0bYkjzh8M{6$|`uU3J95D29KwY;An#^1q8jmoY=(;3K`?X+PnsH&)96pBMTG zWtAqnJt~X`*n-Enu4OQ%DgIr!G(w|IH&Bi}1Qw?!y+Y`r9f}x0B6GN_NwN8a0(0SA zT2Y>{npvWl;>{x+0PJN7ezk*ClxVV=o3slE0ty!K&DxV@2m0L2LcuBJuX%W1^LF>W zRIbf& z;-XYzNp_JxO+`Ux>mU4F`+h1xDd5>7MuC_>cmh<7-G!9;+@=S|_u%T*?`lmEE>pu` zK%ohHE|ZW>Q}KY zQq=4TII}n+d3VKKYBVD5$di_YK!!#X#w*W!}TDX5hb69ijx|vHQf{XRmY!9{8J-0LF zj>})C*@sbc>r%RtYhUb_rH*okdWwLJkMPAwdD&98X)g3IhV7ExG#qc~7NHo?Q~2)M ztaXWB`2A~-MCMc?U;E;nih&-bZ3Xc?@uvFA0SgjG>WD&cua&|9kPLqUP{YKOvC zCN5nfHl+-h5wQ6*)T?c*9__ny=}Kefjw?gJki9M|@x53ZG!Z79goWNX>RP zX3EE%Nc8!}g?*kM(E3NWM9!?LgWVazok;N^rT~#)4(!Ua zD@2z~zR2afn=CBii1BsA^u4T#`H$O&O1u;tcAlDxjxZN+ug!EEF*FU-T3c0Duq}-^ z@*^%yy>77>m6j~PTOHMEBhSa(w(OT|hy z(7^EzoQ1hl8RkyONufryJFd`kDT8y%viybvUT*h7s$98p`MCDS635~;yoeN2GJiUC zo#=oziz06C0@9H+H)`b-y3Fg!=5yp!=~-Qee_g*Bz|;J%xc`lr8);Rly%5wgZe~;A zwisic7oAOj4!-W$%cvEHh;316RSa*04eMEbELIfx(Mxv2;L*3EUI=@tfvDKy(7`Aim5YftY{$={2CPr*jWVF(cCA1e9;)>o)nKU{hhi4QC~_G2lYQDgbe-@NvY$WM#! zZQi?pz5oTk}S|k5Y1Z$`oTIF*PXL z-B3yaeB)9Jy`E}$O)a;(O${70jeAxna<;d)=#M8Kah;dLp!P!o_YnZrA8ks=Pcc4S zb1ZQb%oDgdgSrq}7i4tD-uA&Y{lw_05*IU4D>8$VJcOwO3J@RMROU(g*7NRRra3jg zhq$id(aAp$?I1f&=egtaJ(T7ek<&Jt2wy9?7jWIJBGGh#I(!YY_&$6F3F4B#qDrBsc3`Ge!@ zCC2QJ!{XWckdkZ|*AIzYw!3zmIrS3BIg=7g98WU~Bpqhs%N83jQKrC_38G`1+r+E# zHCLe>9H%R=>SftBb^0!V%m@czzz5Ih6gOt8Ej3xFu6*e)%y4pS{d^6-Z%AOYjgMlF zp%6NnbW`ett!jpE$DUcK+IIo$I&7Kf5P72C+*Ym7&Vf`U6wr2JDAd3~e91Xx76VT; z%~Yg22l!r^e3-yrUtSE%FvLzQkU%ShN>9!ZcvD>_HkZ`&XPNp`tyS>D$nXc+-+Ugq zGVVJtH+kl(33Iut^TbeP_#bdNlFGwqN+v1!;6(>9diJ*C*BZ8F;CtZ%HH_l9M#`Gf z_?XNBR1xBj<6y5kqtyJ<)CIJ5L`8(a%C^>V+vj6$vmdhur1d({lUrn@E)OFxYY zKuz2gDU@nzVikkMr+x1wmE)L~O+3xQMB=4R@RY{KT(wS8Z%bko;b6LGP~G#qb)vTa zz?Z6VmT6bh16I++H&<^CsHy$rlGjSfZ3yoH#LD~&=HQFQt}0ObY*+e`RU?+x)FZ+7!kgqk{3%CZc=-Q*3dj;yaJ3lWm)Ot6OeK z>OAtz> zUMP`aD&OvDF1Lasi6 zd!&#xrUOdjg%16LMh_*1>;fjRG~5_i!Cn;CiOR@st0KCIoi>TAYR~JB1?+eN;ec=T zas6KV8Qw^|9(x4D7op8P;!p#xaESP9X8uz1M(haM6?!N3mr-=wEXe>k-{aysduGCxfP+*JqWdOFVuV%QVIq|3!0q3%;7mu`82D7%wJ*Dv7Rzo@S}2UaI{>mjYj0%F_Uv z3TRZjZbqk15hEMF&e+aHqUj)t-Yn=XTHX zglb-SgT}0y%k)dB{(97w6pTzd1iwmH!>|6JPC;gW}^)Y95hodpsF z)g;y}6jXSq4H&9sM~p^Bo$#~P;rh%o>%o4?=R=C)ZTu8Eluz=iJZyy?V1IPZW`Bgr zn^{pn7jjM!&n;woQk=R!o)LeiZTOsI?7KhzM>Xn>%lPFzrYW3!>&(#nhzeN0~XRv;)KvTOhQPbirK! zH(M^N;$1Tpm#*XCPE{}2KchDOfZ1~{W}j)CQD`U$8(!@FH!u$cBZr_hy76GMAPM-r z{SkAhw8+YXZ>YJcMJwaOXG|21&z&{(ZM$((0k&wuS&Jr60oc2!n$>Q1|GrQB4rvhJ z{j@pyW1>ggNc&qZ;n`(oDa!-FH-hL?}ZMJrniju zT}`ifqhv-rJ$fQ|?|<5BCz9bv&N`)eSbks9m;_XnY0XN!)Wz0nqV57#c1Y1+ApHBK zHd61H?69Gk(n{eppJO=d^AVF|yaCtNybQH30TL>DinyLug%D+&r8}}^;iaeMr|9?0 z28w^ccL6!+C)BKpEL}yIAJOwztm@|#zmeQa_h>VlU(l=ERNqT`GDFt&kztKW3nzL2 zaL{Ti=Z7!QL6nDD2u&#h;tVzJ!y;JjHTtpF56{C7ZCLsu^8Ro*81qcF&7EaN;JO-uP)>QB*4nSzSZ zxxe`CT%S7gwrwi5Mokmd*jQ=VM*PQ#lfPe_|C7hSj5a-FA4>W;tIQB1%ao&j1BoKc z$rXYm>fJG)k8jVV6{WA1PP1!<$TxlW?Yy|DqrZZy#jiwB7HDC%x^>zncF>+&H`uz& zvcqpKZ340I5pq-S$IJNGZybpCpYwLn8mr2bYBC9wys~8{bsKz?^0|F%Gxky6x>-+0 z0J=6sDdrWex{>J8tr(g-Uaq3>|!44B3=Ha8SZ*x>HllAFY$&x6Qw29C~Rev_r5P8K=e5H``R-fdVKl3C{v< zcZc{ijls2z+CFjv->7_V)}0dQlbg~>@+V?|PuNGO2DqzloKEQNC)qj_1IXs-cuL+1 zTbZshK*T52;eit(J%K7Jo>vF<&wph+uw|lysvdqUYSr;dTjXquvM>BAX#J~r!Nb!B z=Asa~@uFAgsGgXEm^1^AlJpz(g3hk}EA1+G^t(jFqj_Dr2pj@RHB zFo|gzOtX`-syk;I&_59DIH0%o@z%%K9F5l7b^k^<{Ec|{KX&$mu@y&{PSZ104A%YI(B+{-pYgyZP2my3lU%GyH}Ea{3TMqTsHPLS{o$M}=iKDB?l zZ8qu>D{=Tx#e3RW&3VT9U7TE-?5wK;87J)Kxww5XIZ*57b^CAJ_XY~C6VWG@IlN{i z^CV>fUA5W2W$rcGt9_owZ}dT1q-7x&XjON?{^O&uJJ=yy7_n7n*{lA`^Vg|%?qAds zg?l~w_ZrP!h}#9c+%kOT*@Nj`-xK6c9S%m=KKBeNUS()So$+kkwlOR6#=9^5u#;)} zJ&2wENrrL%-+ZkFL`$Zlh`JehYq?J$=~bH$#rC(gcL&MGj=QSrdKKTdQ7sgW?TMD_ z1I1@jotN#u+@5jTgh(zGYq!qvRvfzaK}_(-Dalh}kIiB(M;$9KD1&)Yn^$3EmlYyR zW)>S2N`i{?9q4oqWNs=DE&RG)u1@cZc!`5m#Q^uxPZ4vl*Uw-0;dO)h?OR`~_X+S^ z0aB(lj$z2Op^kdE!N*CGvx`}0)B=LHoAm%2iLdkrjg-h5SR{_@(yoXD1+Ya&nC9XB zFWl&;Ly{{vz16#yMPEgChUYa`ls)VWk+e09E;MAEL8w!hdc6_XPa$)Sv6v_U*WC;DLSs&DVy^ijE>qBWKJ z6+`VA)zSiEe@$%z4n!>e`Zq-S|H@f2pW4?g3Li^moRjJ2!r8* zr=K6p6mD2aUo<}sqf6gn4Izaqb zB;F!VnEZH^Dx13xH&QK5d~o}l4r;0w-0Tq4NHuL_wIbx$WXiJ0#Z&iI^n zUMrVploRwC@gEMnrj%tWy=zDY6l#zMeGOpWAu zrd-v)T_5{QNaWy62pqsxiWN-XshHtNjMKtI{OW#@oIL(#>JLd3o>ki^5l8)C>i`|0SThHeLzW=sXVQp*(+F9Qd-~ zORt3djjQix-0;nMT5+Ec!wk8lCTy==Y#Lr^taaD@a|TJ8bihwPtks*R#Fo9R7qnrB}BX`o&sLdkeBrXgj9 zkY?soH9<#N)q4)amfP1@x7_5?$T>l@wlxFTA>vRBC#EZ_Qs>1m#1Aie98I)b<-_-Y zWIP^KjdAlRo{*PZGiH3~t349;1Mo|iJicm7S*8UKjbEVlr5&hw`#3!CnFq$?7iB>{ zLt;as&`9Z!xvR^2oK)LED z@0`|Q^0DS_V32fCh6r4PDAu|Q*pr(UvJO7Tw13Q8#>mkh?QCeZFuzc1yag5J5?#fN zd@_Dn#+z->Q1sC<U9}<>4-1Skh3&rU@O^0ih=2 z8mtJ3^FA;RL$cZxv{&KU>Ail9?Kxk=QY0Ug*f1_6Y`czs{SQ3&zvJ_z|B>fhd|O*> zxjtdh(PohiIn=sQ2YtRX!zZ;qIsgEBG^W}#SPyS#uqq(|P)YVk%vVX!o+Wjt7!zFk z))J7QkQ2N5l(KfN8a18e@YQ{s)!Y(M!LEXQ%Z(+J}0g`dKj*StZ{W`d1fO)EtEYVZb}6%U!X!9nLw8umEuj6OJG|0lC+Ol z=pU?LQfkgH#@iB+m9xlF{^V|}oJ4O90X$A*?KZ68ugTpMx9IecN$H$v?wxOj-K z={HM5&!=^M#_j?FQFjYvS&v!_BeYD;MaOVN3+!q?$bXdV3$LvV>Ugbk2-Dx*OBV7woyZ2_}Xeni7|(O7rFOh=%oO)9N|cOqT5@j_}M@- zWYFB^%-HJF+UEL4z6aCCDh~fjgna`|V7jMr+i_{L+N|6bXzanBKJ>YuS+Ox4%%}2z zpT@!Q3psbw=Wes+lx!?Ofq#`M5G=+?=f=GZ=}EUcO?CO{A&`3L!2U%g zoztgS>yPd^xyPH+qRI8Cw$HP!r5ft|Jk#NHS>%E3A^`gUtcIK&h81ePqX?|9i0Mc@ z_?rHk*k((Y)1$_{jLd=*U;MV~;iVQ8%|~cjG<}+J?UQU7b-^o}INsHF;0$sv-JLA; zRfmiF*EfITwE~9V-MBCcff$? z5I4KiB)1zS;Q=Spa;P563seLDkM)!>V{DFUFQs8;CJiHYgJ$O~?h z9zB79+=9f$1a6zXTpX=79 zu`2>Ho9i9AQy}8@ssyqAON#*M+?601o>kf6ohau@o0%NhuKlYIj)rxp=55C8B$3f8 z%0!1W6*UgzUTEL@Y@yR3Lp=>|St~U}cd#G(KvxFf7czrhWW%Zf zt8&zkp2k#E;JVPxUe5=DT5NT?AAkP2cME{8y=6yhXn?}ugbkMourxI?om|C@_oS>< z`ByD&r>Qlzy?*SMVYMal6hkQ%jrn_?cfRc~;><7-$TX!2++kXU(SjAN>SCKyLD4na zjy92gM_!rca5v@AqiE)kk(S5n%S#L;=pXw9#Z4@vE*rO^n z7X%y_yiB9zR1U|$=kWvIpWsoQd%Iq61WFPks#ut3x6-Z-G+ zR2%p+jA7Xgzc#e~#s0L-((;rD8i= zobkTTpT9DKO$oo}wmI-xb?~&BPr3YH_XRsZFg-hT^&P|CgB}4H1&cG4-+8p!qK^jU zZSOy@lY@pHRG;4g#IaQLpA^mrc+IvAXjec^4hjuJb7@ z1Zl^x{!|qv^D}pqO2N2)ZqY13T%|~RAP*w+3x3eN+~=`3;y-<^034euR?|g2u_0h9 z0*b{H=P*61Kr+4)Cq`fI8u7RPqU{{2_S(Pkk1#b|49Q01#Z36fD?|{hxP^;hPWP?H ztHAG#pKiE1Yt^j0ZFHVL@|5I!0gInMdS5tHMYj_-B}EIP_mfd*9M^3-LpBILa(#T0 z749yuq9XgS|J#5f)WiT*AiQpwP)|Y;m!B2;FfYnvZ=$MKtOfPzg&UkjWiYja6 z_(v1%`gaE%FSAB&xzHoU4)Ne2M2;+g3w{>BR1S=w2oPoZJ|IrLwBbnZ{4d39j#>*I zLp@zCN=Z7Bqv8Y1RgG1cE$vnU|QbIUx`!rt2+3DBamgGt`?=cuVG-M z(0CQd+hgzzVrAl&SV(<<3?#=S;I~=oJ@Exj|!8!WJsEX*&fHh~k;5 zYg40WMw_tisDh?qR3E6jZ0W6CGv}#A4H#lyF@?#&Ad*eeZK(9394xMMSvG5S%Kq(6 zS%e6e@*{uV2ww4MX|CqKvDSY%%WOdUpwqRSVjdAQ3xv!ZLl~b?B(3fvts+Ai+PHI( zv*`sLE7ufPSV;ArvG^VjzW3SioVlFCTijU4-0PagQ)=Tb7q!ApCspX{0l0p^$OL)z z%-;2$B8eHgD(yNYA94Cisk$a!9;$h=IPis1&3*DG?=gVI4PV6I!&7#wEVc%F%>6Dl z4H8%+tq28HCdNWj*m7?JZXD=1X!Z4dxF(S1nl)v?QR)Rc*uq0d6?)|8Ny;F`w|MbO z<{M#UFkgn6%3H^=ZH?@)A%TbNPas}IDCLbZ%8i~$)xS(nC#{ROT%6ql%zZwwLP%Sg z>s5soe2Xt>zMALZ#hqeq!WQ(=fKV{8SI`A1yQ>QXW%L#w{N! z0aby&pea)!9amzud!e-gnV5w2?)!%U$RfzmEvD;U>w(iLg%BNxFRb6;t3_6 zwlfma;vg4~G=#^H=lZ(iErqXm<47KeTL2gg+jL4Lz93SJqZ2ucl>Ct>_+GU&3?+*c zfoqa;Q~W6F_YkK3BxN0o$f^&>pZuzdr2F0^6zzTz^pH^p9s{j`31gGpD>)ZMw*3~H zi^@AOwsNiC^hUMbd!ADAl44;1&)Qi{PW=gIORGs7UzHsRjImpp0^V6YB}@=pen|^H zJM#x(&KmXQ$oBO?NZMgi>&RcGU9(VH9jmws;)hGj!)Hv&u6t(7?p1k`h>tBlmn9uk zmczq00VG=You~v&)pE2p2wR>cP;&9)Ea9My~pBI1wu=LSHN5F zg`_Y>Fmlobc{B?-PRS(lb-4zVByeWA1^#mhgYu^>A3|0-Z3y1bTmMNN)xY7$Ki60N z*RS)%S$0l4)x3Mtl4x3C`e;g_`0>A}S>^lg+q5DsF%A*%j6>`pFLhSlR&%;QO1-LX z8WQB?`EGyJ%;OhtL~L}DP2() z_j09-cmN%b6q8G?pQmz^|FaoC@sru)!CZzdLXK0tb?^3PkLYUB&j?|Og2`Ep0Rs)Q zIir1ruRg?%zvTETGe~EUG*ZDb^lQuAUOMA95T>ObsLIwcb&2N=Rtocv$SDdMuMN0{ zT^=wIte3xQBJ$2hc^Qsh6lSD+D$MjVV_8xb09Jy=s%9ZKbYfm(3qv7+ggc=6o{vqC zl_g>?r6_T7O0y_K=?*kZv45NF?o z9$)SStB2NIQGm1x)f@m>oYcK1EMcK?wkdQ~juFB=RnUm4?dw#$$M>+=zdNQ*4b(EB zVtLdosS!JKKOB0FDa6W0DziVamG;^sm>GvY699M;-fo2I;45p5K7QS3+;4MLbF};) zf^k4G&b;qagof1J>O)m6{al>YspqOhxRpXC>oxrye{xW6rBICKf^tJ4tV@nG-ba|I zwr-$TJoiKd(JygzBaMejdaGXaWNmnzEGpn)x@{lR+u@YD+PCZlkiZg%8x)&9lu#cD z#7)n@ckhK=JrhijoUT!rH1G#1qTaNturzycp}KeT@QDb4r%YqY{tfmag!Mai*YLHw zufGg~Wn-V4J2@(H;gTEH(t>h(@Dm`bu@(ni3{ng>4&g^0)Pb)4I*{;Uwx(Y*JP2$l zzqQY&Su^hgE2j;>bi&c+Nzgl}I_{-6^ua-nEKVGV({Xz6Mfft5aHYHC9{xnlzT@MH z-#?W50(c0V3@0Qu8FA{5(Orc+Lt};wxgoN!CnfGbh;4y>p^>*7Ubipu#T@*v)8)UL zR)1?J&~>h80z(_p{5geCp??a`8ulKkr~W!{u9-?$l8NgGj}U#*(kLhSRF+cm!1nsp zR~h{0B;f$Dt$9v;2ZwdJVnlmD*Cc^>2**6W&R8uhHGV4EG@bZ)HD9%WpIFoH>^<9d zh2pUCkUCDgKeP$wEFel>1HI%%i|Mh^>%12Hsu@r9r?`Qz+LwPmn=t*g?+aRyRW8aY4x=(vbTQjGzZCckl=Y3lo)@m}u^{I-U7B%ae%{>fBBZv-(jADgp<;B?lQopJ z%+L>R6Q?DjR4V%_I4Y8@d4F|I{DJ!V#NIE8umGRNh7{QoCFz!>hvbEdZvuD#LOFlp d3jbr-*`Fw~f42SSKb!s;1OLCp0MG8^{{XWv(KG-6 literal 0 HcmV?d00001 diff --git a/graphics/technology/organotins.xcf b/sources/graphics/technology/organotins.xcf similarity index 100% rename from graphics/technology/organotins.xcf rename to sources/graphics/technology/organotins.xcf diff --git a/graphics/technology/reinforced-cable.xcf b/sources/graphics/technology/reinforced-cable.xcf similarity index 100% rename from graphics/technology/reinforced-cable.xcf rename to sources/graphics/technology/reinforced-cable.xcf diff --git a/thumbnail.xcf b/sources/thumbnail.xcf similarity index 100% rename from thumbnail.xcf rename to sources/thumbnail.xcf From 4fd444a4d1ae8db98cfa5ac26ad34dffef5d9545 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 23:41:54 +0200 Subject: [PATCH 07/10] editorconfig --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..bbf3e21 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +[*] +indent_style = space +indent_size = 2 \ No newline at end of file From 7c52c4f890d49398695c779414639a77eecb076f Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 23:42:16 +0200 Subject: [PATCH 08/10] gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 723ef36..85e49ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +*.zip \ No newline at end of file From 3f90d7488cedad641a814be06624f42cc9518d39 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 23:49:19 +0200 Subject: [PATCH 09/10] Rename mod --- bztin2/compatibility/data/hot-metals.lua | 16 +++---- bztin2/info.json | 2 +- bztin2/me.lua | 2 +- bztin2/strange-matter.lua | 2 +- bztin2/tin-enriched.lua | 16 +++---- bztin2/tin-matter.lua | 2 +- bztin2/tin-ore.lua | 14 +++--- bztin2/tin-recipe-final-stacking.lua | 8 ++-- bztin2/tin-recipe-se.lua | 8 ++-- bztin2/tin-recipe.lua | 54 ++++++++++++------------ 10 files changed, 62 insertions(+), 62 deletions(-) diff --git a/bztin2/compatibility/data/hot-metals.lua b/bztin2/compatibility/data/hot-metals.lua index 0a1096d..6339184 100644 --- a/bztin2/compatibility/data/hot-metals.lua +++ b/bztin2/compatibility/data/hot-metals.lua @@ -2,20 +2,20 @@ local util = require("data-util"); util.add_hot_metals({ {name="tin-plate", icons={ - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128}, - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, }}, {name="bronze-plate", icons={ - { icon = "__bztin__/graphics/icons/bronze-plate.png", icon_size = 128}, - { icon = "__bztin__/graphics/icons/bronze-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, + { icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, }}, {name="tinned-cable", icons={ - { icon = "__bztin__/graphics/icons/tinned-cable.png", icon_size = 64}, - { icon = "__bztin__/graphics/icons/tinned-cable.png", icon_size = 64, tint={.9,.3,0, .5}}, + { icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64}, + { icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64, tint={.9,.3,0, .5}}, }}, {name="solder", icons={ - { icon = "__bztin__/graphics/icons/solder.png", icon_size = 128}, - { icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, tint={.9,.3,0, .5}}, + { icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, tint={.9,.3,0, .5}}, }}, }) diff --git a/bztin2/info.json b/bztin2/info.json index a73284c..0484f8b 100644 --- a/bztin2/info.json +++ b/bztin2/info.json @@ -1,5 +1,5 @@ { - "name": "bztin", + "name": "bztin2", "version": "2.1.14", "factorio_version": "2.0", "title": "Tin", diff --git a/bztin2/me.lua b/bztin2/me.lua index b9e40cd..651c83d 100644 --- a/bztin2/me.lua +++ b/bztin2/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bztin" +me.name = "bztin2" me.resources = {{"tin-ore", "nauvis"}} me.list = {} me.recipes = {"tin-plate", "solder", "organotins", diff --git a/bztin2/strange-matter.lua b/bztin2/strange-matter.lua index c9eaf8f..50c2a75 100644 --- a/bztin2/strange-matter.lua +++ b/bztin2/strange-matter.lua @@ -1,7 +1,7 @@ local util = require("data-util"); local ore = "tin-ore" -local ore_icon = "__bztin__/graphics/icons/tin-ore.png" +local ore_icon = "__bztin2__/graphics/icons/tin-ore.png" if mods["StrangeMatter"] then data:extend({ diff --git a/bztin2/tin-enriched.lua b/bztin2/tin-enriched.lua index 211737e..66db626 100644 --- a/bztin2/tin-enriched.lua +++ b/bztin2/tin-enriched.lua @@ -8,12 +8,12 @@ data:extend( type = "item", name = "enriched-tin", icon_size = 128, - icon = "__bztin__/graphics/icons/enriched-tin.png", + icon = "__bztin2__/graphics/icons/enriched-tin.png", pictures = { - {filename="__bztin__/graphics/icons/enriched-tin.png", size=128, scale=0.25}, - {filename="__bztin__/graphics/icons/enriched-tin-1.png", size=128, scale=0.25}, - {filename="__bztin__/graphics/icons/enriched-tin-2.png", size=128, scale=0.25}, - {filename="__bztin__/graphics/icons/enriched-tin-3.png", size=128, scale=0.25}, + {filename="__bztin2__/graphics/icons/enriched-tin.png", size=128, scale=0.25}, + {filename="__bztin2__/graphics/icons/enriched-tin-1.png", size=128, scale=0.25}, + {filename="__bztin2__/graphics/icons/enriched-tin-2.png", size=128, scale=0.25}, + {filename="__bztin2__/graphics/icons/enriched-tin-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-tin]", @@ -23,7 +23,7 @@ data:extend( type = "recipe", name = "enriched-tin", main_product="enriched-tin", - icon = "__bztin__/graphics/icons/enriched-tin.png", + icon = "__bztin2__/graphics/icons/enriched-tin.png", icon_size = 128, category = "chemistry", energy_required = 3, @@ -58,8 +58,8 @@ data:extend( name = "enriched-tin-plate", icons = { - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128 }, - { icon = "__bztin__/graphics/icons/enriched-tin.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128 }, + { icon = "__bztin2__/graphics/icons/enriched-tin.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, }, category = "smelting", energy_required = 16, diff --git a/bztin2/tin-matter.lua b/bztin2/tin-matter.lua index 6030b8d..b1cc805 100644 --- a/bztin2/tin-matter.lua +++ b/bztin2/tin-matter.lua @@ -15,7 +15,7 @@ if mods["Krastorio2"] then unlocked_by = "tin-matter-processing", }, k2baseicon = "stone", - icon = { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4} + icon = { icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4} }) util.k2matter({ diff --git a/bztin2/tin-ore.lua b/bztin2/tin-ore.lua index e6e5ccd..b3446ab 100644 --- a/bztin2/tin-ore.lua +++ b/bztin2/tin-ore.lua @@ -26,7 +26,7 @@ data:extend({ type = "resource", icon_size = 64, icon_mipmaps = 3, name = "tin-ore", - icon = "__bztin__/graphics/icons/tin-ore.png", + icon = "__bztin2__/graphics/icons/tin-ore.png", flags = {"placeable-neutral"}, order="a-b-a", map_color = {r=0.90, g=1.00, b=0.10}, @@ -53,7 +53,7 @@ data:extend({ stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80}, stages = { sheet = { - filename = "__bztin__/graphics/entity/ores/hr-tin-ore.png", + filename = "__bztin2__/graphics/entity/ores/hr-tin-ore.png", priority = "extra-high", size = 128, frame_count = 8, @@ -66,12 +66,12 @@ data:extend({ type = "item", name = "tin-ore", icon_size = 64, icon_mipmaps = 3, - icon = "__bztin__/graphics/icons/tin-ore.png", + icon = "__bztin2__/graphics/icons/tin-ore.png", pictures = { - {filename="__bztin__/graphics/icons/tin-ore.png", size=64, scale=0.5}, - {filename="__bztin__/graphics/icons/tin-ore-1.png", size=64, scale=0.5}, - {filename="__bztin__/graphics/icons/tin-ore-2.png", size=64, scale=0.5}, - {filename="__bztin__/graphics/icons/tin-ore-3.png", size=64, scale=0.5}, + {filename="__bztin2__/graphics/icons/tin-ore.png", size=64, scale=0.5}, + {filename="__bztin2__/graphics/icons/tin-ore-1.png", size=64, scale=0.5}, + {filename="__bztin2__/graphics/icons/tin-ore-2.png", size=64, scale=0.5}, + {filename="__bztin2__/graphics/icons/tin-ore-3.png", size=64, scale=0.5}, }, inventory_move_sound = item_sounds.resource_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, diff --git a/bztin2/tin-recipe-final-stacking.lua b/bztin2/tin-recipe-final-stacking.lua index 9df36a0..8457413 100644 --- a/bztin2/tin-recipe-final-stacking.lua +++ b/bztin2/tin-recipe-final-stacking.lua @@ -3,9 +3,9 @@ local util = require("data-util"); if deadlock and deadlock["add_stack"] then - deadlock.add_stack("tin-ore", "__bztin__/graphics/icons/stacked/tin-ore-stacked.png", "deadlock-stacking-1", 64) - deadlock.add_stack("tin-plate", "__bztin__/graphics/icons/stacked/tin-plate-stacked.png", "deadlock-stacking-1", 128) - deadlock.add_stack("solder", "__bztin__/graphics/icons/stacked/solder-stacked.png", "deadlock-stacking-1", 128) + deadlock.add_stack("tin-ore", "__bztin2__/graphics/icons/stacked/tin-ore-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("tin-plate", "__bztin2__/graphics/icons/stacked/tin-plate-stacked.png", "deadlock-stacking-1", 128) + deadlock.add_stack("solder", "__bztin2__/graphics/icons/stacked/solder-stacked.png", "deadlock-stacking-1", 128) if data.raw.item["tinned-cable"] then deadlock.add_stack("tinned-cable", nil , "deadlock-stacking-2", nil) end @@ -13,7 +13,7 @@ if deadlock and deadlock["add_stack"] then deadlock.add_stack("bronze-plate", nil , "deadlock-stacking-1", nil) end if mods.Krastorio2 then - deadlock.add_stack("enriched-tin", "__bztin__/graphics/icons/stacked/enriched-tin-ore-stacked.png" , "deadlock-stacking-3", 128) + deadlock.add_stack("enriched-tin", "__bztin2__/graphics/icons/stacked/enriched-tin-ore-stacked.png" , "deadlock-stacking-3", 128) end end diff --git a/bztin2/tin-recipe-se.lua b/bztin2/tin-recipe-se.lua index 401d5a5..4642bc0 100644 --- a/bztin2/tin-recipe-se.lua +++ b/bztin2/tin-recipe-se.lua @@ -20,7 +20,7 @@ if mods["space-exploration"] then { type = "item", name = "tin-ingot", - icons = {{icon = "__bztin__/graphics/icons/tin-ingot.png", icon_size = 128}}, + icons = {{icon = "__bztin2__/graphics/icons/tin-ingot.png", icon_size = 128}}, order = "b-b", stack_size = 50, subgroup = "tin", @@ -32,7 +32,7 @@ if mods["space-exploration"] then max_temperature = 232, base_color = {r=191, g=219, b=233}, flow_color = {r=191, g=219, b=233}, - icons = {{icon = "__bztin__/graphics/icons/molten-tin.png", icon_size = 128}}, + icons = {{icon = "__bztin2__/graphics/icons/molten-tin.png", icon_size = 128}}, order = "a[molten]-a", pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, @@ -76,8 +76,8 @@ if mods["space-exploration"] then name = "tin-ingot-to-plate", icons = { - {icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128}, - {icon = "__bztin__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + {icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128}, + {icon = "__bztin2__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { {type = "item", name = "tin-plate", amount = 10}, diff --git a/bztin2/tin-recipe.lua b/bztin2/tin-recipe.lua index f9ea15b..8ea43da 100644 --- a/bztin2/tin-recipe.lua +++ b/bztin2/tin-recipe.lua @@ -13,10 +13,10 @@ data:extend({ order = "d[tin-plate]", icons = (mods["Krastorio2"] and { - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128}, - { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}}, } or { - { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128}, + { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128}, } ), -- (mods["Krastorio2"] and @@ -51,7 +51,7 @@ data:extend({ { type = "item", name = "tin-plate", - icon = "__bztin__/graphics/icons/tin-plate.png", + icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, subgroup = "raw-material", order = "b[tin-plate]", @@ -73,7 +73,7 @@ data:extend({ { type = "item", name = "solder", - icon = "__bztin__/graphics/icons/solder.png", + icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, subgroup = "intermediate-product", order = "b[solder]", @@ -105,8 +105,8 @@ data:extend({ subgroup = "vulcanus-processes", order = "z[casting]-d[casting-solder]", icons = { - {icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, shift={-4,4}}, - {icon = "__bztin__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}}, + {icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, shift={-4,4}}, + {icon = "__bztin2__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}}, }, enabled = false, ingredients = solder_casting, @@ -124,8 +124,8 @@ data:extend({ type = "technology", name = "alloy-separation", icons = { - {icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, scale = 0.33, shift = {0,-6}}, - {icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128, scale = 0.25, shift = {-6,4}}, + {icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, scale = 0.33, shift = {0,-6}}, + {icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, scale = 0.25, shift = {-6,4}}, mods["bzlead2"] and {icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}} or {icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}}, }, @@ -148,7 +148,7 @@ if mods.bzaluminum2 and not mods["bzlead2"] then { type = "technology", name = "solder", - icon = "__bztin__/graphics/icons/solder.png", + icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, effects = { { type = "unlock-recipe", recipe = "solder" }, @@ -182,7 +182,7 @@ data:extend({ heat_capacity = "0.1kJ", base_color = {r=0.75, g=0.65, b=0.1}, flow_color = {r=0.7, g=1, b=0.1}, - icon = "__bztin__/graphics/icons/organotins.png", + icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64, order = "a[fluid]-f[organotins]" }, @@ -207,7 +207,7 @@ data:extend({ { type = "technology", name = "organotin-chemistry", - icon = "__bztin__/graphics/technology/organotins.png", + icon = "__bztin2__/graphics/technology/organotins.png", icon_size = 256, effects = { { type = "unlock-recipe", recipe = "organotins" }, @@ -228,7 +228,7 @@ data:extend({ { type = "item", name = "tinned-cable", - icon = "__bztin__/graphics/icons/tinned-cable.png", + icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64, icon_mipmaps = 4, subgroup = util.cablesg, order = "b[tinned-cable]", @@ -252,7 +252,7 @@ data:extend({ { type = "technology", name = "tinned-cable", - icon = "__bztin__/graphics/icons/tinned-cable.png", + icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64, icon_mipmaps = 4, effects = { { type = "unlock-recipe", recipe = "tinned-cable" }, @@ -281,7 +281,7 @@ data:extend({ { type = "item", name = "bronze-plate", - icon = "__bztin__/graphics/icons/bronze-plate.png", + icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, subgroup = "intermediate-product", order = "b[bronze-plate]", @@ -319,7 +319,7 @@ data:extend({ subgroup = "vulcanus-processes", order = "b[casting]-d[casting-tin-bronze]", icons = { - {icon = "__bztin__/graphics/icons/bronze-plate.png", icon_size = 128, shift={-4,4}}, + {icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, shift={-4,4}}, {icon = "__space-age__/graphics/icons/fluid/molten-copper.png", icon_size = 64, shift={4,-4}}, }, enabled = false, @@ -391,7 +391,7 @@ data:extend({ allow_productivity = true, energy_required = 2, icons = { - { icon="__bztin__/graphics/icons/tin-ore.png", icon_size=64}, + { icon="__bztin2__/graphics/icons/tin-ore.png", icon_size=64}, { icon="__base__/graphics/icons/fluid/steam.png", icon_size=64, tint={r=.9, g=.9, b=.1, a=.7}, scale=0.5, shift={-8,-8}}, }, ingredients = mods.bztitanium and { @@ -408,7 +408,7 @@ data:extend({ { type = "fluid", name = "molten-tin", - icon = "__bztin__/graphics/icons/molten-tin-sa.png", + icon = "__bztin2__/graphics/icons/molten-tin-sa.png", subgroup = "fluid", order = "b[new-fluid]-b[vulcanus]-d[molten-tin]", default_temperature = 1500, @@ -444,8 +444,8 @@ data:extend({ subgroup = "vulcanus-processes", order = "b[casting]-d[casting-tin]", icons = { - {icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128, shift={-4,4}}, - {icon = "__bztin__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}}, + {icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, shift={-4,4}}, + {icon = "__bztin2__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}}, }, enabled = false, ingredients = @@ -469,7 +469,7 @@ data:extend({ { type = "item", name = "jellyskin", - icon = "__bztin__/graphics/icons/jellyskin.png", + icon = "__bztin2__/graphics/icons/jellyskin.png", icon_size = 64, subgroup = "agriculture-processes", order = "b[agriulture]-d[tin]", @@ -492,8 +492,8 @@ data:extend({ subgroup = "agriculture-processes", order = "e[agriculture]-a[tin]", icons = { - {icon = "__bztin__/graphics/icons/organotins.png", icon_size = 64}, - {icon = "__bztin__/graphics/icons/jellyskin.png", icon_size=64, shift={0,-8}}, + {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64}, + {icon = "__bztin2__/graphics/icons/jellyskin.png", icon_size=64, shift={0,-8}}, }, enabled = false, allow_productivity = true, @@ -515,8 +515,8 @@ data:extend({ subgroup = "agriculture-processes", order = "e[agriculture]-a[tin]", icons = { - {icon = "__bztin__/graphics/icons/organotins.png", icon_size = 64}, - {icon = "__bztin__/graphics/icons/tin-ore.png", icon_size=64, scale=0.333, shift={0,8}}, + {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64}, + {icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size=64, scale=0.333, shift={0,8}}, }, enabled = false, allow_productivity = true, @@ -538,7 +538,7 @@ util.add_product("jellynut-processing", util.item("jellyskin", 1, .25)) util.add_ingredient("bioplastic", "organotins", 7.5) util.set_icons("bioplastic", { {icon = "__space-age__/graphics/icons/bioplastic.png", icon_size = 64}, - {icon = "__bztin__/graphics/icons/organotins.png", icon_size = 64, scale=.25, shift={0,-8}}, + {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64, scale=.25, shift={0,-8}}, }) util.add_unlock("biochamber", "jellyskin-processing") util.add_unlock("biochamber", "tin-from-organotins") @@ -551,7 +551,7 @@ data:extend({ name = "metallic-asteroid-crushing-tin", icons = { {icon = "__space-age__/graphics/icons/metallic-asteroid-crushing.png", icon_size=64}, - {icon="__bztin__/graphics/icons/tin-ore.png", icon_size=64, scale =0.25, shift = {0,4}}, + {icon="__bztin2__/graphics/icons/tin-ore.png", icon_size=64, scale =0.25, shift = {0,4}}, }, category = "crushing", subgroup="space-crushing", From 6592f44b595a21f555da38c52100d2adc3c19ba5 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 20 Oct 2025 23:52:35 +0200 Subject: [PATCH 10/10] info/readme/changelog --- README.md | 25 ++-- bztin2/changelog.txt | 295 +------------------------------------------ bztin2/info.json | 57 ++++----- 3 files changed, 46 insertions(+), 331 deletions(-) diff --git a/README.md b/README.md index 8ee14e5..be2f609 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,26 @@ +**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.** + # Tin +Adds tin ore, tin plates, solder, organotins, and (optionally) tinned cable and bronze to the game. -[factorio mod page](https://mods.factorio.com/mod/bztin) +This mod mostly retains the vanilla feel, with a new resource integrated into the game. There are also production chains on the other planets in Space Age. -Adds tin to the base game +If you want a vanilla-esque game with some tweaks, try this mod, or perhaps a less complex one like Titanium or Lead. -## Version History -See changelog.txt +Tin is an early game resource and is slightly easier to process than other metals. It has less overall use than Titanium or Lead, but a bit higher complexity, especially if tinned cable and bronze are enabled. -## Created by - -- [brevven](https://mods.factorio.com/user/brevven) (code, design, graphics) - -## Thanks to +## Credits +- Brevven ([Original mod](https://mods.factorio.com/mod/bzsilicon)) +- [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (mod integrations and maintenance) - [snouz](https://github.com/snouz) (logo inspiration, ore graphics templates) ### Compatibility - [nihilistzsche](https://github.com/nihilistzsche) ### Localization - - [Pergamum663](https://github.com/Pergamum663) (ru) - [RiCZrd](https://mods.factorio.com/user/RiCZrd) (cs) - [Sakuro](https://github.com/sakuro) (ja) -- [sunnytan53](https://github.com/sunnytan53) (zh-CN) - - +- [sunnytan53](https://github.com/sunnytan53) (zh-CN) \ No newline at end of file diff --git a/bztin2/changelog.txt b/bztin2/changelog.txt index 8d13c2f..ca2dfee 100644 --- a/bztin2/changelog.txt +++ b/bztin2/changelog.txt @@ -1,290 +1,7 @@ --------------------------------------------------------------------------------------------------- -Version: 2.1.14 -Date: 2025-05-04 - Changes: - - Support for Krastorio2 spaced out - - Minor tweaks to K2 integration ---------------------------------------------------------------------------------------------------- -Version: 2.1.13 -Date: 2025-05-03 - Fixes: - - Fix mod load issue with Bob's - Changes: - - K2: Compatibility updates (with thanks to autechr3 and pla) ---------------------------------------------------------------------------------------------------- -Version: 2.1.12 -Date: 2025-04-20 - Fixes: - - Cerys: Fix tinned cable ratios in recycling on both Cerys and Fulgora - - Cerys: Fix soft lock on initial power poles by providing some in huge and colossal ruins - Changes: - - Any planet start: On Vulcanus, unlock tinned cable earlier ---------------------------------------------------------------------------------------------------- -Version: 2.1.11 -Date: 2025-04-08 - Changes: - - Space Age: Asteroid crushing recipe now affected by productivity research - - Integrate better into Cerys recyling and ruins ---------------------------------------------------------------------------------------------------- -Version: 2.1.10 -Date: 2025-03-22 - Changes: - - Set inventory sounds for some items - Fixes: - - Loads with crafting efficiency - - Improved compatibility with Muluna ---------------------------------------------------------------------------------------------------- -Version: 2.1.9 -Date: 2025-03-04 - Changes: - - Align various electronic circuit recipes to all use solder ---------------------------------------------------------------------------------------------------- -Version: 2.1.8 -Date: 2025-03-03 - Changes: - - Allow productivity on several recipes - - Other minor tweaks and fixes ---------------------------------------------------------------------------------------------------- -Version: 2.1.7 -Date: 2025-02-22 - Fixes: - - Vanilla: Fix runtime crash when adding certain mods to existing game. ---------------------------------------------------------------------------------------------------- -Version: 2.1.6 -Date: 2025-02-10 - Changes: - - Compatibility with Probablistic Agriculture ---------------------------------------------------------------------------------------------------- -Version: 2.1.5 -Date: 2025-02-01 - Changes: - - Add shiftite recipe for Janus mod ---------------------------------------------------------------------------------------------------- -Version: 2.1.4 -Date: 2025-01-25 - Changes: - - Maraxsis: Glass requires tin. Can get tin from rocks. - - Tweak Any Planet Start resourcing - - Other minor tweaks to improve compatibility and progression ---------------------------------------------------------------------------------------------------- -Version: 2.1.3 -Date: 2025-01-25 - Fixes: - - Improve compatibility with mods that change armor recipes in certain ways ---------------------------------------------------------------------------------------------------- -Version: 2.1.2 -Date: 2025-01-20 - Fixes: - - Loads properly again with vanilla - Changes: - - Space Age: Solder can be made in electromagnetic plant ---------------------------------------------------------------------------------------------------- -Version: 2.1.1 -Date: 2025-01-17 - Changes: - - Fix load issues with some mod settings and loadouts introduced last version ---------------------------------------------------------------------------------------------------- -Version: 2.1.0 -Date: 2025-01-17 - Changes: - - Space Age: Add new "Alloy separation" technology that allows recycling of some alloys, - including solder and bronze. These alloys will only self-recycle at first, but researching - the new tech will unlock a recycling recipe that breaks them down into components. - - Space Age: Tinned cable is always enabled (mostly affects combinator and pumpjack recipes) - Scrap recycling now produces tinned cable instead of copper cable, at 4x the rate. - This will almost certainly require some adjustment on Fulgora, but will be a buff to tin - production on Fulgora, without nerfing copper production. - - Space Age: When bronze plate is enabled, Fulgoran ruins now hold some. - - Space Age: Big Fulgora rocks now have some tin ore (and if Lead mod is enabled, lead ore) to - help kickstart production before solder can be recycled. - - Space Age / Any Planet Start: Scrap recycling no longer produces bronze plates ---------------------------------------------------------------------------------------------------- -Version: 2.0.6 -Date: 2025-01-14 - Fixes: - - Working with Asteroid Mining mod ---------------------------------------------------------------------------------------------------- -Version: 2.0.5 -Date: 2025-01-07 - Fixes: - - Improve some mod compatibility ---------------------------------------------------------------------------------------------------- -Version: 2.0.4 -Date: 2025-01-06 - Fixes: - - Fix recycling recipes for items that use tin. - - Also, attempt to respect disabling of recycling recipes ---------------------------------------------------------------------------------------------------- -Version: 2.0.3 -Date: 2025-01-05 - Changes: - - Vulcanus rocks now have some tin ore to avoid possible soft locks - - Gleba highlands have rocks with tin ore to avoid possible soft locks - - Other minor tweaks to prevent softlocks, especially with Any Planet Start mod ---------------------------------------------------------------------------------------------------- -Version: 2.0.2 -Date: 2025-01-04 - Fixes: - - Lock tin sulfides properly behind tech - Changes: - - Update weights for rockets - - Hot metals: use default cooling time ---------------------------------------------------------------------------------------------------- -Version: 2.0.1 -Date: 2025-01-01 - Changes: - - Organotins will show up in a better location in places like Factoriopedia - - Tweak bronze plate icon - Features: - - Supports Hot metals mod. - - Add casting recipes for solder, and bronze if enabled. ---------------------------------------------------------------------------------------------------- -Version: 2.0.0 -Date: 2024-12-31 - Changes: - - Updated to Factorio 2.0 and Space Age - Can be added to existing savegame. Will generate ore patches on newly explored chunks on Nauvis. - To add ore patches to previously explored chunks, use /bz-regenerate console command. - - bzlist chat command is now a proper console command: /bz-list - - Alternate processes for creating tin on Vulcanus and Gleba, and recycling on Fulgora - - A small number of new uses for tin in Spage Age. (More may come later) - - Confirmed compatible with many modded planets. - - Compatibility with other mods is not confirmed, but many will still work ---------------------------------------------------------------------------------------------------- -Version: 0.1.13 -Date: 2024-02-10 - Changes: - - Compatibility fix for Warptorio Expansion to prevent soft lock when used without Aluminum ---------------------------------------------------------------------------------------------------- -Version: 0.1.12 -Date: 2023-12-24 - Localization: - - ja updates, thanks to Sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.1.11 -Date: 2023-03-27 - Fixes: - - K2SE: Matter stabilizers ---------------------------------------------------------------------------------------------------- -Version: 0.1.10 -Date: 2023-02-12 - Changes: - - Crafting efficiency improvements, thanks to nihilistzsche ---------------------------------------------------------------------------------------------------- -Version: 0.1.9 -Date: 2023-01-17 - Features: - - (Beta) Crafting efficiency compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.1.8 -Date: 2022-12-28 - Changes: - - Updates for compatibility with Graphite & Diamonds 0.5.5 ---------------------------------------------------------------------------------------------------- -Version: 0.1.7 -Date: 2022-12-24 - Localization: - - zh-CN by sunnytan53 - Fixes: - - GDIW modules - Changes: - - SE ingot in delivery cannon ---------------------------------------------------------------------------------------------------- -Version: 0.1.6 -Date: 2022-08-19 - Changes: - - When used with Aluminum but not Lead, add new solder tech after copper-processing. Solder and - pipe to ground unlock with (or after) this tech. - - Minor recipe tweaks, including simpler pipe to ground recipe - Localization: - - ja, thanks to Sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.1.5 -Date: 2022-08-17 - Fixes: - - SE: Disable matter recipes at start - Changes: - - Compatibility with bob's assembling machines - - Compatibility with Renai Transportation inserters ---------------------------------------------------------------------------------------------------- -Version: 0.1.4 -Date: 2022-08-16 - Changes: - - In some very specific mod loadouts, tinned cable used in lamps - - Stacked solder icon updated, too - Features: - - Support for SE matter fusion and SE+K2 matter liberation ---------------------------------------------------------------------------------------------------- -Version: 0.1.3 -Date: 2022-08-10 - Changes: - - Improved solder icon - - Cables subgroup ---------------------------------------------------------------------------------------------------- -Version: 0.1.2 -Date: 2022-08-05 - Fixes: - - When bypass setting is used with recipes with altered outputs (eg. Glass with Foundry or K2), - the outputs will now, correctly, not be altered. A similar fix will go out to other BZ mods - over the coming days/weeks. ---------------------------------------------------------------------------------------------------- -Version: 0.1.1 -Date: 2022-08-05 - Features: - - Some support for ScienceCostTweaker - green science ---------------------------------------------------------------------------------------------------- -Version: 0.1.0 -Date: 2022-08-02 - Changes: - - Asteroid mining compatibility - - K2: remove some descriptions that were misleading and no longer K2 standard. ---------------------------------------------------------------------------------------------------- -Version: 0.0.8 -Date: 2022-07-24 - Localization: - - cs locale thanks to RiCZrd ---------------------------------------------------------------------------------------------------- -Version: 0.0.7 -Date: 2022-07-23 - Localization: - - ru locale thanks to Pergamum663 ---------------------------------------------------------------------------------------------------- -Version: 0.0.6 -Date: 2022-07-19 - Changes: - - Deadlock Stacking: Bronze support ---------------------------------------------------------------------------------------------------- -Version: 0.0.5 -Date: 2022-07-16 - Changes: - - Machine coloring tweaks - Fixes: - - K2, AAI, 248k etc: Tin in glass recipes no longer affected by productivity - - (minor) ordering of solder item ---------------------------------------------------------------------------------------------------- -Version: 0.0.4 -Date: 2022-07-07 - Fixes: - - Support foundry minimal mode for bronze - Changes: - - Thumbnail tweak ---------------------------------------------------------------------------------------------------- -Version: 0.0.3 -Date: 2022-07-06 - Features: - - Optional bronze plate item added, defaults to not enabled. ---------------------------------------------------------------------------------------------------- -Version: 0.0.2 -Date: 2022-07-06 - Features: - - Compatible with both Space Exploration 0.5 and 0.6. Compatibility with SE 0.5 will likely not - be as up to date, and will eventually not be supported after a few months. ---------------------------------------------------------------------------------------------------- -Version: 0.0.1 -Date: 2022-07-05 - Features: - - Alpha release. Adds tin, solder, organotins, and (optionally) tinned cable - - Compatible with Krastorio 2 - - Compatible with Space Exploration - - Compatible with deadlock stacking/crating - - Compatible with many other mods +Version: 2.1.16 +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/bztin2/info.json b/bztin2/info.json index 0484f8b..159c2e0 100644 --- a/bztin2/info.json +++ b/bztin2/info.json @@ -1,32 +1,31 @@ { - "name": "bztin2", - "version": "2.1.14", - "factorio_version": "2.0", - "title": "Tin", - "author": "Brevven", - "contact": "", - "homepage": "", - "dependencies": [ - "base >= 1.1.0", - "? bzfoundry2 >= 2.0.0", - "? bztitanium >= 1.2.0", - "? bzlead2 >= 2.0.29", - "? bzzirconium >= 0.6.0", - "? bztungsten2 >= 2.0.0", - "? bzcarbon2 >= 2.0.22", - "? bzaluminum2 >= 0.4.9", - "? space-exploration >= 0.5.100", - "(?) aai-industry", - "? aai-industry", - "? hot-metals", - "? Krastorio2", - "? Krastorio2-spaced-out", - "? sand-and-glass", - "? deadlock-beltboxes-loaders", - "? DeadlockCrating", - "? space-age", - "(?) RenaiTransportation" - ], - "description": "Adds tin, solder and more to the base game.\n\nCompatible with Space Age.\n\nA standalone piece of BZ Mods." + "name": "bztin2", + "version": "2.1.16", + "factorio_version": "2.0", + "title": "Tin - Legacy", + "description": "Adds tin, solder and more to the base game.", + "author": "Brevven, cackling fiend", + "homepage": "https://discord.gg/ufvFUJtVwk", + "dependencies": [ + "base >= 2.0.0", + "? bzfoundry2 >= 2.0.0", + "? bztitanium >= 1.2.0", + "? bzlead2 >= 2.0.29", + "? bzzirconium >= 0.6.0", + "? bztungsten2 >= 2.0.0", + "? bzcarbon2 >= 2.0.22", + "? bzaluminum2 >= 0.4.9", + "? space-exploration >= 0.5.100", + "(?) aai-industry", + "? aai-industry", + "? hot-metals", + "? Krastorio2", + "? Krastorio2-spaced-out", + "? sand-and-glass", + "? deadlock-beltboxes-loaders", + "? DeadlockCrating", + "(?) RenaiTransportation", + "! space-age" + ] }