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/bzchlorine2/LICENSE.md similarity index 100% rename from LICENSE.md rename to bzchlorine2/LICENSE.md diff --git a/changelog.txt b/bzchlorine2/changelog.txt similarity index 100% rename from changelog.txt rename to bzchlorine2/changelog.txt diff --git a/compatibility/bob.lua b/bzchlorine2/compatibility/bob.lua similarity index 100% rename from compatibility/bob.lua rename to bzchlorine2/compatibility/bob.lua diff --git a/compatibility/crafting-efficiency.lua b/bzchlorine2/compatibility/crafting-efficiency.lua similarity index 100% rename from compatibility/crafting-efficiency.lua rename to bzchlorine2/compatibility/crafting-efficiency.lua diff --git a/control-util.lua b/bzchlorine2/control-util.lua similarity index 100% rename from control-util.lua rename to bzchlorine2/control-util.lua diff --git a/control.lua b/bzchlorine2/control.lua similarity index 100% rename from control.lua rename to bzchlorine2/control.lua diff --git a/data-final-fixes.lua b/bzchlorine2/data-final-fixes.lua similarity index 100% rename from data-final-fixes.lua rename to bzchlorine2/data-final-fixes.lua diff --git a/data-updates.lua b/bzchlorine2/data-updates.lua similarity index 100% rename from data-updates.lua rename to bzchlorine2/data-updates.lua diff --git a/data-util.lua b/bzchlorine2/data-util.lua similarity index 100% rename from data-util.lua rename to bzchlorine2/data-util.lua diff --git a/data.lua b/bzchlorine2/data.lua similarity index 100% rename from data.lua rename to bzchlorine2/data.lua diff --git a/graphics/entity/assembler/assembling-machine-2-pipe-E.png b/bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-E.png similarity index 100% rename from graphics/entity/assembler/assembling-machine-2-pipe-E.png rename to bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-E.png diff --git a/graphics/entity/assembler/assembling-machine-2-pipe-N.png b/bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-N.png similarity index 100% rename from graphics/entity/assembler/assembling-machine-2-pipe-N.png rename to bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-N.png diff --git a/graphics/entity/assembler/assembling-machine-2-pipe-S.png b/bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-S.png similarity index 100% rename from graphics/entity/assembler/assembling-machine-2-pipe-S.png rename to bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-S.png diff --git a/graphics/entity/assembler/assembling-machine-2-pipe-W.png b/bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-W.png similarity index 100% rename from graphics/entity/assembler/assembling-machine-2-pipe-W.png rename to bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-W.png diff --git a/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png b/bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png similarity index 100% rename from graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png rename to bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png diff --git a/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png b/bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png similarity index 100% rename from graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png rename to bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png diff --git a/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png b/bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png similarity index 100% rename from graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png rename to bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png diff --git a/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png b/bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png similarity index 100% rename from graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png rename to bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png diff --git a/graphics/entity/ores/hr-salt.png b/bzchlorine2/graphics/entity/ores/hr-salt.png similarity index 100% rename from graphics/entity/ores/hr-salt.png rename to bzchlorine2/graphics/entity/ores/hr-salt.png diff --git a/graphics/icons/chlorine.png b/bzchlorine2/graphics/icons/chlorine.png similarity index 100% rename from graphics/icons/chlorine.png rename to bzchlorine2/graphics/icons/chlorine.png diff --git a/graphics/icons/epoxy.png b/bzchlorine2/graphics/icons/epoxy.png similarity index 100% rename from graphics/icons/epoxy.png rename to bzchlorine2/graphics/icons/epoxy.png diff --git a/graphics/icons/ferric-chloride.png b/bzchlorine2/graphics/icons/ferric-chloride.png similarity index 100% rename from graphics/icons/ferric-chloride.png rename to bzchlorine2/graphics/icons/ferric-chloride.png diff --git a/graphics/icons/hcl.png b/bzchlorine2/graphics/icons/hcl.png similarity index 100% rename from graphics/icons/hcl.png rename to bzchlorine2/graphics/icons/hcl.png diff --git a/graphics/icons/pcb-substrate.png b/bzchlorine2/graphics/icons/pcb-substrate.png similarity index 100% rename from graphics/icons/pcb-substrate.png rename to bzchlorine2/graphics/icons/pcb-substrate.png diff --git a/graphics/icons/pcb.png b/bzchlorine2/graphics/icons/pcb.png similarity index 100% rename from graphics/icons/pcb.png rename to bzchlorine2/graphics/icons/pcb.png diff --git a/graphics/icons/salt-1.png b/bzchlorine2/graphics/icons/salt-1.png similarity index 100% rename from graphics/icons/salt-1.png rename to bzchlorine2/graphics/icons/salt-1.png diff --git a/graphics/icons/salt-2.png b/bzchlorine2/graphics/icons/salt-2.png similarity index 100% rename from graphics/icons/salt-2.png rename to bzchlorine2/graphics/icons/salt-2.png diff --git a/graphics/icons/salt-3.png b/bzchlorine2/graphics/icons/salt-3.png similarity index 100% rename from graphics/icons/salt-3.png rename to bzchlorine2/graphics/icons/salt-3.png diff --git a/graphics/icons/salt-4.png b/bzchlorine2/graphics/icons/salt-4.png similarity index 100% rename from graphics/icons/salt-4.png rename to bzchlorine2/graphics/icons/salt-4.png diff --git a/graphics/icons/salt.png b/bzchlorine2/graphics/icons/salt.png similarity index 100% rename from graphics/icons/salt.png rename to bzchlorine2/graphics/icons/salt.png diff --git a/graphics/icons/vinyl-chloride.png b/bzchlorine2/graphics/icons/vinyl-chloride.png similarity index 100% rename from graphics/icons/vinyl-chloride.png rename to bzchlorine2/graphics/icons/vinyl-chloride.png diff --git a/graphics/technology/salt-tech.png b/bzchlorine2/graphics/technology/salt-tech.png similarity index 100% rename from graphics/technology/salt-tech.png rename to bzchlorine2/graphics/technology/salt-tech.png diff --git a/info.json b/bzchlorine2/info.json similarity index 100% rename from info.json rename to bzchlorine2/info.json diff --git a/locale/en/salt.cfg b/bzchlorine2/locale/en/salt.cfg similarity index 100% rename from locale/en/salt.cfg rename to bzchlorine2/locale/en/salt.cfg diff --git a/locale/ja/salt.cfg b/bzchlorine2/locale/ja/salt.cfg similarity index 100% rename from locale/ja/salt.cfg rename to bzchlorine2/locale/ja/salt.cfg diff --git a/locale/ru/salt.cfg b/bzchlorine2/locale/ru/salt.cfg similarity index 100% rename from locale/ru/salt.cfg rename to bzchlorine2/locale/ru/salt.cfg diff --git a/locale/zh-CN/salt.cfg b/bzchlorine2/locale/zh-CN/salt.cfg similarity index 100% rename from locale/zh-CN/salt.cfg rename to bzchlorine2/locale/zh-CN/salt.cfg diff --git a/map-gen-preset-updates.lua b/bzchlorine2/map-gen-preset-updates.lua similarity index 100% rename from map-gen-preset-updates.lua rename to bzchlorine2/map-gen-preset-updates.lua diff --git a/matter.lua b/bzchlorine2/matter.lua similarity index 100% rename from matter.lua rename to bzchlorine2/matter.lua diff --git a/me.lua b/bzchlorine2/me.lua similarity index 100% rename from me.lua rename to bzchlorine2/me.lua diff --git a/modules.lua b/bzchlorine2/modules.lua similarity index 100% rename from modules.lua rename to bzchlorine2/modules.lua diff --git a/prototypes/assembler-updates.lua b/bzchlorine2/prototypes/assembler-updates.lua similarity index 100% rename from prototypes/assembler-updates.lua rename to bzchlorine2/prototypes/assembler-updates.lua diff --git a/prototypes/chlorine.lua b/bzchlorine2/prototypes/chlorine.lua similarity index 100% rename from prototypes/chlorine.lua rename to bzchlorine2/prototypes/chlorine.lua diff --git a/prototypes/epoxy.lua b/bzchlorine2/prototypes/epoxy.lua similarity index 100% rename from prototypes/epoxy.lua rename to bzchlorine2/prototypes/epoxy.lua diff --git a/prototypes/pcb.lua b/bzchlorine2/prototypes/pcb.lua similarity index 100% rename from prototypes/pcb.lua rename to bzchlorine2/prototypes/pcb.lua diff --git a/prototypes/salt.lua b/bzchlorine2/prototypes/salt.lua similarity index 100% rename from prototypes/salt.lua rename to bzchlorine2/prototypes/salt.lua diff --git a/recipe-updates.lua b/bzchlorine2/recipe-updates.lua similarity index 100% rename from recipe-updates.lua rename to bzchlorine2/recipe-updates.lua diff --git a/settings-util.lua b/bzchlorine2/settings-util.lua similarity index 100% rename from settings-util.lua rename to bzchlorine2/settings-util.lua diff --git a/settings.lua b/bzchlorine2/settings.lua similarity index 100% rename from settings.lua rename to bzchlorine2/settings.lua diff --git a/stacking.lua b/bzchlorine2/stacking.lua similarity index 100% rename from stacking.lua rename to bzchlorine2/stacking.lua diff --git a/thumbnail.png b/bzchlorine2/thumbnail.png similarity index 100% rename from thumbnail.png rename to bzchlorine2/thumbnail.png diff --git a/description.md b/description.md deleted file mode 100644 index 750f81f..0000000 --- a/description.md +++ /dev/null @@ -1,33 +0,0 @@ -"Saying nothing... sometimes says the most" - *Emily Dickinson* - ----- - -Adds salt, chlorine, and other compounds to the game. Changes advanced circuit production and several other things. - -This mod adds more complexity to a vanailla factorio game. It pairs well with any other BZ mods, including [the electronics modpack](https://mods.factorio.com/mod/bzbelectronics). With Graphite & Diamonds, carbon fiber is enabled as well. As always, the more BZ mods you add the more complex the game will become. - -Supported compatible mods: - -- Space Exploration & AAI -- Krastorio 2 -- Bob's electronics -- Deadlock stacking, crating - -Coming soon: RSO -Coming soon: 248k -Coming soon: FE+, 5Dim's, ModMash, etc. - -Many other mods are compatible but not yet fully supported. Suggestions always appreciated! - - ----- -Special thanks to - -- The community, for all the suggestions, feedback, and bug reports! -- [snouz](https://mods.factorio.com/user/snouz) (thumbnail style) - -Thanks for testing - -- Berkelear -- [Sakuro](https://mods.factorio.com/user/sakuro) -- [Xynariz](https://mods.factorio.com/user/Xynariz) diff --git a/graphics/entity/ores/salt.png b/graphics/entity/ores/salt.png deleted file mode 100644 index c8c25b9..0000000 Binary files a/graphics/entity/ores/salt.png and /dev/null differ diff --git a/graphics/entity/assembler/assembling-machine-2-pipe-E.xcf b/sources/graphics/entity/assembler/assembling-machine-2-pipe-E.xcf similarity index 100% rename from graphics/entity/assembler/assembling-machine-2-pipe-E.xcf rename to sources/graphics/entity/assembler/assembling-machine-2-pipe-E.xcf diff --git a/graphics/entity/assembler/assembling-machine-2-pipe-N.xcf b/sources/graphics/entity/assembler/assembling-machine-2-pipe-N.xcf similarity index 100% rename from graphics/entity/assembler/assembling-machine-2-pipe-N.xcf rename to sources/graphics/entity/assembler/assembling-machine-2-pipe-N.xcf diff --git a/graphics/entity/assembler/assembling-machine-2-pipe-S.xcf b/sources/graphics/entity/assembler/assembling-machine-2-pipe-S.xcf similarity index 100% rename from graphics/entity/assembler/assembling-machine-2-pipe-S.xcf rename to sources/graphics/entity/assembler/assembling-machine-2-pipe-S.xcf diff --git a/graphics/entity/assembler/assembling-machine-2-pipe-W.xcf b/sources/graphics/entity/assembler/assembling-machine-2-pipe-W.xcf similarity index 100% rename from graphics/entity/assembler/assembling-machine-2-pipe-W.xcf rename to sources/graphics/entity/assembler/assembling-machine-2-pipe-W.xcf diff --git a/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.xcf b/sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.xcf similarity index 100% rename from graphics/entity/assembler/hr-assembling-machine-2-pipe-E.xcf rename to sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.xcf diff --git a/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.xcf b/sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.xcf similarity index 100% rename from graphics/entity/assembler/hr-assembling-machine-2-pipe-N.xcf rename to sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.xcf diff --git a/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.xcf b/sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.xcf similarity index 100% rename from graphics/entity/assembler/hr-assembling-machine-2-pipe-S.xcf rename to sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.xcf diff --git a/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.xcf b/sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.xcf similarity index 100% rename from graphics/entity/assembler/hr-assembling-machine-2-pipe-W.xcf rename to sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.xcf diff --git a/graphics/entity/ores/hr-salt.xcf b/sources/graphics/entity/ores/hr-salt.xcf similarity index 100% rename from graphics/entity/ores/hr-salt.xcf rename to sources/graphics/entity/ores/hr-salt.xcf diff --git a/graphics/icons/chlorine.xcf b/sources/graphics/icons/chlorine.xcf similarity index 100% rename from graphics/icons/chlorine.xcf rename to sources/graphics/icons/chlorine.xcf diff --git a/graphics/icons/ferric-chloride.xcf b/sources/graphics/icons/ferric-chloride.xcf similarity index 100% rename from graphics/icons/ferric-chloride.xcf rename to sources/graphics/icons/ferric-chloride.xcf diff --git a/graphics/icons/hcl.xcf b/sources/graphics/icons/hcl.xcf similarity index 100% rename from graphics/icons/hcl.xcf rename to sources/graphics/icons/hcl.xcf diff --git a/graphics/icons/vinyl-chloride.xcf b/sources/graphics/icons/vinyl-chloride.xcf similarity index 100% rename from graphics/icons/vinyl-chloride.xcf rename to sources/graphics/icons/vinyl-chloride.xcf diff --git a/thumbnail.xcf b/sources/thumbnail.xcf similarity index 100% rename from thumbnail.xcf rename to sources/thumbnail.xcf