From 88a2da7b401bea7b9ecdd4fa51c580085d0b108f Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 19 Oct 2025 16:35:09 +0200 Subject: [PATCH] Restructure repository --- .editorconfig | 3 ++ Makefile | 41 ------------------ LICENSE.md => bzcarbon2/LICENSE.md | 0 .../carbon-fiber-recipe-updates.lua | 0 .../carbon-matter.lua | 0 .../carbon-recipe-final-k2.lua | 0 .../carbon-recipe-final-rrr.lua | 0 .../carbon-recipe-final-se.lua | 0 .../carbon-recipe-final-stacking.lua | 0 .../carbon-recipe-k2.lua | 0 .../carbon-recipe-se.lua | 0 .../carbon-recipe-updates.lua | 0 .../carbon-recipe.lua | 0 carbon-util.lua => bzcarbon2/carbon-util.lua | 0 changelog.txt => bzcarbon2/changelog.txt | 0 .../compatibility}/248k.lua | 0 .../compatibility}/any-planet-start.lua | 0 .../compatibility}/orewashing.lua | 0 .../compatibility}/vtkdeepcoremining.lua | 0 .../control-util.lua | 0 control.lua => bzcarbon2/control.lua | 0 .../data-final-fixes.lua | 0 .../data-updates.lua | 0 data-util.lua => bzcarbon2/data-util.lua | 0 data.lua => bzcarbon2/data.lua | 0 .../graphics}/entity/ores/hr-diamond.png | Bin .../graphics}/entity/ores/hr-graphite.png | Bin .../particle/hr-graphite-particle-1.png | Bin .../particle/hr-graphite-particle-2.png | Bin .../particle/hr-graphite-particle-3.png | Bin .../particle/hr-graphite-particle-4.png | Bin .../hr-graphite-particle-shadow-1.png | Bin .../hr-graphite-particle-shadow-2.png | Bin .../hr-graphite-particle-shadow-3.png | Bin .../hr-graphite-particle-shadow-4.png | Bin .../graphics}/icons/Fullerene.png | Bin .../graphics}/icons/activated-carbon.png | Bin .../graphics}/icons/carbon-black.png | Bin .../graphics}/icons/carbon-fiber.png | Bin .../graphics}/icons/crucible.png | Bin .../graphics}/icons/diamond.png | Bin .../graphics}/icons/flake-graphite-1.png | Bin .../graphics}/icons/flake-graphite-2.png | Bin .../graphics}/icons/flake-graphite-3.png | Bin .../graphics}/icons/flake-graphite-4.png | Bin .../graphics}/icons/flake-graphite.png | Bin .../graphics}/icons/graphene.png | Bin .../graphics}/icons/graphite-1.png | Bin .../graphics}/icons/graphite-2.png | Bin .../graphics}/icons/graphite.png | Bin .../graphics}/icons/nanotube.png | Bin .../graphics}/icons/pan.png | Bin .../graphics}/icons/rough-diamond-1.png | Bin .../graphics}/icons/rough-diamond-2.png | Bin .../graphics}/icons/rough-diamond-3.png | Bin .../graphics}/icons/rough-diamond-4.png | Bin .../graphics}/icons/rough-diamond.png | Bin .../icons/stacked/carbon-black-stacked.png | Bin .../icons/stacked/crucible-stacked.png | Bin .../icons/stacked/diamond-stacked.png | Bin .../icons/stacked/flake-graphite-stacked.png | Bin .../icons/stacked/fullerene-stacked.png | Bin .../icons/stacked/graphene-stacked.png | Bin .../icons/stacked/graphite-stacked.png | Bin .../icons/stacked/nanotube-stacked.png | Bin .../icons/stacked/rough-diamond-stacked.png | Bin .../graphics}/technology/carbon-fiber.png | Bin .../technology/diamond-processing.png | Bin .../graphics}/technology/fluid-mining.png | Bin .../technology/graphite-processing.png | Bin info.json => bzcarbon2/info.json | 0 {locale => bzcarbon2/locale}/de/carbon.cfg | 0 {locale => bzcarbon2/locale}/en/carbon.cfg | 0 {locale => bzcarbon2/locale}/ja/carbon.cfg | 0 {locale => bzcarbon2/locale}/ko/carbon.cfg | 0 {locale => bzcarbon2/locale}/pl/carbon.cfg | 0 {locale => bzcarbon2/locale}/ru/carbon.cfg | 0 .../locale}/zh-CN/bzcarbon.cfg | 0 .../map-gen-preset-updates.lua | 0 me.lua => bzcarbon2/me.lua | 0 .../migrations}/bzcarbon.0.4.7.json | 0 .../nanotubes-final.lua | 0 .../prototypes}/activated-carbon.lua | 0 .../prototypes}/basic-crusher.lua | 0 .../prototypes}/carbon-asteroid-updates.lua | 0 .../prototypes}/carbon-fiber.lua | 0 .../prototypes}/diamond-particle.lua | 0 .../prototypes}/diamond.lua | 0 .../prototypes}/graphite-particle.lua | 0 .../prototypes}/graphite.lua | 0 .../settings-util.lua | 0 settings.lua => bzcarbon2/settings.lua | 0 .../strange-matter.lua | 0 .../tech-triggers.lua | 0 thumbnail.png => bzcarbon2/thumbnail.png | Bin .../entity/particle/graphite-particle-1.png | Bin 370 -> 0 bytes .../entity/particle/graphite-particle-2.png | Bin 342 -> 0 bytes .../entity/particle/graphite-particle-3.png | Bin 310 -> 0 bytes .../entity/particle/graphite-particle-4.png | Bin 299 -> 0 bytes .../particle/graphite-particle-shadow-1.png | Bin 148 -> 0 bytes .../particle/graphite-particle-shadow-2.png | Bin 127 -> 0 bytes .../particle/graphite-particle-shadow-3.png | Bin 125 -> 0 bytes .../particle/graphite-particle-shadow-4.png | Bin 122 -> 0 bytes .../graphics}/entity/ores/hr-diamond.xcf | Bin .../graphics}/entity/ores/hr-graphite.xcf | Bin .../graphics}/icons/Fullerene.xcf | Bin .../graphics}/icons/carbon-black.xcf | Bin .../graphics}/icons/carbon-fiber.xcf | Bin .../graphics}/icons/crucible.xcf | Bin .../graphics}/icons/diamond.xcf | Bin .../graphics}/icons/graphene.xcf | Bin .../graphics}/icons/graphite-1.xcf | Bin .../graphics}/icons/graphite-2.xcf | Bin .../graphics}/icons/graphite.xcf | Bin .../graphics}/icons/nanotube.xcf | Bin .../icons/stacked/carbon-black-stacked.xcf | Bin .../icons/stacked/crucible-stacked.xcf | Bin .../icons/stacked/diamond-stacked.xcf | Bin .../icons/stacked/flake-graphite-stacked.xcf | Bin .../icons/stacked/fullerene-stacked.xcf | Bin .../icons/stacked/graphene-stacked.xcf | Bin .../icons/stacked/graphite-stacked.xcf | Bin .../icons/stacked/nanotube-stacked.xcf | Bin .../icons/stacked/rough-diamond-stacked.xcf | Bin thumbnail.xcf => sources/thumbnail.xcf | Bin 125 files changed, 3 insertions(+), 41 deletions(-) create mode 100644 .editorconfig delete mode 100644 Makefile rename LICENSE.md => bzcarbon2/LICENSE.md (100%) rename carbon-fiber-recipe-updates.lua => bzcarbon2/carbon-fiber-recipe-updates.lua (100%) rename carbon-matter.lua => bzcarbon2/carbon-matter.lua (100%) rename carbon-recipe-final-k2.lua => bzcarbon2/carbon-recipe-final-k2.lua (100%) rename carbon-recipe-final-rrr.lua => bzcarbon2/carbon-recipe-final-rrr.lua (100%) rename carbon-recipe-final-se.lua => bzcarbon2/carbon-recipe-final-se.lua (100%) rename carbon-recipe-final-stacking.lua => bzcarbon2/carbon-recipe-final-stacking.lua (100%) rename carbon-recipe-k2.lua => bzcarbon2/carbon-recipe-k2.lua (100%) rename carbon-recipe-se.lua => bzcarbon2/carbon-recipe-se.lua (100%) rename carbon-recipe-updates.lua => bzcarbon2/carbon-recipe-updates.lua (100%) rename carbon-recipe.lua => bzcarbon2/carbon-recipe.lua (100%) rename carbon-util.lua => bzcarbon2/carbon-util.lua (100%) rename changelog.txt => bzcarbon2/changelog.txt (100%) rename {compatibility => bzcarbon2/compatibility}/248k.lua (100%) rename {compatibility => bzcarbon2/compatibility}/any-planet-start.lua (100%) rename {compatibility => bzcarbon2/compatibility}/orewashing.lua (100%) rename {compatibility => bzcarbon2/compatibility}/vtkdeepcoremining.lua (100%) rename control-util.lua => bzcarbon2/control-util.lua (100%) rename control.lua => bzcarbon2/control.lua (100%) rename data-final-fixes.lua => bzcarbon2/data-final-fixes.lua (100%) rename data-updates.lua => bzcarbon2/data-updates.lua (100%) rename data-util.lua => bzcarbon2/data-util.lua (100%) rename data.lua => bzcarbon2/data.lua (100%) rename {graphics => bzcarbon2/graphics}/entity/ores/hr-diamond.png (100%) rename {graphics => bzcarbon2/graphics}/entity/ores/hr-graphite.png (100%) rename {graphics => bzcarbon2/graphics}/entity/particle/hr-graphite-particle-1.png (100%) rename {graphics => bzcarbon2/graphics}/entity/particle/hr-graphite-particle-2.png (100%) rename {graphics => bzcarbon2/graphics}/entity/particle/hr-graphite-particle-3.png (100%) rename {graphics => bzcarbon2/graphics}/entity/particle/hr-graphite-particle-4.png (100%) rename {graphics => bzcarbon2/graphics}/entity/particle/hr-graphite-particle-shadow-1.png (100%) rename {graphics => bzcarbon2/graphics}/entity/particle/hr-graphite-particle-shadow-2.png (100%) rename {graphics => bzcarbon2/graphics}/entity/particle/hr-graphite-particle-shadow-3.png (100%) rename {graphics => bzcarbon2/graphics}/entity/particle/hr-graphite-particle-shadow-4.png (100%) rename {graphics => bzcarbon2/graphics}/icons/Fullerene.png (100%) rename {graphics => bzcarbon2/graphics}/icons/activated-carbon.png (100%) rename {graphics => bzcarbon2/graphics}/icons/carbon-black.png (100%) rename {graphics => bzcarbon2/graphics}/icons/carbon-fiber.png (100%) rename {graphics => bzcarbon2/graphics}/icons/crucible.png (100%) rename {graphics => bzcarbon2/graphics}/icons/diamond.png (100%) rename {graphics => bzcarbon2/graphics}/icons/flake-graphite-1.png (100%) rename {graphics => bzcarbon2/graphics}/icons/flake-graphite-2.png (100%) rename {graphics => bzcarbon2/graphics}/icons/flake-graphite-3.png (100%) rename {graphics => bzcarbon2/graphics}/icons/flake-graphite-4.png (100%) rename {graphics => bzcarbon2/graphics}/icons/flake-graphite.png (100%) rename {graphics => bzcarbon2/graphics}/icons/graphene.png (100%) rename {graphics => bzcarbon2/graphics}/icons/graphite-1.png (100%) rename {graphics => bzcarbon2/graphics}/icons/graphite-2.png (100%) rename {graphics => bzcarbon2/graphics}/icons/graphite.png (100%) rename {graphics => bzcarbon2/graphics}/icons/nanotube.png (100%) rename {graphics => bzcarbon2/graphics}/icons/pan.png (100%) rename {graphics => bzcarbon2/graphics}/icons/rough-diamond-1.png (100%) rename {graphics => bzcarbon2/graphics}/icons/rough-diamond-2.png (100%) rename {graphics => bzcarbon2/graphics}/icons/rough-diamond-3.png (100%) rename {graphics => bzcarbon2/graphics}/icons/rough-diamond-4.png (100%) rename {graphics => bzcarbon2/graphics}/icons/rough-diamond.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/carbon-black-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/crucible-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/diamond-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/flake-graphite-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/fullerene-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/graphene-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/graphite-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/nanotube-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/icons/stacked/rough-diamond-stacked.png (100%) rename {graphics => bzcarbon2/graphics}/technology/carbon-fiber.png (100%) rename {graphics => bzcarbon2/graphics}/technology/diamond-processing.png (100%) rename {graphics => bzcarbon2/graphics}/technology/fluid-mining.png (100%) rename {graphics => bzcarbon2/graphics}/technology/graphite-processing.png (100%) rename info.json => bzcarbon2/info.json (100%) rename {locale => bzcarbon2/locale}/de/carbon.cfg (100%) rename {locale => bzcarbon2/locale}/en/carbon.cfg (100%) rename {locale => bzcarbon2/locale}/ja/carbon.cfg (100%) rename {locale => bzcarbon2/locale}/ko/carbon.cfg (100%) rename {locale => bzcarbon2/locale}/pl/carbon.cfg (100%) rename {locale => bzcarbon2/locale}/ru/carbon.cfg (100%) rename {locale => bzcarbon2/locale}/zh-CN/bzcarbon.cfg (100%) rename map-gen-preset-updates.lua => bzcarbon2/map-gen-preset-updates.lua (100%) rename me.lua => bzcarbon2/me.lua (100%) rename {migrations => bzcarbon2/migrations}/bzcarbon.0.4.7.json (100%) rename nanotubes-final.lua => bzcarbon2/nanotubes-final.lua (100%) rename {prototypes => bzcarbon2/prototypes}/activated-carbon.lua (100%) rename {prototypes => bzcarbon2/prototypes}/basic-crusher.lua (100%) rename {prototypes => bzcarbon2/prototypes}/carbon-asteroid-updates.lua (100%) rename {prototypes => bzcarbon2/prototypes}/carbon-fiber.lua (100%) rename {prototypes => bzcarbon2/prototypes}/diamond-particle.lua (100%) rename {prototypes => bzcarbon2/prototypes}/diamond.lua (100%) rename {prototypes => bzcarbon2/prototypes}/graphite-particle.lua (100%) rename {prototypes => bzcarbon2/prototypes}/graphite.lua (100%) rename settings-util.lua => bzcarbon2/settings-util.lua (100%) rename settings.lua => bzcarbon2/settings.lua (100%) rename strange-matter.lua => bzcarbon2/strange-matter.lua (100%) rename tech-triggers.lua => bzcarbon2/tech-triggers.lua (100%) rename thumbnail.png => bzcarbon2/thumbnail.png (100%) delete mode 100644 graphics/entity/particle/graphite-particle-1.png delete mode 100644 graphics/entity/particle/graphite-particle-2.png delete mode 100644 graphics/entity/particle/graphite-particle-3.png delete mode 100644 graphics/entity/particle/graphite-particle-4.png delete mode 100644 graphics/entity/particle/graphite-particle-shadow-1.png delete mode 100644 graphics/entity/particle/graphite-particle-shadow-2.png delete mode 100644 graphics/entity/particle/graphite-particle-shadow-3.png delete mode 100644 graphics/entity/particle/graphite-particle-shadow-4.png rename {graphics => sources/graphics}/entity/ores/hr-diamond.xcf (100%) rename {graphics => sources/graphics}/entity/ores/hr-graphite.xcf (100%) rename {graphics => sources/graphics}/icons/Fullerene.xcf (100%) rename {graphics => sources/graphics}/icons/carbon-black.xcf (100%) rename {graphics => sources/graphics}/icons/carbon-fiber.xcf (100%) rename {graphics => sources/graphics}/icons/crucible.xcf (100%) rename {graphics => sources/graphics}/icons/diamond.xcf (100%) rename {graphics => sources/graphics}/icons/graphene.xcf (100%) rename {graphics => sources/graphics}/icons/graphite-1.xcf (100%) rename {graphics => sources/graphics}/icons/graphite-2.xcf (100%) rename {graphics => sources/graphics}/icons/graphite.xcf (100%) rename {graphics => sources/graphics}/icons/nanotube.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/carbon-black-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/crucible-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/diamond-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/flake-graphite-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/fullerene-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/graphene-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/graphite-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/nanotube-stacked.xcf (100%) rename {graphics => sources/graphics}/icons/stacked/rough-diamond-stacked.xcf (100%) rename thumbnail.xcf => sources/thumbnail.xcf (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..bbf3e21 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +[*] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index 18690d6..0000000 --- a/Makefile +++ /dev/null @@ -1,41 +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/ - # Next 3 lines are dev only (uncomment zip lines and comment these) - #rm -rf ../../mods/$(v) - #mkdir ../../mods/$(v) - #cp -r * ../../mods/$(v) - -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/bzcarbon2/LICENSE.md similarity index 100% rename from LICENSE.md rename to bzcarbon2/LICENSE.md diff --git a/carbon-fiber-recipe-updates.lua b/bzcarbon2/carbon-fiber-recipe-updates.lua similarity index 100% rename from carbon-fiber-recipe-updates.lua rename to bzcarbon2/carbon-fiber-recipe-updates.lua diff --git a/carbon-matter.lua b/bzcarbon2/carbon-matter.lua similarity index 100% rename from carbon-matter.lua rename to bzcarbon2/carbon-matter.lua diff --git a/carbon-recipe-final-k2.lua b/bzcarbon2/carbon-recipe-final-k2.lua similarity index 100% rename from carbon-recipe-final-k2.lua rename to bzcarbon2/carbon-recipe-final-k2.lua diff --git a/carbon-recipe-final-rrr.lua b/bzcarbon2/carbon-recipe-final-rrr.lua similarity index 100% rename from carbon-recipe-final-rrr.lua rename to bzcarbon2/carbon-recipe-final-rrr.lua diff --git a/carbon-recipe-final-se.lua b/bzcarbon2/carbon-recipe-final-se.lua similarity index 100% rename from carbon-recipe-final-se.lua rename to bzcarbon2/carbon-recipe-final-se.lua diff --git a/carbon-recipe-final-stacking.lua b/bzcarbon2/carbon-recipe-final-stacking.lua similarity index 100% rename from carbon-recipe-final-stacking.lua rename to bzcarbon2/carbon-recipe-final-stacking.lua diff --git a/carbon-recipe-k2.lua b/bzcarbon2/carbon-recipe-k2.lua similarity index 100% rename from carbon-recipe-k2.lua rename to bzcarbon2/carbon-recipe-k2.lua diff --git a/carbon-recipe-se.lua b/bzcarbon2/carbon-recipe-se.lua similarity index 100% rename from carbon-recipe-se.lua rename to bzcarbon2/carbon-recipe-se.lua diff --git a/carbon-recipe-updates.lua b/bzcarbon2/carbon-recipe-updates.lua similarity index 100% rename from carbon-recipe-updates.lua rename to bzcarbon2/carbon-recipe-updates.lua diff --git a/carbon-recipe.lua b/bzcarbon2/carbon-recipe.lua similarity index 100% rename from carbon-recipe.lua rename to bzcarbon2/carbon-recipe.lua diff --git a/carbon-util.lua b/bzcarbon2/carbon-util.lua similarity index 100% rename from carbon-util.lua rename to bzcarbon2/carbon-util.lua diff --git a/changelog.txt b/bzcarbon2/changelog.txt similarity index 100% rename from changelog.txt rename to bzcarbon2/changelog.txt diff --git a/compatibility/248k.lua b/bzcarbon2/compatibility/248k.lua similarity index 100% rename from compatibility/248k.lua rename to bzcarbon2/compatibility/248k.lua diff --git a/compatibility/any-planet-start.lua b/bzcarbon2/compatibility/any-planet-start.lua similarity index 100% rename from compatibility/any-planet-start.lua rename to bzcarbon2/compatibility/any-planet-start.lua diff --git a/compatibility/orewashing.lua b/bzcarbon2/compatibility/orewashing.lua similarity index 100% rename from compatibility/orewashing.lua rename to bzcarbon2/compatibility/orewashing.lua diff --git a/compatibility/vtkdeepcoremining.lua b/bzcarbon2/compatibility/vtkdeepcoremining.lua similarity index 100% rename from compatibility/vtkdeepcoremining.lua rename to bzcarbon2/compatibility/vtkdeepcoremining.lua diff --git a/control-util.lua b/bzcarbon2/control-util.lua similarity index 100% rename from control-util.lua rename to bzcarbon2/control-util.lua diff --git a/control.lua b/bzcarbon2/control.lua similarity index 100% rename from control.lua rename to bzcarbon2/control.lua diff --git a/data-final-fixes.lua b/bzcarbon2/data-final-fixes.lua similarity index 100% rename from data-final-fixes.lua rename to bzcarbon2/data-final-fixes.lua diff --git a/data-updates.lua b/bzcarbon2/data-updates.lua similarity index 100% rename from data-updates.lua rename to bzcarbon2/data-updates.lua diff --git a/data-util.lua b/bzcarbon2/data-util.lua similarity index 100% rename from data-util.lua rename to bzcarbon2/data-util.lua diff --git a/data.lua b/bzcarbon2/data.lua similarity index 100% rename from data.lua rename to bzcarbon2/data.lua diff --git a/graphics/entity/ores/hr-diamond.png b/bzcarbon2/graphics/entity/ores/hr-diamond.png similarity index 100% rename from graphics/entity/ores/hr-diamond.png rename to bzcarbon2/graphics/entity/ores/hr-diamond.png diff --git a/graphics/entity/ores/hr-graphite.png b/bzcarbon2/graphics/entity/ores/hr-graphite.png similarity index 100% rename from graphics/entity/ores/hr-graphite.png rename to bzcarbon2/graphics/entity/ores/hr-graphite.png diff --git a/graphics/entity/particle/hr-graphite-particle-1.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-1.png similarity index 100% rename from graphics/entity/particle/hr-graphite-particle-1.png rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-1.png diff --git a/graphics/entity/particle/hr-graphite-particle-2.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-2.png similarity index 100% rename from graphics/entity/particle/hr-graphite-particle-2.png rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-2.png diff --git a/graphics/entity/particle/hr-graphite-particle-3.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-3.png similarity index 100% rename from graphics/entity/particle/hr-graphite-particle-3.png rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-3.png diff --git a/graphics/entity/particle/hr-graphite-particle-4.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-4.png similarity index 100% rename from graphics/entity/particle/hr-graphite-particle-4.png rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-4.png diff --git a/graphics/entity/particle/hr-graphite-particle-shadow-1.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-1.png similarity index 100% rename from graphics/entity/particle/hr-graphite-particle-shadow-1.png rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-1.png diff --git a/graphics/entity/particle/hr-graphite-particle-shadow-2.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-2.png similarity index 100% rename from graphics/entity/particle/hr-graphite-particle-shadow-2.png rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-2.png diff --git a/graphics/entity/particle/hr-graphite-particle-shadow-3.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-3.png similarity index 100% rename from graphics/entity/particle/hr-graphite-particle-shadow-3.png rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-3.png diff --git a/graphics/entity/particle/hr-graphite-particle-shadow-4.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-4.png similarity index 100% rename from graphics/entity/particle/hr-graphite-particle-shadow-4.png rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-4.png diff --git a/graphics/icons/Fullerene.png b/bzcarbon2/graphics/icons/Fullerene.png similarity index 100% rename from graphics/icons/Fullerene.png rename to bzcarbon2/graphics/icons/Fullerene.png diff --git a/graphics/icons/activated-carbon.png b/bzcarbon2/graphics/icons/activated-carbon.png similarity index 100% rename from graphics/icons/activated-carbon.png rename to bzcarbon2/graphics/icons/activated-carbon.png diff --git a/graphics/icons/carbon-black.png b/bzcarbon2/graphics/icons/carbon-black.png similarity index 100% rename from graphics/icons/carbon-black.png rename to bzcarbon2/graphics/icons/carbon-black.png diff --git a/graphics/icons/carbon-fiber.png b/bzcarbon2/graphics/icons/carbon-fiber.png similarity index 100% rename from graphics/icons/carbon-fiber.png rename to bzcarbon2/graphics/icons/carbon-fiber.png diff --git a/graphics/icons/crucible.png b/bzcarbon2/graphics/icons/crucible.png similarity index 100% rename from graphics/icons/crucible.png rename to bzcarbon2/graphics/icons/crucible.png diff --git a/graphics/icons/diamond.png b/bzcarbon2/graphics/icons/diamond.png similarity index 100% rename from graphics/icons/diamond.png rename to bzcarbon2/graphics/icons/diamond.png diff --git a/graphics/icons/flake-graphite-1.png b/bzcarbon2/graphics/icons/flake-graphite-1.png similarity index 100% rename from graphics/icons/flake-graphite-1.png rename to bzcarbon2/graphics/icons/flake-graphite-1.png diff --git a/graphics/icons/flake-graphite-2.png b/bzcarbon2/graphics/icons/flake-graphite-2.png similarity index 100% rename from graphics/icons/flake-graphite-2.png rename to bzcarbon2/graphics/icons/flake-graphite-2.png diff --git a/graphics/icons/flake-graphite-3.png b/bzcarbon2/graphics/icons/flake-graphite-3.png similarity index 100% rename from graphics/icons/flake-graphite-3.png rename to bzcarbon2/graphics/icons/flake-graphite-3.png diff --git a/graphics/icons/flake-graphite-4.png b/bzcarbon2/graphics/icons/flake-graphite-4.png similarity index 100% rename from graphics/icons/flake-graphite-4.png rename to bzcarbon2/graphics/icons/flake-graphite-4.png diff --git a/graphics/icons/flake-graphite.png b/bzcarbon2/graphics/icons/flake-graphite.png similarity index 100% rename from graphics/icons/flake-graphite.png rename to bzcarbon2/graphics/icons/flake-graphite.png diff --git a/graphics/icons/graphene.png b/bzcarbon2/graphics/icons/graphene.png similarity index 100% rename from graphics/icons/graphene.png rename to bzcarbon2/graphics/icons/graphene.png diff --git a/graphics/icons/graphite-1.png b/bzcarbon2/graphics/icons/graphite-1.png similarity index 100% rename from graphics/icons/graphite-1.png rename to bzcarbon2/graphics/icons/graphite-1.png diff --git a/graphics/icons/graphite-2.png b/bzcarbon2/graphics/icons/graphite-2.png similarity index 100% rename from graphics/icons/graphite-2.png rename to bzcarbon2/graphics/icons/graphite-2.png diff --git a/graphics/icons/graphite.png b/bzcarbon2/graphics/icons/graphite.png similarity index 100% rename from graphics/icons/graphite.png rename to bzcarbon2/graphics/icons/graphite.png diff --git a/graphics/icons/nanotube.png b/bzcarbon2/graphics/icons/nanotube.png similarity index 100% rename from graphics/icons/nanotube.png rename to bzcarbon2/graphics/icons/nanotube.png diff --git a/graphics/icons/pan.png b/bzcarbon2/graphics/icons/pan.png similarity index 100% rename from graphics/icons/pan.png rename to bzcarbon2/graphics/icons/pan.png diff --git a/graphics/icons/rough-diamond-1.png b/bzcarbon2/graphics/icons/rough-diamond-1.png similarity index 100% rename from graphics/icons/rough-diamond-1.png rename to bzcarbon2/graphics/icons/rough-diamond-1.png diff --git a/graphics/icons/rough-diamond-2.png b/bzcarbon2/graphics/icons/rough-diamond-2.png similarity index 100% rename from graphics/icons/rough-diamond-2.png rename to bzcarbon2/graphics/icons/rough-diamond-2.png diff --git a/graphics/icons/rough-diamond-3.png b/bzcarbon2/graphics/icons/rough-diamond-3.png similarity index 100% rename from graphics/icons/rough-diamond-3.png rename to bzcarbon2/graphics/icons/rough-diamond-3.png diff --git a/graphics/icons/rough-diamond-4.png b/bzcarbon2/graphics/icons/rough-diamond-4.png similarity index 100% rename from graphics/icons/rough-diamond-4.png rename to bzcarbon2/graphics/icons/rough-diamond-4.png diff --git a/graphics/icons/rough-diamond.png b/bzcarbon2/graphics/icons/rough-diamond.png similarity index 100% rename from graphics/icons/rough-diamond.png rename to bzcarbon2/graphics/icons/rough-diamond.png diff --git a/graphics/icons/stacked/carbon-black-stacked.png b/bzcarbon2/graphics/icons/stacked/carbon-black-stacked.png similarity index 100% rename from graphics/icons/stacked/carbon-black-stacked.png rename to bzcarbon2/graphics/icons/stacked/carbon-black-stacked.png diff --git a/graphics/icons/stacked/crucible-stacked.png b/bzcarbon2/graphics/icons/stacked/crucible-stacked.png similarity index 100% rename from graphics/icons/stacked/crucible-stacked.png rename to bzcarbon2/graphics/icons/stacked/crucible-stacked.png diff --git a/graphics/icons/stacked/diamond-stacked.png b/bzcarbon2/graphics/icons/stacked/diamond-stacked.png similarity index 100% rename from graphics/icons/stacked/diamond-stacked.png rename to bzcarbon2/graphics/icons/stacked/diamond-stacked.png diff --git a/graphics/icons/stacked/flake-graphite-stacked.png b/bzcarbon2/graphics/icons/stacked/flake-graphite-stacked.png similarity index 100% rename from graphics/icons/stacked/flake-graphite-stacked.png rename to bzcarbon2/graphics/icons/stacked/flake-graphite-stacked.png diff --git a/graphics/icons/stacked/fullerene-stacked.png b/bzcarbon2/graphics/icons/stacked/fullerene-stacked.png similarity index 100% rename from graphics/icons/stacked/fullerene-stacked.png rename to bzcarbon2/graphics/icons/stacked/fullerene-stacked.png diff --git a/graphics/icons/stacked/graphene-stacked.png b/bzcarbon2/graphics/icons/stacked/graphene-stacked.png similarity index 100% rename from graphics/icons/stacked/graphene-stacked.png rename to bzcarbon2/graphics/icons/stacked/graphene-stacked.png diff --git a/graphics/icons/stacked/graphite-stacked.png b/bzcarbon2/graphics/icons/stacked/graphite-stacked.png similarity index 100% rename from graphics/icons/stacked/graphite-stacked.png rename to bzcarbon2/graphics/icons/stacked/graphite-stacked.png diff --git a/graphics/icons/stacked/nanotube-stacked.png b/bzcarbon2/graphics/icons/stacked/nanotube-stacked.png similarity index 100% rename from graphics/icons/stacked/nanotube-stacked.png rename to bzcarbon2/graphics/icons/stacked/nanotube-stacked.png diff --git a/graphics/icons/stacked/rough-diamond-stacked.png b/bzcarbon2/graphics/icons/stacked/rough-diamond-stacked.png similarity index 100% rename from graphics/icons/stacked/rough-diamond-stacked.png rename to bzcarbon2/graphics/icons/stacked/rough-diamond-stacked.png diff --git a/graphics/technology/carbon-fiber.png b/bzcarbon2/graphics/technology/carbon-fiber.png similarity index 100% rename from graphics/technology/carbon-fiber.png rename to bzcarbon2/graphics/technology/carbon-fiber.png diff --git a/graphics/technology/diamond-processing.png b/bzcarbon2/graphics/technology/diamond-processing.png similarity index 100% rename from graphics/technology/diamond-processing.png rename to bzcarbon2/graphics/technology/diamond-processing.png diff --git a/graphics/technology/fluid-mining.png b/bzcarbon2/graphics/technology/fluid-mining.png similarity index 100% rename from graphics/technology/fluid-mining.png rename to bzcarbon2/graphics/technology/fluid-mining.png diff --git a/graphics/technology/graphite-processing.png b/bzcarbon2/graphics/technology/graphite-processing.png similarity index 100% rename from graphics/technology/graphite-processing.png rename to bzcarbon2/graphics/technology/graphite-processing.png diff --git a/info.json b/bzcarbon2/info.json similarity index 100% rename from info.json rename to bzcarbon2/info.json diff --git a/locale/de/carbon.cfg b/bzcarbon2/locale/de/carbon.cfg similarity index 100% rename from locale/de/carbon.cfg rename to bzcarbon2/locale/de/carbon.cfg diff --git a/locale/en/carbon.cfg b/bzcarbon2/locale/en/carbon.cfg similarity index 100% rename from locale/en/carbon.cfg rename to bzcarbon2/locale/en/carbon.cfg diff --git a/locale/ja/carbon.cfg b/bzcarbon2/locale/ja/carbon.cfg similarity index 100% rename from locale/ja/carbon.cfg rename to bzcarbon2/locale/ja/carbon.cfg diff --git a/locale/ko/carbon.cfg b/bzcarbon2/locale/ko/carbon.cfg similarity index 100% rename from locale/ko/carbon.cfg rename to bzcarbon2/locale/ko/carbon.cfg diff --git a/locale/pl/carbon.cfg b/bzcarbon2/locale/pl/carbon.cfg similarity index 100% rename from locale/pl/carbon.cfg rename to bzcarbon2/locale/pl/carbon.cfg diff --git a/locale/ru/carbon.cfg b/bzcarbon2/locale/ru/carbon.cfg similarity index 100% rename from locale/ru/carbon.cfg rename to bzcarbon2/locale/ru/carbon.cfg diff --git a/locale/zh-CN/bzcarbon.cfg b/bzcarbon2/locale/zh-CN/bzcarbon.cfg similarity index 100% rename from locale/zh-CN/bzcarbon.cfg rename to bzcarbon2/locale/zh-CN/bzcarbon.cfg diff --git a/map-gen-preset-updates.lua b/bzcarbon2/map-gen-preset-updates.lua similarity index 100% rename from map-gen-preset-updates.lua rename to bzcarbon2/map-gen-preset-updates.lua diff --git a/me.lua b/bzcarbon2/me.lua similarity index 100% rename from me.lua rename to bzcarbon2/me.lua diff --git a/migrations/bzcarbon.0.4.7.json b/bzcarbon2/migrations/bzcarbon.0.4.7.json similarity index 100% rename from migrations/bzcarbon.0.4.7.json rename to bzcarbon2/migrations/bzcarbon.0.4.7.json diff --git a/nanotubes-final.lua b/bzcarbon2/nanotubes-final.lua similarity index 100% rename from nanotubes-final.lua rename to bzcarbon2/nanotubes-final.lua diff --git a/prototypes/activated-carbon.lua b/bzcarbon2/prototypes/activated-carbon.lua similarity index 100% rename from prototypes/activated-carbon.lua rename to bzcarbon2/prototypes/activated-carbon.lua diff --git a/prototypes/basic-crusher.lua b/bzcarbon2/prototypes/basic-crusher.lua similarity index 100% rename from prototypes/basic-crusher.lua rename to bzcarbon2/prototypes/basic-crusher.lua diff --git a/prototypes/carbon-asteroid-updates.lua b/bzcarbon2/prototypes/carbon-asteroid-updates.lua similarity index 100% rename from prototypes/carbon-asteroid-updates.lua rename to bzcarbon2/prototypes/carbon-asteroid-updates.lua diff --git a/prototypes/carbon-fiber.lua b/bzcarbon2/prototypes/carbon-fiber.lua similarity index 100% rename from prototypes/carbon-fiber.lua rename to bzcarbon2/prototypes/carbon-fiber.lua diff --git a/prototypes/diamond-particle.lua b/bzcarbon2/prototypes/diamond-particle.lua similarity index 100% rename from prototypes/diamond-particle.lua rename to bzcarbon2/prototypes/diamond-particle.lua diff --git a/prototypes/diamond.lua b/bzcarbon2/prototypes/diamond.lua similarity index 100% rename from prototypes/diamond.lua rename to bzcarbon2/prototypes/diamond.lua diff --git a/prototypes/graphite-particle.lua b/bzcarbon2/prototypes/graphite-particle.lua similarity index 100% rename from prototypes/graphite-particle.lua rename to bzcarbon2/prototypes/graphite-particle.lua diff --git a/prototypes/graphite.lua b/bzcarbon2/prototypes/graphite.lua similarity index 100% rename from prototypes/graphite.lua rename to bzcarbon2/prototypes/graphite.lua diff --git a/settings-util.lua b/bzcarbon2/settings-util.lua similarity index 100% rename from settings-util.lua rename to bzcarbon2/settings-util.lua diff --git a/settings.lua b/bzcarbon2/settings.lua similarity index 100% rename from settings.lua rename to bzcarbon2/settings.lua diff --git a/strange-matter.lua b/bzcarbon2/strange-matter.lua similarity index 100% rename from strange-matter.lua rename to bzcarbon2/strange-matter.lua diff --git a/tech-triggers.lua b/bzcarbon2/tech-triggers.lua similarity index 100% rename from tech-triggers.lua rename to bzcarbon2/tech-triggers.lua diff --git a/thumbnail.png b/bzcarbon2/thumbnail.png similarity index 100% rename from thumbnail.png rename to bzcarbon2/thumbnail.png diff --git a/graphics/entity/particle/graphite-particle-1.png b/graphics/entity/particle/graphite-particle-1.png deleted file mode 100644 index 1b76c1885d33620802d8ecd7abb4740cfe0cc537..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfiU6Mw*Z=?jPwK1h>8Q*|jZ8}p zTeEWBhP8{j+snIJ%QDja^}@ORQzx}_wpG?vW@o0yW~N3;N{ATf zYpJU#R+VM3va$yFyY_UHPn*;-V@hjKfEyDN6Du2Ac$jxjM@36RVPjohNRTHpGYcC# zTXI4O6BF~NkMFKsJ(rRYoSqWe-dvItAA0=A&XdRYb+=cU7-=tGI-{yA6X>30izY8$ zG|3|{L;>h#^^zbzklPs;_<+6%%32%1z_9z5TwrPQO4c>?3~ck>Ewcwovb%CJFt}~e zxC>+ldAc};RKz7OkV;5NN=r;lb{Bf^;K`$B4_!Gve0=>vikm};rNzg`bnBK@K_;cD zUu7*w)1S1%)bur>mdK II;Vst06Wo!m;e9( diff --git a/graphics/entity/particle/graphite-particle-2.png b/graphics/entity/particle/graphite-particle-2.png deleted file mode 100644 index 0bf7c6bbfdb4ec653c40779e0bd7449951429862..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfv;dzF*Z=?j*H`DYH0C4ajzLwN+M<7Z(!&DlpK~R8o}N zx@lQncAUSjb7oqUx|*Vdgs8QpaYJoEZFPQFh}WmXmz01es+I)#0bQyWY03%Y&G~zO zE*Ase=Te4{9>(lxOj6(9dN44U$&^{Uw)E&YIrzmn26{%e cHhM8IC@o|;mA+0j8E7hlr>mdKI;Vst07+nMe*gdg diff --git a/graphics/entity/particle/graphite-particle-3.png b/graphics/entity/particle/graphite-particle-3.png deleted file mode 100644 index 35c156a156a2764f819d2a02696f159758ece0d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}U4T!B>;M1%6%}M7!+q0|!)8qD z+`eV?+Eoj}L%r>7&FgEj7cZD{GhAIL=_Aonty?POqJY=6bY(CffpI{BJ014H>KJqB)9 zZH5UqW={qxaPf3;45^6QdSWYMg98K0hVsLA?|zS;@QtluisJmlDcma+wro82S+S|0 z{}GFl?K$n!id~=Xt&&=lxqG?1f}7RZ(_VF-nRYNS$1A^|QvtHk)78&qol`;+051$` A!2kdN diff --git a/graphics/entity/particle/graphite-particle-4.png b/graphics/entity/particle/graphite-particle-4.png deleted file mode 100644 index 9f5115c859d1b802f84540f3fc45c87b1c34ebfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}b%0NZ>;M1%k00CL-CjOpN^5pT zjI*PqgoNmm$M<_WDyB|s%+HB;cC?a|5IueJ(8cp7f&<*e#6;Sg3PXZifd(YS2fMl0 zINDoCNr}6p}}52b0WiiN{f=K$}*-+Znd>B zk(LtIuba3BXo`GEkRQ-FqKrVc*tWU;3=B-uN?0tuSX-X?E6czT?XIQIu&hj40x0d^ z>Eakt5tqC`HX$V`EipCOfuW4gPcKidg+YJ*tS+tn3{DOK9*%*YkrIjuN~_i>>Z|n$ lOqeib(zJ@WNSaSdX diff --git a/graphics/entity/particle/graphite-particle-shadow-1.png b/graphics/entity/particle/graphite-particle-shadow-1.png deleted file mode 100644 index 89bfee930a3913129f22993f36fd1fae9d7b5d74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6qCH(4Lp07OCrH#eG#>17>}zay z>}Z_c$QvBhvT)YIsS7(7PFu*=aa!Wa1yKv*EzC=$8#YW_ICEjIBLC$n0SgMaCBh7D w7;i|5I&|v6>42jGhZB0vvKkyP`f-SlAt#YnZOcSn1E4hwp00i_>zopr0Nc?uEC2ui diff --git a/graphics/entity/particle/graphite-particle-shadow-2.png b/graphics/entity/particle/graphite-particle-shadow-2.png deleted file mode 100644 index 7834934bd29826d9d4811960d293ce9c0c28d358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6+&oE{eQ`#Juea+P=iG?Bs6)z4*}Q$iB}**7h@ diff --git a/graphics/entity/particle/graphite-particle-shadow-3.png b/graphics/entity/particle/graphite-particle-shadow-3.png deleted file mode 100644 index 6ef2544ba677d79806e566c75aa884b340b802c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6Ts&PILn>}vJ?hQn5Wv82z_V;x z*`{f|#y0JXL^OZK&Su_|o^STJ->WqyD0S-$*1)v~GmBrkT&-%q`*)s5k6JJP%scmO Y6j|9%T#`;|0h-6)>FVdQ&MBb@05gg!Y5)KL diff --git a/graphics/entity/particle/graphite-particle-shadow-4.png b/graphics/entity/particle/graphite-particle-shadow-4.png deleted file mode 100644 index a8aa0068c4bde071a7aeddbadb7499459d2f4c35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf696eneLp07OCrC_e=sq~(V5g(# z?j=&re9pYi+|Jg{%FP=u?<$@gXPpEFTXD9Z U%