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 b/bzfoundry2/LICENSE similarity index 100% rename from LICENSE rename to bzfoundry2/LICENSE diff --git a/changelog.txt b/bzfoundry2/changelog.txt similarity index 100% rename from changelog.txt rename to bzfoundry2/changelog.txt diff --git a/control-util.lua b/bzfoundry2/control-util.lua similarity index 100% rename from control-util.lua rename to bzfoundry2/control-util.lua diff --git a/data-final-fixes.lua b/bzfoundry2/data-final-fixes.lua similarity index 100% rename from data-final-fixes.lua rename to bzfoundry2/data-final-fixes.lua diff --git a/data-updates.lua b/bzfoundry2/data-updates.lua similarity index 100% rename from data-updates.lua rename to bzfoundry2/data-updates.lua diff --git a/data-util.lua b/bzfoundry2/data-util.lua similarity index 100% rename from data-util.lua rename to bzfoundry2/data-util.lua diff --git a/data.lua b/bzfoundry2/data.lua similarity index 100% rename from data.lua rename to bzfoundry2/data.lua diff --git a/foundry-updates.lua b/bzfoundry2/foundry-updates.lua similarity index 100% rename from foundry-updates.lua rename to bzfoundry2/foundry-updates.lua diff --git a/graphics/entity/electric-foundry/foundry-lights-1.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-lights-1.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-lights-1.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-lights-1.png diff --git a/graphics/entity/electric-foundry/foundry-lights-2.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-lights-2.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-lights-2.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-lights-2.png diff --git a/graphics/entity/electric-foundry/foundry-lights.lua b/bzfoundry2/graphics/entity/electric-foundry/foundry-lights.lua similarity index 100% rename from graphics/entity/electric-foundry/foundry-lights.lua rename to bzfoundry2/graphics/entity/electric-foundry/foundry-lights.lua diff --git a/graphics/entity/electric-foundry/foundry-main-1.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-main-1.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-main-1.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-main-1.png diff --git a/graphics/entity/electric-foundry/foundry-main-2.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-main-2.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-main-2.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-main-2.png diff --git a/graphics/entity/electric-foundry/foundry-main.lua b/bzfoundry2/graphics/entity/electric-foundry/foundry-main.lua similarity index 100% rename from graphics/entity/electric-foundry/foundry-main.lua rename to bzfoundry2/graphics/entity/electric-foundry/foundry-main.lua diff --git a/graphics/entity/electric-foundry/foundry-reflection.lua b/bzfoundry2/graphics/entity/electric-foundry/foundry-reflection.lua similarity index 100% rename from graphics/entity/electric-foundry/foundry-reflection.lua rename to bzfoundry2/graphics/entity/electric-foundry/foundry-reflection.lua diff --git a/graphics/entity/electric-foundry/foundry-reflection.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-reflection.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-reflection.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-reflection.png diff --git a/graphics/entity/electric-foundry/foundry-remnants.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-remnants.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-remnants.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-remnants.png diff --git a/graphics/entity/electric-foundry/foundry-shadow-1.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-shadow-1.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-shadow-1.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-shadow-1.png diff --git a/graphics/entity/electric-foundry/foundry-shadow-2.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-shadow-2.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-shadow-2.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-shadow-2.png diff --git a/graphics/entity/electric-foundry/foundry-shadow.lua b/bzfoundry2/graphics/entity/electric-foundry/foundry-shadow.lua similarity index 100% rename from graphics/entity/electric-foundry/foundry-shadow.lua rename to bzfoundry2/graphics/entity/electric-foundry/foundry-shadow.lua diff --git a/graphics/entity/electric-foundry/foundry-status-lamp.lua b/bzfoundry2/graphics/entity/electric-foundry/foundry-status-lamp.lua similarity index 100% rename from graphics/entity/electric-foundry/foundry-status-lamp.lua rename to bzfoundry2/graphics/entity/electric-foundry/foundry-status-lamp.lua diff --git a/graphics/entity/electric-foundry/foundry-status-lamp.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-status-lamp.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-status-lamp.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-status-lamp.png diff --git a/graphics/entity/electric-foundry/foundry-working-1.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-working-1.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-working-1.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-working-1.png diff --git a/graphics/entity/electric-foundry/foundry-working-2.png b/bzfoundry2/graphics/entity/electric-foundry/foundry-working-2.png similarity index 100% rename from graphics/entity/electric-foundry/foundry-working-2.png rename to bzfoundry2/graphics/entity/electric-foundry/foundry-working-2.png diff --git a/graphics/entity/electric-foundry/foundry-working.lua b/bzfoundry2/graphics/entity/electric-foundry/foundry-working.lua similarity index 100% rename from graphics/entity/electric-foundry/foundry-working.lua rename to bzfoundry2/graphics/entity/electric-foundry/foundry-working.lua diff --git a/graphics/entity/foundry/foundry-main-1.png b/bzfoundry2/graphics/entity/foundry/foundry-main-1.png similarity index 100% rename from graphics/entity/foundry/foundry-main-1.png rename to bzfoundry2/graphics/entity/foundry/foundry-main-1.png diff --git a/graphics/entity/foundry/foundry-main-2.png b/bzfoundry2/graphics/entity/foundry/foundry-main-2.png similarity index 100% rename from graphics/entity/foundry/foundry-main-2.png rename to bzfoundry2/graphics/entity/foundry/foundry-main-2.png diff --git a/graphics/entity/foundry/foundry-remnants.png b/bzfoundry2/graphics/entity/foundry/foundry-remnants.png similarity index 100% rename from graphics/entity/foundry/foundry-remnants.png rename to bzfoundry2/graphics/entity/foundry/foundry-remnants.png diff --git a/graphics/icons/coke-1.png b/bzfoundry2/graphics/icons/coke-1.png similarity index 100% rename from graphics/icons/coke-1.png rename to bzfoundry2/graphics/icons/coke-1.png diff --git a/graphics/icons/coke-2.png b/bzfoundry2/graphics/icons/coke-2.png similarity index 100% rename from graphics/icons/coke-2.png rename to bzfoundry2/graphics/icons/coke-2.png diff --git a/graphics/icons/coke-3.png b/bzfoundry2/graphics/icons/coke-3.png similarity index 100% rename from graphics/icons/coke-3.png rename to bzfoundry2/graphics/icons/coke-3.png diff --git a/graphics/icons/coke-icon.png b/bzfoundry2/graphics/icons/coke-icon.png similarity index 100% rename from graphics/icons/coke-icon.png rename to bzfoundry2/graphics/icons/coke-icon.png diff --git a/graphics/icons/coke-stacked.png b/bzfoundry2/graphics/icons/coke-stacked.png similarity index 100% rename from graphics/icons/coke-stacked.png rename to bzfoundry2/graphics/icons/coke-stacked.png diff --git a/graphics/icons/coke.png b/bzfoundry2/graphics/icons/coke.png similarity index 100% rename from graphics/icons/coke.png rename to bzfoundry2/graphics/icons/coke.png diff --git a/graphics/icons/electric-foundry.png b/bzfoundry2/graphics/icons/electric-foundry.png similarity index 100% rename from graphics/icons/electric-foundry.png rename to bzfoundry2/graphics/icons/electric-foundry.png diff --git a/graphics/icons/foundry.afphoto b/bzfoundry2/graphics/icons/foundry.afphoto similarity index 100% rename from graphics/icons/foundry.afphoto rename to bzfoundry2/graphics/icons/foundry.afphoto diff --git a/graphics/icons/foundry.png b/bzfoundry2/graphics/icons/foundry.png similarity index 100% rename from graphics/icons/foundry.png rename to bzfoundry2/graphics/icons/foundry.png diff --git a/graphics/icons/technology/electric-foundry.png b/bzfoundry2/graphics/icons/technology/electric-foundry.png similarity index 100% rename from graphics/icons/technology/electric-foundry.png rename to bzfoundry2/graphics/icons/technology/electric-foundry.png diff --git a/graphics/icons/technology/foundry.png b/bzfoundry2/graphics/icons/technology/foundry.png similarity index 100% rename from graphics/icons/technology/foundry.png rename to bzfoundry2/graphics/icons/technology/foundry.png diff --git a/info.json b/bzfoundry2/info.json similarity index 100% rename from info.json rename to bzfoundry2/info.json diff --git a/locale/cs/foundry.cfg b/bzfoundry2/locale/cs/foundry.cfg similarity index 100% rename from locale/cs/foundry.cfg rename to bzfoundry2/locale/cs/foundry.cfg diff --git a/locale/en/foundry.cfg b/bzfoundry2/locale/en/foundry.cfg similarity index 100% rename from locale/en/foundry.cfg rename to bzfoundry2/locale/en/foundry.cfg diff --git a/locale/ja/foundry.cfg b/bzfoundry2/locale/ja/foundry.cfg similarity index 100% rename from locale/ja/foundry.cfg rename to bzfoundry2/locale/ja/foundry.cfg diff --git a/locale/ko/foundry.cfg b/bzfoundry2/locale/ko/foundry.cfg similarity index 100% rename from locale/ko/foundry.cfg rename to bzfoundry2/locale/ko/foundry.cfg diff --git a/locale/ru/foundry.cfg b/bzfoundry2/locale/ru/foundry.cfg similarity index 100% rename from locale/ru/foundry.cfg rename to bzfoundry2/locale/ru/foundry.cfg diff --git a/locale/zh-CN/bzfoundry.cfg b/bzfoundry2/locale/zh-CN/bzfoundry.cfg similarity index 100% rename from locale/zh-CN/bzfoundry.cfg rename to bzfoundry2/locale/zh-CN/bzfoundry.cfg diff --git a/me.lua b/bzfoundry2/me.lua similarity index 100% rename from me.lua rename to bzfoundry2/me.lua diff --git a/prototypes/categories.lua b/bzfoundry2/prototypes/categories.lua similarity index 100% rename from prototypes/categories.lua rename to bzfoundry2/prototypes/categories.lua diff --git a/prototypes/coke.lua b/bzfoundry2/prototypes/coke.lua similarity index 100% rename from prototypes/coke.lua rename to bzfoundry2/prototypes/coke.lua diff --git a/prototypes/entity/electric-foundry.lua b/bzfoundry2/prototypes/entity/electric-foundry.lua similarity index 100% rename from prototypes/entity/electric-foundry.lua rename to bzfoundry2/prototypes/entity/electric-foundry.lua diff --git a/prototypes/entity/foundry-pictures.lua b/bzfoundry2/prototypes/entity/foundry-pictures.lua similarity index 100% rename from prototypes/entity/foundry-pictures.lua rename to bzfoundry2/prototypes/entity/foundry-pictures.lua diff --git a/prototypes/entity/foundry.lua b/bzfoundry2/prototypes/entity/foundry.lua similarity index 100% rename from prototypes/entity/foundry.lua rename to bzfoundry2/prototypes/entity/foundry.lua diff --git a/prototypes/foundry.lua b/bzfoundry2/prototypes/foundry.lua similarity index 100% rename from prototypes/foundry.lua rename to bzfoundry2/prototypes/foundry.lua diff --git a/refractory-updates.lua b/bzfoundry2/refractory-updates.lua similarity index 100% rename from refractory-updates.lua rename to bzfoundry2/refractory-updates.lua diff --git a/settings-util.lua b/bzfoundry2/settings-util.lua similarity index 100% rename from settings-util.lua rename to bzfoundry2/settings-util.lua diff --git a/settings.lua b/bzfoundry2/settings.lua similarity index 100% rename from settings.lua rename to bzfoundry2/settings.lua diff --git a/sound/entity/foundry/foundry-blade.ogg b/bzfoundry2/sound/entity/foundry/foundry-blade.ogg similarity index 100% rename from sound/entity/foundry/foundry-blade.ogg rename to bzfoundry2/sound/entity/foundry/foundry-blade.ogg diff --git a/sound/entity/foundry/foundry-clamp.ogg b/bzfoundry2/sound/entity/foundry/foundry-clamp.ogg similarity index 100% rename from sound/entity/foundry/foundry-clamp.ogg rename to bzfoundry2/sound/entity/foundry/foundry-clamp.ogg diff --git a/sound/entity/foundry/foundry-fire-whoosh-1.ogg b/bzfoundry2/sound/entity/foundry/foundry-fire-whoosh-1.ogg similarity index 100% rename from sound/entity/foundry/foundry-fire-whoosh-1.ogg rename to bzfoundry2/sound/entity/foundry/foundry-fire-whoosh-1.ogg diff --git a/sound/entity/foundry/foundry-fire-whoosh-2.ogg b/bzfoundry2/sound/entity/foundry/foundry-fire-whoosh-2.ogg similarity index 100% rename from sound/entity/foundry/foundry-fire-whoosh-2.ogg rename to bzfoundry2/sound/entity/foundry/foundry-fire-whoosh-2.ogg diff --git a/sound/entity/foundry/foundry-fire-whoosh-3.ogg b/bzfoundry2/sound/entity/foundry/foundry-fire-whoosh-3.ogg similarity index 100% rename from sound/entity/foundry/foundry-fire-whoosh-3.ogg rename to bzfoundry2/sound/entity/foundry/foundry-fire-whoosh-3.ogg diff --git a/sound/entity/foundry/foundry-metal-clunk.ogg b/bzfoundry2/sound/entity/foundry/foundry-metal-clunk.ogg similarity index 100% rename from sound/entity/foundry/foundry-metal-clunk.ogg rename to bzfoundry2/sound/entity/foundry/foundry-metal-clunk.ogg diff --git a/sound/entity/foundry/foundry-metal-scrape.ogg b/bzfoundry2/sound/entity/foundry/foundry-metal-scrape.ogg similarity index 100% rename from sound/entity/foundry/foundry-metal-scrape.ogg rename to bzfoundry2/sound/entity/foundry/foundry-metal-scrape.ogg diff --git a/sound/entity/foundry/foundry-pipe-in.ogg b/bzfoundry2/sound/entity/foundry/foundry-pipe-in.ogg similarity index 100% rename from sound/entity/foundry/foundry-pipe-in.ogg rename to bzfoundry2/sound/entity/foundry/foundry-pipe-in.ogg diff --git a/sound/entity/foundry/foundry-pipe-out.ogg b/bzfoundry2/sound/entity/foundry/foundry-pipe-out.ogg similarity index 100% rename from sound/entity/foundry/foundry-pipe-out.ogg rename to bzfoundry2/sound/entity/foundry/foundry-pipe-out.ogg diff --git a/sound/entity/foundry/foundry-pour-1.ogg b/bzfoundry2/sound/entity/foundry/foundry-pour-1.ogg similarity index 100% rename from sound/entity/foundry/foundry-pour-1.ogg rename to bzfoundry2/sound/entity/foundry/foundry-pour-1.ogg diff --git a/sound/entity/foundry/foundry-pour-2.ogg b/bzfoundry2/sound/entity/foundry/foundry-pour-2.ogg similarity index 100% rename from sound/entity/foundry/foundry-pour-2.ogg rename to bzfoundry2/sound/entity/foundry/foundry-pour-2.ogg diff --git a/sound/entity/foundry/foundry-rocks.ogg b/bzfoundry2/sound/entity/foundry/foundry-rocks.ogg similarity index 100% rename from sound/entity/foundry/foundry-rocks.ogg rename to bzfoundry2/sound/entity/foundry/foundry-rocks.ogg diff --git a/sound/entity/foundry/foundry-slide-close.ogg b/bzfoundry2/sound/entity/foundry/foundry-slide-close.ogg similarity index 100% rename from sound/entity/foundry/foundry-slide-close.ogg rename to bzfoundry2/sound/entity/foundry/foundry-slide-close.ogg diff --git a/sound/entity/foundry/foundry-slide-open.ogg b/bzfoundry2/sound/entity/foundry/foundry-slide-open.ogg similarity index 100% rename from sound/entity/foundry/foundry-slide-open.ogg rename to bzfoundry2/sound/entity/foundry/foundry-slide-open.ogg diff --git a/sound/entity/foundry/foundry-slide-stop.ogg b/bzfoundry2/sound/entity/foundry/foundry-slide-stop.ogg similarity index 100% rename from sound/entity/foundry/foundry-slide-stop.ogg rename to bzfoundry2/sound/entity/foundry/foundry-slide-stop.ogg diff --git a/sound/entity/foundry/foundry-smoke-puff.ogg b/bzfoundry2/sound/entity/foundry/foundry-smoke-puff.ogg similarity index 100% rename from sound/entity/foundry/foundry-smoke-puff.ogg rename to bzfoundry2/sound/entity/foundry/foundry-smoke-puff.ogg diff --git a/sound/entity/foundry/foundry.ogg b/bzfoundry2/sound/entity/foundry/foundry.ogg similarity index 100% rename from sound/entity/foundry/foundry.ogg rename to bzfoundry2/sound/entity/foundry/foundry.ogg diff --git a/thumbnail.png b/bzfoundry2/thumbnail.png similarity index 100% rename from thumbnail.png rename to bzfoundry2/thumbnail.png diff --git a/thumbnail.xcf b/bzfoundry2/thumbnail.xcf similarity index 100% rename from thumbnail.xcf rename to bzfoundry2/thumbnail.xcf diff --git a/graphics/entity/foundry/foundry-main-1.afphoto b/sources/graphics/entity/foundry/foundry-main-1.afphoto similarity index 100% rename from graphics/entity/foundry/foundry-main-1.afphoto rename to sources/graphics/entity/foundry/foundry-main-1.afphoto diff --git a/graphics/entity/foundry/foundry-main-2.afphoto b/sources/graphics/entity/foundry/foundry-main-2.afphoto similarity index 100% rename from graphics/entity/foundry/foundry-main-2.afphoto rename to sources/graphics/entity/foundry/foundry-main-2.afphoto diff --git a/graphics/entity/foundry/foundry-remnants.afphoto b/sources/graphics/entity/foundry/foundry-remnants.afphoto similarity index 100% rename from graphics/entity/foundry/foundry-remnants.afphoto rename to sources/graphics/entity/foundry/foundry-remnants.afphoto diff --git a/graphics/icons/coke-1.xcf b/sources/graphics/icons/coke-1.xcf similarity index 100% rename from graphics/icons/coke-1.xcf rename to sources/graphics/icons/coke-1.xcf diff --git a/graphics/icons/coke-2.xcf b/sources/graphics/icons/coke-2.xcf similarity index 100% rename from graphics/icons/coke-2.xcf rename to sources/graphics/icons/coke-2.xcf diff --git a/graphics/icons/coke-3.xcf b/sources/graphics/icons/coke-3.xcf similarity index 100% rename from graphics/icons/coke-3.xcf rename to sources/graphics/icons/coke-3.xcf diff --git a/graphics/icons/coke-icon.xcf b/sources/graphics/icons/coke-icon.xcf similarity index 100% rename from graphics/icons/coke-icon.xcf rename to sources/graphics/icons/coke-icon.xcf diff --git a/graphics/icons/coke.xcf b/sources/graphics/icons/coke.xcf similarity index 100% rename from graphics/icons/coke.xcf rename to sources/graphics/icons/coke.xcf diff --git a/sources/graphics/icons/foundry.afphoto b/sources/graphics/icons/foundry.afphoto new file mode 100644 index 0000000..a42754a Binary files /dev/null and b/sources/graphics/icons/foundry.afphoto differ diff --git a/graphics/icons/technology/foundry.afphoto b/sources/graphics/icons/technology/foundry.afphoto similarity index 100% rename from graphics/icons/technology/foundry.afphoto rename to sources/graphics/icons/technology/foundry.afphoto