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 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/bztitanium2/LICENSE.md similarity index 100% rename from LICENSE.md rename to bztitanium2/LICENSE.md diff --git a/changelog.txt b/bztitanium2/changelog.txt similarity index 100% rename from changelog.txt rename to bztitanium2/changelog.txt diff --git a/compatibility/248k-final.lua b/bztitanium2/compatibility/248k-final.lua similarity index 100% rename from compatibility/248k-final.lua rename to bztitanium2/compatibility/248k-final.lua diff --git a/compatibility/248k.lua b/bztitanium2/compatibility/248k.lua similarity index 100% rename from compatibility/248k.lua rename to bztitanium2/compatibility/248k.lua diff --git a/compatibility/data/hot-metals.lua b/bztitanium2/compatibility/data/hot-metals.lua similarity index 100% rename from compatibility/data/hot-metals.lua rename to bztitanium2/compatibility/data/hot-metals.lua diff --git a/compatibility/titanium-auto-train-depot-final.lua b/bztitanium2/compatibility/titanium-auto-train-depot-final.lua similarity index 100% rename from compatibility/titanium-auto-train-depot-final.lua rename to bztitanium2/compatibility/titanium-auto-train-depot-final.lua diff --git a/compatibility/titanium-endgame-combat-data.lua b/bztitanium2/compatibility/titanium-endgame-combat-data.lua similarity index 100% rename from compatibility/titanium-endgame-combat-data.lua rename to bztitanium2/compatibility/titanium-endgame-combat-data.lua diff --git a/compatibility/titanium-endgame-combat-final.lua b/bztitanium2/compatibility/titanium-endgame-combat-final.lua similarity index 100% rename from compatibility/titanium-endgame-combat-final.lua rename to bztitanium2/compatibility/titanium-endgame-combat-final.lua diff --git a/control-util.lua b/bztitanium2/control-util.lua similarity index 100% rename from control-util.lua rename to bztitanium2/control-util.lua diff --git a/control.lua b/bztitanium2/control.lua similarity index 100% rename from control.lua rename to bztitanium2/control.lua diff --git a/data-final-fixes.lua b/bztitanium2/data-final-fixes.lua similarity index 100% rename from data-final-fixes.lua rename to bztitanium2/data-final-fixes.lua diff --git a/data-updates.lua b/bztitanium2/data-updates.lua similarity index 100% rename from data-updates.lua rename to bztitanium2/data-updates.lua diff --git a/data-util.lua b/bztitanium2/data-util.lua similarity index 100% rename from data-util.lua rename to bztitanium2/data-util.lua diff --git a/data.lua b/bztitanium2/data.lua similarity index 100% rename from data.lua rename to bztitanium2/data.lua diff --git a/graphics/entity/ores/hr-titanium-ore.png b/bztitanium2/graphics/entity/ores/hr-titanium-ore.png similarity index 100% rename from graphics/entity/ores/hr-titanium-ore.png rename to bztitanium2/graphics/entity/ores/hr-titanium-ore.png diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png b/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png similarity index 100% rename from graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png rename to bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png b/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png similarity index 100% rename from graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png rename to bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png b/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png similarity index 100% rename from graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png rename to bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png b/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png similarity index 100% rename from graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png rename to bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png b/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png similarity index 100% rename from graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png rename to bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png b/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png similarity index 100% rename from graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png rename to bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png b/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png similarity index 100% rename from graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png rename to bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png diff --git a/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png b/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png similarity index 100% rename from graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png rename to bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png diff --git a/graphics/icons/enriched-titanium-2.png b/bztitanium2/graphics/icons/enriched-titanium-2.png similarity index 100% rename from graphics/icons/enriched-titanium-2.png rename to bztitanium2/graphics/icons/enriched-titanium-2.png diff --git a/graphics/icons/enriched-titanium-3.png b/bztitanium2/graphics/icons/enriched-titanium-3.png similarity index 100% rename from graphics/icons/enriched-titanium-3.png rename to bztitanium2/graphics/icons/enriched-titanium-3.png diff --git a/graphics/icons/enriched-titanium-4.png b/bztitanium2/graphics/icons/enriched-titanium-4.png similarity index 100% rename from graphics/icons/enriched-titanium-4.png rename to bztitanium2/graphics/icons/enriched-titanium-4.png diff --git a/graphics/icons/enriched-titanium.png b/bztitanium2/graphics/icons/enriched-titanium.png similarity index 100% rename from graphics/icons/enriched-titanium.png rename to bztitanium2/graphics/icons/enriched-titanium.png diff --git a/graphics/icons/molten-titanium.png b/bztitanium2/graphics/icons/molten-titanium.png similarity index 100% rename from graphics/icons/molten-titanium.png rename to bztitanium2/graphics/icons/molten-titanium.png diff --git a/graphics/icons/stacked/enriched-titanium-stacked.png b/bztitanium2/graphics/icons/stacked/enriched-titanium-stacked.png similarity index 100% rename from graphics/icons/stacked/enriched-titanium-stacked.png rename to bztitanium2/graphics/icons/stacked/enriched-titanium-stacked.png diff --git a/graphics/icons/stacked/titanium-ore-stacked.png b/bztitanium2/graphics/icons/stacked/titanium-ore-stacked.png similarity index 100% rename from graphics/icons/stacked/titanium-ore-stacked.png rename to bztitanium2/graphics/icons/stacked/titanium-ore-stacked.png diff --git a/graphics/icons/stacked/titanium-plate-stacked.png b/bztitanium2/graphics/icons/stacked/titanium-plate-stacked.png similarity index 100% rename from graphics/icons/stacked/titanium-plate-stacked.png rename to bztitanium2/graphics/icons/stacked/titanium-plate-stacked.png diff --git a/graphics/icons/titanium-ingot.png b/bztitanium2/graphics/icons/titanium-ingot.png similarity index 100% rename from graphics/icons/titanium-ingot.png rename to bztitanium2/graphics/icons/titanium-ingot.png diff --git a/graphics/icons/titanium-ore-2.png b/bztitanium2/graphics/icons/titanium-ore-2.png similarity index 100% rename from graphics/icons/titanium-ore-2.png rename to bztitanium2/graphics/icons/titanium-ore-2.png diff --git a/graphics/icons/titanium-ore-3.png b/bztitanium2/graphics/icons/titanium-ore-3.png similarity index 100% rename from graphics/icons/titanium-ore-3.png rename to bztitanium2/graphics/icons/titanium-ore-3.png diff --git a/graphics/icons/titanium-ore-4.png b/bztitanium2/graphics/icons/titanium-ore-4.png similarity index 100% rename from graphics/icons/titanium-ore-4.png rename to bztitanium2/graphics/icons/titanium-ore-4.png diff --git a/graphics/icons/titanium-ore.png b/bztitanium2/graphics/icons/titanium-ore.png similarity index 100% rename from graphics/icons/titanium-ore.png rename to bztitanium2/graphics/icons/titanium-ore.png diff --git a/graphics/icons/titanium-plate.png b/bztitanium2/graphics/icons/titanium-plate.png similarity index 100% rename from graphics/icons/titanium-plate.png rename to bztitanium2/graphics/icons/titanium-plate.png diff --git a/graphics/icons/titanium-powder.png b/bztitanium2/graphics/icons/titanium-powder.png similarity index 100% rename from graphics/icons/titanium-powder.png rename to bztitanium2/graphics/icons/titanium-powder.png diff --git a/graphics/technology/fluid-mining.png b/bztitanium2/graphics/technology/fluid-mining.png similarity index 100% rename from graphics/technology/fluid-mining.png rename to bztitanium2/graphics/technology/fluid-mining.png diff --git a/graphics/technology/titanium-processing.png b/bztitanium2/graphics/technology/titanium-processing.png similarity index 100% rename from graphics/technology/titanium-processing.png rename to bztitanium2/graphics/technology/titanium-processing.png diff --git a/info.json b/bztitanium2/info.json similarity index 100% rename from info.json rename to bztitanium2/info.json diff --git a/locale/de/titanium.cfg b/bztitanium2/locale/de/titanium.cfg similarity index 100% rename from locale/de/titanium.cfg rename to bztitanium2/locale/de/titanium.cfg diff --git a/locale/en/titanium.cfg b/bztitanium2/locale/en/titanium.cfg similarity index 100% rename from locale/en/titanium.cfg rename to bztitanium2/locale/en/titanium.cfg diff --git a/locale/ja/titanium.cfg b/bztitanium2/locale/ja/titanium.cfg similarity index 100% rename from locale/ja/titanium.cfg rename to bztitanium2/locale/ja/titanium.cfg diff --git a/locale/ko/titanium.cfg b/bztitanium2/locale/ko/titanium.cfg similarity index 100% rename from locale/ko/titanium.cfg rename to bztitanium2/locale/ko/titanium.cfg diff --git a/locale/pl/titanium.cfg b/bztitanium2/locale/pl/titanium.cfg similarity index 100% rename from locale/pl/titanium.cfg rename to bztitanium2/locale/pl/titanium.cfg diff --git a/locale/ru/titanium.cfg b/bztitanium2/locale/ru/titanium.cfg similarity index 100% rename from locale/ru/titanium.cfg rename to bztitanium2/locale/ru/titanium.cfg diff --git a/locale/zh-CN/titanium.cfg b/bztitanium2/locale/zh-CN/titanium.cfg similarity index 100% rename from locale/zh-CN/titanium.cfg rename to bztitanium2/locale/zh-CN/titanium.cfg diff --git a/map-gen-preset-updates.lua b/bztitanium2/map-gen-preset-updates.lua similarity index 100% rename from map-gen-preset-updates.lua rename to bztitanium2/map-gen-preset-updates.lua diff --git a/me.lua b/bztitanium2/me.lua similarity index 100% rename from me.lua rename to bztitanium2/me.lua diff --git a/omni.lua b/bztitanium2/omni.lua similarity index 100% rename from omni.lua rename to bztitanium2/omni.lua diff --git a/settings-util.lua b/bztitanium2/settings-util.lua similarity index 100% rename from settings-util.lua rename to bztitanium2/settings-util.lua diff --git a/settings.lua b/bztitanium2/settings.lua similarity index 100% rename from settings.lua rename to bztitanium2/settings.lua diff --git a/strange-matter.lua b/bztitanium2/strange-matter.lua similarity index 100% rename from strange-matter.lua rename to bztitanium2/strange-matter.lua diff --git a/thumbnail.png b/bztitanium2/thumbnail.png similarity index 100% rename from thumbnail.png rename to bztitanium2/thumbnail.png diff --git a/titanium-compressed.lua b/bztitanium2/titanium-compressed.lua similarity index 100% rename from titanium-compressed.lua rename to bztitanium2/titanium-compressed.lua diff --git a/titanium-data-settings.lua b/bztitanium2/titanium-data-settings.lua similarity index 100% rename from titanium-data-settings.lua rename to bztitanium2/titanium-data-settings.lua diff --git a/titanium-enriched.lua b/bztitanium2/titanium-enriched.lua similarity index 100% rename from titanium-enriched.lua rename to bztitanium2/titanium-enriched.lua diff --git a/titanium-matter.lua b/bztitanium2/titanium-matter.lua similarity index 100% rename from titanium-matter.lua rename to bztitanium2/titanium-matter.lua diff --git a/titanium-ore-particle.lua b/bztitanium2/titanium-ore-particle.lua similarity index 100% rename from titanium-ore-particle.lua rename to bztitanium2/titanium-ore-particle.lua diff --git a/titanium-ore.lua b/bztitanium2/titanium-ore.lua similarity index 100% rename from titanium-ore.lua rename to bztitanium2/titanium-ore.lua diff --git a/titanium-recipe-final-5d.lua b/bztitanium2/titanium-recipe-final-5d.lua similarity index 100% rename from titanium-recipe-final-5d.lua rename to bztitanium2/titanium-recipe-final-5d.lua diff --git a/titanium-recipe-final-k2.lua b/bztitanium2/titanium-recipe-final-k2.lua similarity index 100% rename from titanium-recipe-final-k2.lua rename to bztitanium2/titanium-recipe-final-k2.lua diff --git a/titanium-recipe-final-modmash.lua b/bztitanium2/titanium-recipe-final-modmash.lua similarity index 100% rename from titanium-recipe-final-modmash.lua rename to bztitanium2/titanium-recipe-final-modmash.lua diff --git a/titanium-recipe-final-rrr.lua b/bztitanium2/titanium-recipe-final-rrr.lua similarity index 100% rename from titanium-recipe-final-rrr.lua rename to bztitanium2/titanium-recipe-final-rrr.lua diff --git a/titanium-recipe-final-se.lua b/bztitanium2/titanium-recipe-final-se.lua similarity index 100% rename from titanium-recipe-final-se.lua rename to bztitanium2/titanium-recipe-final-se.lua diff --git a/titanium-recipe-final-stacking.lua b/bztitanium2/titanium-recipe-final-stacking.lua similarity index 100% rename from titanium-recipe-final-stacking.lua rename to bztitanium2/titanium-recipe-final-stacking.lua diff --git a/titanium-recipe-se.lua b/bztitanium2/titanium-recipe-se.lua similarity index 100% rename from titanium-recipe-se.lua rename to bztitanium2/titanium-recipe-se.lua diff --git a/titanium-recipe-updates-transport.lua b/bztitanium2/titanium-recipe-updates-transport.lua similarity index 100% rename from titanium-recipe-updates-transport.lua rename to bztitanium2/titanium-recipe-updates-transport.lua diff --git a/titanium-recipe-updates.lua b/bztitanium2/titanium-recipe-updates.lua similarity index 100% rename from titanium-recipe-updates.lua rename to bztitanium2/titanium-recipe-updates.lua diff --git a/titanium-recipe.lua b/bztitanium2/titanium-recipe.lua similarity index 100% rename from titanium-recipe.lua rename to bztitanium2/titanium-recipe.lua diff --git a/graphics/old-files/hr-titanium-ore.png b/graphics/old-files/hr-titanium-ore.png deleted file mode 100644 index 40d4bc7..0000000 Binary files a/graphics/old-files/hr-titanium-ore.png and /dev/null differ diff --git a/graphics/old-files/titanium-ore - Copy.png b/graphics/old-files/titanium-ore - Copy.png deleted file mode 100644 index 40d4bc7..0000000 Binary files a/graphics/old-files/titanium-ore - Copy.png and /dev/null differ diff --git a/graphics/old-files/titanium-ore-n.png b/graphics/old-files/titanium-ore-n.png deleted file mode 100644 index 5ea2221..0000000 Binary files a/graphics/old-files/titanium-ore-n.png and /dev/null differ diff --git a/graphics/old-files/titanium-plate-old.png b/graphics/old-files/titanium-plate-old.png deleted file mode 100644 index aba7eea..0000000 Binary files a/graphics/old-files/titanium-plate-old.png and /dev/null differ diff --git a/migrations/bztitanium.1.1.0.json b/migrations/bztitanium.1.1.0.json deleted file mode 100644 index 684ed29..0000000 --- a/migrations/bztitanium.1.1.0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "item": - [ - ["fi_materials_titan", "titanium-plate"] - ] -} - diff --git a/graphics/icons/molten-titanium.xcf b/sources/graphics/icons/molten-titanium.xcf similarity index 100% rename from graphics/icons/molten-titanium.xcf rename to sources/graphics/icons/molten-titanium.xcf diff --git a/graphics/icons/titanium-ingot.xcf b/sources/graphics/icons/titanium-ingot.xcf similarity index 100% rename from graphics/icons/titanium-ingot.xcf rename to sources/graphics/icons/titanium-ingot.xcf diff --git a/graphics/old-files/enriched-titanium-stacked.xcf b/sources/graphics/old-files/enriched-titanium-stacked.xcf similarity index 100% rename from graphics/old-files/enriched-titanium-stacked.xcf rename to sources/graphics/old-files/enriched-titanium-stacked.xcf diff --git a/graphics/old-files/enriched-titanium.xcf b/sources/graphics/old-files/enriched-titanium.xcf similarity index 100% rename from graphics/old-files/enriched-titanium.xcf rename to sources/graphics/old-files/enriched-titanium.xcf diff --git a/graphics/old-files/hr-titanium-ore.xcf b/sources/graphics/old-files/hr-titanium-ore.xcf similarity index 100% rename from graphics/old-files/hr-titanium-ore.xcf rename to sources/graphics/old-files/hr-titanium-ore.xcf diff --git a/graphics/old-files/titanium-ore (2).xcf b/sources/graphics/old-files/titanium-ore (2).xcf similarity index 100% rename from graphics/old-files/titanium-ore (2).xcf rename to sources/graphics/old-files/titanium-ore (2).xcf diff --git a/graphics/old-files/titanium-ore-stacked.xcf b/sources/graphics/old-files/titanium-ore-stacked.xcf similarity index 100% rename from graphics/old-files/titanium-ore-stacked.xcf rename to sources/graphics/old-files/titanium-ore-stacked.xcf diff --git a/graphics/old-files/titanium-ore.xcf b/sources/graphics/old-files/titanium-ore.xcf similarity index 100% rename from graphics/old-files/titanium-ore.xcf rename to sources/graphics/old-files/titanium-ore.xcf diff --git a/graphics/old-files/titanium-plate-3.xcf b/sources/graphics/old-files/titanium-plate-3.xcf similarity index 100% rename from graphics/old-files/titanium-plate-3.xcf rename to sources/graphics/old-files/titanium-plate-3.xcf diff --git a/graphics/old-files/titanium-plate-stacked.xcf b/sources/graphics/old-files/titanium-plate-stacked.xcf similarity index 100% rename from graphics/old-files/titanium-plate-stacked.xcf rename to sources/graphics/old-files/titanium-plate-stacked.xcf diff --git a/graphics/old-files/titanium-plate.xcf b/sources/graphics/old-files/titanium-plate.xcf similarity index 100% rename from graphics/old-files/titanium-plate.xcf rename to sources/graphics/old-files/titanium-plate.xcf diff --git a/graphics/old-files/titanium-powder.xcf b/sources/graphics/old-files/titanium-powder.xcf similarity index 100% rename from graphics/old-files/titanium-powder.xcf rename to sources/graphics/old-files/titanium-powder.xcf diff --git a/graphics/old-files/titanium-processing (2).xcf b/sources/graphics/old-files/titanium-processing (2).xcf similarity index 100% rename from graphics/old-files/titanium-processing (2).xcf rename to sources/graphics/old-files/titanium-processing (2).xcf diff --git a/graphics/old-files/titanium-processing.xcf b/sources/graphics/old-files/titanium-processing.xcf similarity index 100% rename from graphics/old-files/titanium-processing.xcf rename to sources/graphics/old-files/titanium-processing.xcf diff --git a/graphics/old-files/titanium-thumbnail.xcf b/sources/graphics/old-files/titanium-thumbnail.xcf similarity index 100% rename from graphics/old-files/titanium-thumbnail.xcf rename to sources/graphics/old-files/titanium-thumbnail.xcf