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/README.md b/README.md index 1faf65d..77b2f5d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ +This is an unofficial update to Factorio 2.0 and it stays until Brevven takes over again. + +Compatibility with Space Age is explicitly excluded until someone integrates it nicely. + # Mod -[factorio mod page](https://mods.factorio.com/mod/bzaluminum) - Adds aluminum, alumina, alloys, and more to the base game. -## Version History -See changelog.txt - ## Created by - [brevven](https://mods.factorio.com/user/brevven) (code, design, graphics) diff --git a/aluminum-ore.lua b/aluminum-ore.lua deleted file mode 100644 index a988470..0000000 --- a/aluminum-ore.lua +++ /dev/null @@ -1,84 +0,0 @@ -local resource_autoplace = require('resource-autoplace'); - -local util = require("data-util"); - -data.raw.planet.nauvis.map_gen_settings.autoplace_controls["aluminum-ore"] = {} -data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["aluminum-ore"] = {} -resource_autoplace.initialize_patch_set("aluminum-ore", true) - -data:extend({ - { - type = "autoplace-control", - category = "resource", - name = "aluminum-ore", - richness = true, - order = "b-e" - }, - { - type = "resource", - icon_size = 64, icon_mipmaps = 3, - name = "aluminum-ore", - icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", - flags = {"placeable-neutral"}, - order="a-b-a", - map_color = {r=1.00, g=0.80, b=0.50}, - tree_removal_probability = 0.7, - tree_removal_max_distance = 32 * 32, - minable = - { - hardness = 1, - mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle", - mining_time = 1, - result = "aluminum-ore" - }, - collision_box = {{ -0.1, -0.1}, {0.1, 0.1}}, - selection_box = {{ -0.5, -0.5}, {0.5, 0.5}}, - - autoplace = resource_autoplace.resource_autoplace_settings{ - name = "aluminum-ore", - order = "b-z", - base_density = 6, - base_spots_per_km2 = 1, - has_starting_area_placement = true, - regular_rq_factor_multiplier = 1.2, - starting_rq_factor_multiplier = 1.7, - }, - - stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80}, - stages = - { - sheet = - { - filename = "__bzaluminum__/graphics/entity/ores/aluminum-ore.png", - priority = "extra-high", - size = 64, - frame_count = 8, - variation_count = 8, - hr_version = - { - filename = "__bzaluminum__/graphics/entity/ores/hr-aluminum-ore.png", - priority = "extra-high", - size = 128, - frame_count = 8, - variation_count = 8, - scale = 0.5 - } - } - }, - }, - { - type = "item", - name = "aluminum-ore", - icon_size = 64, icon_mipmaps = 3, - icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", - pictures = { - {filename="__bzaluminum__/graphics/icons/aluminum-ore.png", size=64, scale=0.5}, - {filename="__bzaluminum__/graphics/icons/aluminum-ore-2.png", size=64, scale=0.5}, - {filename="__bzaluminum__/graphics/icons/aluminum-ore-3.png", size=64, scale=0.5}, - {filename="__bzaluminum__/graphics/icons/aluminum-ore-4.png", size=64, scale=0.5}, - }, - subgroup = "raw-resource", - order = "t-c-a", - stack_size = 50 - }, -}) diff --git a/LICENSE.md b/bzaluminum2/LICENSE.md similarity index 100% rename from LICENSE.md rename to bzaluminum2/LICENSE.md diff --git a/aluminum-burner-phase.lua b/bzaluminum2/aluminum-burner-phase.lua similarity index 100% rename from aluminum-burner-phase.lua rename to bzaluminum2/aluminum-burner-phase.lua diff --git a/aluminum-enriched.lua b/bzaluminum2/aluminum-enriched.lua similarity index 82% rename from aluminum-enriched.lua rename to bzaluminum2/aluminum-enriched.lua index d28a834..c8ebd51 100644 --- a/aluminum-enriched.lua +++ b/bzaluminum2/aluminum-enriched.lua @@ -8,12 +8,12 @@ data:extend( type = "item", name = "enriched-aluminum", icon_size = 128, - icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", + icon = "__bzaluminum2__/graphics/icons/enriched-aluminum.png", pictures = { - {filename="__bzaluminum__/graphics/icons/enriched-aluminum.png", size=128, scale=0.25}, - {filename="__bzaluminum__/graphics/icons/enriched-aluminum-1.png", size=128, scale=0.25}, - {filename="__bzaluminum__/graphics/icons/enriched-aluminum-2.png", size=128, scale=0.25}, - {filename="__bzaluminum__/graphics/icons/enriched-aluminum-3.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/enriched-aluminum.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/enriched-aluminum-1.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/enriched-aluminum-2.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/enriched-aluminum-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-aluminum]", @@ -23,7 +23,7 @@ data:extend( type = "recipe", name = "enriched-aluminum", main_product = "enriched-aluminum", - icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", + icon = "__bzaluminum2__/graphics/icons/enriched-aluminum.png", icon_size = 128, category = "chemistry", energy_required = 3, @@ -57,8 +57,8 @@ data:extend( name = "enriched-alumina", icons = { - { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128 }, - { icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128 }, + { icon = "__bzaluminum2__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, }, category = "smelting", energy_required = 16, diff --git a/aluminum-matter.lua b/bzaluminum2/aluminum-matter.lua similarity index 96% rename from aluminum-matter.lua rename to bzaluminum2/aluminum-matter.lua index f04cb2e..92caa5c 100644 --- a/aluminum-matter.lua +++ b/bzaluminum2/aluminum-matter.lua @@ -15,7 +15,7 @@ data:extend( icon_size = 256, }, { - icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", icon_size = 64, scale = 1.4, } diff --git a/bzaluminum2/aluminum-ore.lua b/bzaluminum2/aluminum-ore.lua new file mode 100644 index 0000000..304bccb --- /dev/null +++ b/bzaluminum2/aluminum-ore.lua @@ -0,0 +1,76 @@ +local resource_autoplace = require('resource-autoplace'); + +data.raw.planet.nauvis.map_gen_settings.autoplace_controls["aluminum-ore"] = {} +data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["aluminum-ore"] = {} +resource_autoplace.initialize_patch_set("aluminum-ore", true) + +data:extend({ + { + type = "autoplace-control", + category = "resource", + name = "aluminum-ore", + richness = true, + order = "b-e" + }, + { + type = "resource", + icon_size = 64, + icon_mipmaps = 3, + name = "aluminum-ore", + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", + flags = { "placeable-neutral" }, + order = "a-b-a", + map_color = { r = 1.00, g = 0.80, b = 0.50 }, + tree_removal_probability = 0.7, + tree_removal_max_distance = 32 * 32, + minable = + { + hardness = 1, + mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle", + mining_time = 1, + result = "aluminum-ore" + }, + collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } }, + selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + + autoplace = resource_autoplace.resource_autoplace_settings { + name = "aluminum-ore", + order = "b-z", + base_density = 6, + base_spots_per_km2 = 1, + has_starting_area_placement = true, + regular_rq_factor_multiplier = 1.2, + starting_rq_factor_multiplier = 1.7, + }, + + stage_counts = { 15000, 9500, 5500, 2900, 1300, 400, 150, 80 }, + stages = + { + sheet = + { + filename = "__bzaluminum2__/graphics/entity/ores/hr-aluminum-ore.png", + priority = "extra-high", + size = 128, + frame_count = 8, + variation_count = 8, + scale = 0.5 + } + }, + }, + { + type = "item", + name = "aluminum-ore", + icon_size = 64, + icon_mipmaps = 3, + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", + pictures = { + { filename = "__bzaluminum2__/graphics/icons/aluminum-ore.png", size = 64, scale = 0.5 }, + { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-2.png", size = 64, scale = 0.5 }, + { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-3.png", size = 64, scale = 0.5 }, + { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-4.png", size = 64, scale = 0.5 }, + }, + subgroup = "raw-resource", + order = "t-c-a", + stack_size = 50 + }, +}) diff --git a/aluminum-recipe-final-rrr.lua b/bzaluminum2/aluminum-recipe-final-rrr.lua similarity index 100% rename from aluminum-recipe-final-rrr.lua rename to bzaluminum2/aluminum-recipe-final-rrr.lua diff --git a/aluminum-recipe-final-stacking.lua b/bzaluminum2/aluminum-recipe-final-stacking.lua similarity index 52% rename from aluminum-recipe-final-stacking.lua rename to bzaluminum2/aluminum-recipe-final-stacking.lua index ad55755..c21240e 100644 --- a/aluminum-recipe-final-stacking.lua +++ b/bzaluminum2/aluminum-recipe-final-stacking.lua @@ -3,31 +3,31 @@ local util = require("data-util"); if deadlock then - deadlock.add_stack("aluminum-ore", "__bzaluminum__/graphics/icons/stacked/aluminum-ore-stacked.png", "deadlock-stacking-1", 64) - deadlock.add_stack("aluminum-plate", "__bzaluminum__/graphics/icons/stacked/aluminum-plate-stacked.png", "deadlock-stacking-1", 128) - deadlock.add_stack("alumina", "__bzaluminum__/graphics/icons/stacked/alumina-stacked.png" , "deadlock-stacking-1", 128) + deadlock.add_stack("aluminum-ore", "__bzaluminum2__/graphics/icons/stacked/aluminum-ore-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("aluminum-plate", "__bzaluminum2__/graphics/icons/stacked/aluminum-plate-stacked.png", "deadlock-stacking-1", 128) + deadlock.add_stack("alumina", "__bzaluminum2__/graphics/icons/stacked/alumina-stacked.png" , "deadlock-stacking-1", 128) deadlock.add_stack("aluminum-cable", nil, "deadlock-stacking-1", 128) - deadlock.add_stack("acsr-cable", "__bzaluminum__/graphics/icons/stacked/acsr-cable-stacked.png" , "deadlock-stacking-2", 128) - deadlock.add_stack("spark-plug", "__bzaluminum__/graphics/icons/stacked/spark-plug-stacked.png" , "deadlock-stacking-2", 128) - deadlock.add_stack("aluminum-6061", "__bzaluminum__/graphics/icons/stacked/aluminum-6061-stacked.png" , "deadlock-stacking-2", 128) - deadlock.add_stack("aluminum-2219", "__bzaluminum__/graphics/icons/stacked/aluminum-2219-stacked.png" , "deadlock-stacking-3", 128) + deadlock.add_stack("acsr-cable", "__bzaluminum2__/graphics/icons/stacked/acsr-cable-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("spark-plug", "__bzaluminum2__/graphics/icons/stacked/spark-plug-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("aluminum-6061", "__bzaluminum2__/graphics/icons/stacked/aluminum-6061-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("aluminum-2219", "__bzaluminum2__/graphics/icons/stacked/aluminum-2219-stacked.png" , "deadlock-stacking-3", 128) if mods.bztitanium then - deadlock.add_stack("ti-sapphire", "__bzaluminum__/graphics/icons/stacked/ti-sapphire-stacked.png" , "deadlock-stacking-3", 128) + deadlock.add_stack("ti-sapphire", "__bzaluminum2__/graphics/icons/stacked/ti-sapphire-stacked.png" , "deadlock-stacking-3", 128) end if mods.Krastorio2 then - deadlock.add_stack("enriched-aluminum", "__bzaluminum__/graphics/icons/stacked/enriched-aluminum-ore-stacked.png" , "deadlock-stacking-3", 128) + deadlock.add_stack("enriched-aluminum", "__bzaluminum2__/graphics/icons/stacked/enriched-aluminum-ore-stacked.png" , "deadlock-stacking-3", 128) util.set_icons("deadlock-stacks-stack-automation-core", { - {icon="__bzaluminum__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, + {icon="__bzaluminum2__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, {icon="__deadlock-beltboxes-loaders__/graphics/icons/square/arrow-d-64.png", icon_size=64, scale=.25}, }) util.set_icons("deadlock-stacks-unstack-automation-core", { - {icon="__bzaluminum__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, + {icon="__bzaluminum2__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, {icon="__deadlock-beltboxes-loaders__/graphics/icons/square/arrow-u-64.png", icon_size=64, scale=.25}, }) util.set_item_icons("deadlock-stack-automation-core", { - {icon="__bzaluminum__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, + {icon="__bzaluminum2__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, }) end if mods["space-exploration"] then diff --git a/aluminum-recipe-modules.lua b/bzaluminum2/aluminum-recipe-modules.lua similarity index 100% rename from aluminum-recipe-modules.lua rename to bzaluminum2/aluminum-recipe-modules.lua diff --git a/aluminum-recipe-se.lua b/bzaluminum2/aluminum-recipe-se.lua similarity index 90% rename from aluminum-recipe-se.lua rename to bzaluminum2/aluminum-recipe-se.lua index f558bd8..024a647 100644 --- a/aluminum-recipe-se.lua +++ b/bzaluminum2/aluminum-recipe-se.lua @@ -40,7 +40,7 @@ if mods["space-exploration"] then { type = "item", name = "aluminum-ingot", - icons = {{icon = "__bzaluminum__/graphics/icons/aluminum-ingot.png", icon_size = 128}}, + icons = {{icon = "__bzaluminum2__/graphics/icons/aluminum-ingot.png", icon_size = 128}}, order = "b-b", stack_size = 50, subgroup = "aluminum", @@ -52,7 +52,7 @@ if mods["space-exploration"] then max_temperature = 660, base_color = {r=230, g=230, b=220}, flow_color = {r=230, g=230, b=220}, - icons = {{icon = "__bzaluminum__/graphics/icons/molten-aluminum.png", icon_size = 128}}, + icons = {{icon = "__bzaluminum2__/graphics/icons/molten-aluminum.png", icon_size = 128}}, order = "a[molten]-a", pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, @@ -97,8 +97,8 @@ if mods["space-exploration"] then name = "aluminum-ingot-to-plate", icons = { - {icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128, icon_mipmaps = 3}, - {icon = "__bzaluminum__/graphics/icons/aluminum-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-plate.png", icon_size = 128, icon_mipmaps = 3}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { { type = "item", name = "aluminum-plate", amount = 10}, diff --git a/aluminum-recipe-updates-jetpack.lua b/bzaluminum2/aluminum-recipe-updates-jetpack.lua similarity index 100% rename from aluminum-recipe-updates-jetpack.lua rename to bzaluminum2/aluminum-recipe-updates-jetpack.lua diff --git a/aluminum-recipe-updates-lds.lua b/bzaluminum2/aluminum-recipe-updates-lds.lua similarity index 100% rename from aluminum-recipe-updates-lds.lua rename to bzaluminum2/aluminum-recipe-updates-lds.lua diff --git a/aluminum-recipe-updates-power.lua b/bzaluminum2/aluminum-recipe-updates-power.lua similarity index 100% rename from aluminum-recipe-updates-power.lua rename to bzaluminum2/aluminum-recipe-updates-power.lua diff --git a/aluminum-recipe-updates-storage.lua b/bzaluminum2/aluminum-recipe-updates-storage.lua similarity index 100% rename from aluminum-recipe-updates-storage.lua rename to bzaluminum2/aluminum-recipe-updates-storage.lua diff --git a/aluminum-recipe-updates-transport.lua b/bzaluminum2/aluminum-recipe-updates-transport.lua similarity index 100% rename from aluminum-recipe-updates-transport.lua rename to bzaluminum2/aluminum-recipe-updates-transport.lua diff --git a/aluminum-recipe-updates.lua b/bzaluminum2/aluminum-recipe-updates.lua similarity index 100% rename from aluminum-recipe-updates.lua rename to bzaluminum2/aluminum-recipe-updates.lua diff --git a/aluminum-recipe.lua b/bzaluminum2/aluminum-recipe.lua similarity index 84% rename from aluminum-recipe.lua rename to bzaluminum2/aluminum-recipe.lua index ce39235..20a9cb4 100644 --- a/aluminum-recipe.lua +++ b/bzaluminum2/aluminum-recipe.lua @@ -35,10 +35,10 @@ data:extend({ order = "d[alumina]", icons = (mods["Krastorio2"] and { - { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128}, - { icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128}, + { icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or { - { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128}, + { icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128}, } ), enabled = true, @@ -55,10 +55,10 @@ data:extend({ order = "d[aluminum-plate]", icons = (mods["Krastorio2"] and { - { icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128}, - { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bzaluminum2__/graphics/icons/aluminum-plate.png", icon_size = 128}, + { icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, } or { - { icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128}, + { icon = "__bzaluminum2__/graphics/icons/aluminum-plate.png", icon_size = 128}, } ), enabled = true, @@ -71,13 +71,13 @@ data:extend({ { type = "item", name = "alumina", - icon = "__bzaluminum__/graphics/icons/alumina.png", + icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128, pictures = { - {filename="__bzaluminum__/graphics/icons/alumina.png", size=128, scale=0.25}, - {filename="__bzaluminum__/graphics/icons/alumina-1.png", size=128, scale=0.25}, - {filename="__bzaluminum__/graphics/icons/alumina-2.png", size=128, scale=0.25}, - {filename="__bzaluminum__/graphics/icons/alumina-3.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/alumina.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/alumina-1.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/alumina-2.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/alumina-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "b[alumina]", @@ -86,7 +86,7 @@ data:extend({ { type = "item", name = "aluminum-plate", - icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-plate.png", icon_size = 128, subgroup = "raw-material", order = "b[aluminum-plate]", @@ -147,7 +147,7 @@ data:extend({ { type = "technology", name = "reinforced-cable", - icon = "__bzaluminum__/graphics/technology/reinforced-cable.png", + icon = "__bzaluminum2__/graphics/technology/reinforced-cable.png", icon_size = 256, effects = { { type = "unlock-recipe", recipe = "acsr-cable" }, @@ -166,7 +166,7 @@ data:extend({ { type = "item", name = "aluminum-cable", - icon = "__bzaluminum__/graphics/icons/aluminum-cable.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4, subgroup = util.cablesg, order = "b[aaac-cable]", @@ -185,7 +185,7 @@ data:extend({ { type = "item", name = "acsr-cable", - icon = "__bzaluminum__/graphics/icons/acsr-cable.png", + icon = "__bzaluminum2__/graphics/icons/acsr-cable.png", icon_size = 128, subgroup = util.cablesg, order = "b[acsr-cable]", @@ -217,8 +217,8 @@ if mods.Krastorio2 then ingredients = {{type="item", name="aluminum-ore", amount=4}}, results = {{type="item", name="aluminum-cable", amount=1}}, icons = { - {icon = "__bzaluminum__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4}, - {icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, }, { @@ -233,8 +233,8 @@ if mods.Krastorio2 then ingredients = {{type="item", name="enriched-aluminum", amount=2}}, results = {{type="item", name="aluminum-cable", amount=1}}, icons = { - {icon = "__bzaluminum__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4}, - {icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4}, + {icon = "__bzaluminum2__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, }, }, }) @@ -254,7 +254,7 @@ data:extend({ { type = "item", name = "spark-plug", - icon = "__bzaluminum__/graphics/icons/spark-plug.png", + icon = "__bzaluminum2__/graphics/icons/spark-plug.png", icon_size = 128, subgroup = "intermediate-product", order = "b[spark-plug]", @@ -294,7 +294,7 @@ data:extend({ { type = "item", name = "aluminum-6061", - icon = "__bzaluminum__/graphics/icons/aluminum-6061.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-6061.png", icon_size = 128, subgroup = "raw-material", order = "zz[aluminum-6061]", @@ -314,7 +314,7 @@ data:extend({ { type = "technology", name = "basic-alloys", - icon = "__bzaluminum__/graphics/icons/aluminum-6061.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-6061.png", icon_size = 128, effects = { { type = "unlock-recipe", recipe = "aluminum-6061" }, @@ -353,7 +353,7 @@ data:extend({ { type = "item", name = "aluminum-2219", - icon = "__bzaluminum__/graphics/icons/aluminum-2219.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-2219.png", icon_size = 128, subgroup = "raw-material", order = "zz[aluminum-2219]", @@ -373,7 +373,7 @@ data:extend({ { type = "technology", name = "aerospace-alloys", - icon = "__bzaluminum__/graphics/icons/aluminum-2219.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-2219.png", icon_size = 128, effects = { { type = "unlock-recipe", recipe = "aluminum-2219" }, @@ -397,7 +397,7 @@ if mods.bztitanium then { type = "item", name = "ti-sapphire", - icon = "__bzaluminum__/graphics/icons/ti-sapphire.png", + icon = "__bzaluminum2__/graphics/icons/ti-sapphire.png", icon_size = 128, subgroup = "intermediate-product", order = "zz[sapphire-ti]", @@ -406,7 +406,7 @@ if mods.bztitanium then { type = "recipe", name = "ti-sapphire", - icon = "__bzaluminum__/graphics/icons/ti-sapphire.png", + icon = "__bzaluminum2__/graphics/icons/ti-sapphire.png", icon_size = 128, category = "chemistry", subgroup = "intermediate-product", diff --git a/cables.lua b/bzaluminum2/cables.lua similarity index 100% rename from cables.lua rename to bzaluminum2/cables.lua diff --git a/changelog.txt b/bzaluminum2/changelog.txt similarity index 100% rename from changelog.txt rename to bzaluminum2/changelog.txt diff --git a/compatibility/248k-recipes.lua b/bzaluminum2/compatibility/248k-recipes.lua similarity index 85% rename from compatibility/248k-recipes.lua rename to bzaluminum2/compatibility/248k-recipes.lua index 1b49d4e..30031ea 100644 --- a/compatibility/248k-recipes.lua +++ b/bzaluminum2/compatibility/248k-recipes.lua @@ -23,7 +23,7 @@ data:extend({ icon = "__248k-Redux-graphics__/ressources/fluids/el_dirty_water.png", icon_size = 64, }, { - icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8} + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8} }, } }, diff --git a/compatibility/248k.lua b/bzaluminum2/compatibility/248k.lua similarity index 100% rename from compatibility/248k.lua rename to bzaluminum2/compatibility/248k.lua diff --git a/compatibility/crafting-efficiency.lua b/bzaluminum2/compatibility/crafting-efficiency.lua similarity index 100% rename from compatibility/crafting-efficiency.lua rename to bzaluminum2/compatibility/crafting-efficiency.lua diff --git a/compatibility/rsc.lua b/bzaluminum2/compatibility/rsc.lua similarity index 100% rename from compatibility/rsc.lua rename to bzaluminum2/compatibility/rsc.lua diff --git a/compatibility/sciencecosttweakerm.lua b/bzaluminum2/compatibility/sciencecosttweakerm.lua similarity index 100% rename from compatibility/sciencecosttweakerm.lua rename to bzaluminum2/compatibility/sciencecosttweakerm.lua diff --git a/compatibility/textplates.lua b/bzaluminum2/compatibility/textplates.lua similarity index 100% rename from compatibility/textplates.lua rename to bzaluminum2/compatibility/textplates.lua diff --git a/control-util.lua b/bzaluminum2/control-util.lua similarity index 100% rename from control-util.lua rename to bzaluminum2/control-util.lua diff --git a/control.lua b/bzaluminum2/control.lua similarity index 100% rename from control.lua rename to bzaluminum2/control.lua diff --git a/data-final-fixes.lua b/bzaluminum2/data-final-fixes.lua similarity index 100% rename from data-final-fixes.lua rename to bzaluminum2/data-final-fixes.lua diff --git a/data-updates.lua b/bzaluminum2/data-updates.lua similarity index 100% rename from data-updates.lua rename to bzaluminum2/data-updates.lua diff --git a/data-util.lua b/bzaluminum2/data-util.lua similarity index 100% rename from data-util.lua rename to bzaluminum2/data-util.lua diff --git a/data.lua b/bzaluminum2/data.lua similarity index 78% rename from data.lua rename to bzaluminum2/data.lua index 0f18495..241f20f 100644 --- a/data.lua +++ b/bzaluminum2/data.lua @@ -10,10 +10,10 @@ local util = require("data-util"); if mods.Krastorio2 then if data.raw.item["kr-automation-core"] then - data.raw.item["kr-automation-core"].icon = "__bzaluminum__/graphics/icons/automation-core.png" + data.raw.item["kr-automation-core"].icon = "__bzaluminum2__/graphics/icons/automation-core.png" end if data.raw.technology["kr-automation-core"] then - data.raw.technology["kr-automation-core"].icon = "__bzaluminum__/graphics/technology/automation-core.png" + data.raw.technology["kr-automation-core"].icon = "__bzaluminum2__/graphics/technology/automation-core.png" end end diff --git a/graphics/entity/ores/hr-aluminum-ore.png b/bzaluminum2/graphics/entity/ores/hr-aluminum-ore.png similarity index 100% rename from graphics/entity/ores/hr-aluminum-ore.png rename to bzaluminum2/graphics/entity/ores/hr-aluminum-ore.png diff --git a/graphics/icons/acsr-cable.png b/bzaluminum2/graphics/icons/acsr-cable.png similarity index 100% rename from graphics/icons/acsr-cable.png rename to bzaluminum2/graphics/icons/acsr-cable.png diff --git a/graphics/icons/alumina-1.png b/bzaluminum2/graphics/icons/alumina-1.png similarity index 100% rename from graphics/icons/alumina-1.png rename to bzaluminum2/graphics/icons/alumina-1.png diff --git a/graphics/icons/alumina-2.png b/bzaluminum2/graphics/icons/alumina-2.png similarity index 100% rename from graphics/icons/alumina-2.png rename to bzaluminum2/graphics/icons/alumina-2.png diff --git a/graphics/icons/alumina-3.png b/bzaluminum2/graphics/icons/alumina-3.png similarity index 100% rename from graphics/icons/alumina-3.png rename to bzaluminum2/graphics/icons/alumina-3.png diff --git a/graphics/icons/alumina.blend.png b/bzaluminum2/graphics/icons/alumina.blend.png similarity index 100% rename from graphics/icons/alumina.blend.png rename to bzaluminum2/graphics/icons/alumina.blend.png diff --git a/graphics/icons/alumina.png b/bzaluminum2/graphics/icons/alumina.png similarity index 100% rename from graphics/icons/alumina.png rename to bzaluminum2/graphics/icons/alumina.png diff --git a/graphics/icons/aluminum-2219.png b/bzaluminum2/graphics/icons/aluminum-2219.png similarity index 100% rename from graphics/icons/aluminum-2219.png rename to bzaluminum2/graphics/icons/aluminum-2219.png diff --git a/graphics/icons/aluminum-6061.png b/bzaluminum2/graphics/icons/aluminum-6061.png similarity index 100% rename from graphics/icons/aluminum-6061.png rename to bzaluminum2/graphics/icons/aluminum-6061.png diff --git a/graphics/icons/aluminum-cable.png b/bzaluminum2/graphics/icons/aluminum-cable.png similarity index 100% rename from graphics/icons/aluminum-cable.png rename to bzaluminum2/graphics/icons/aluminum-cable.png diff --git a/graphics/icons/aluminum-ingot.png b/bzaluminum2/graphics/icons/aluminum-ingot.png similarity index 100% rename from graphics/icons/aluminum-ingot.png rename to bzaluminum2/graphics/icons/aluminum-ingot.png diff --git a/graphics/icons/aluminum-ore-2.png b/bzaluminum2/graphics/icons/aluminum-ore-2.png similarity index 100% rename from graphics/icons/aluminum-ore-2.png rename to bzaluminum2/graphics/icons/aluminum-ore-2.png diff --git a/graphics/icons/aluminum-ore-3.png b/bzaluminum2/graphics/icons/aluminum-ore-3.png similarity index 100% rename from graphics/icons/aluminum-ore-3.png rename to bzaluminum2/graphics/icons/aluminum-ore-3.png diff --git a/graphics/icons/aluminum-ore-4.png b/bzaluminum2/graphics/icons/aluminum-ore-4.png similarity index 100% rename from graphics/icons/aluminum-ore-4.png rename to bzaluminum2/graphics/icons/aluminum-ore-4.png diff --git a/graphics/icons/aluminum-ore-powder.png b/bzaluminum2/graphics/icons/aluminum-ore-powder.png similarity index 100% rename from graphics/icons/aluminum-ore-powder.png rename to bzaluminum2/graphics/icons/aluminum-ore-powder.png diff --git a/graphics/icons/aluminum-ore.png b/bzaluminum2/graphics/icons/aluminum-ore.png similarity index 100% rename from graphics/icons/aluminum-ore.png rename to bzaluminum2/graphics/icons/aluminum-ore.png diff --git a/graphics/icons/aluminum-plate.png b/bzaluminum2/graphics/icons/aluminum-plate.png similarity index 100% rename from graphics/icons/aluminum-plate.png rename to bzaluminum2/graphics/icons/aluminum-plate.png diff --git a/graphics/icons/automation-core.png b/bzaluminum2/graphics/icons/automation-core.png similarity index 100% rename from graphics/icons/automation-core.png rename to bzaluminum2/graphics/icons/automation-core.png diff --git a/graphics/icons/enriched-aluminum-1.png b/bzaluminum2/graphics/icons/enriched-aluminum-1.png similarity index 100% rename from graphics/icons/enriched-aluminum-1.png rename to bzaluminum2/graphics/icons/enriched-aluminum-1.png diff --git a/graphics/icons/enriched-aluminum-2.png b/bzaluminum2/graphics/icons/enriched-aluminum-2.png similarity index 100% rename from graphics/icons/enriched-aluminum-2.png rename to bzaluminum2/graphics/icons/enriched-aluminum-2.png diff --git a/graphics/icons/enriched-aluminum-3.png b/bzaluminum2/graphics/icons/enriched-aluminum-3.png similarity index 100% rename from graphics/icons/enriched-aluminum-3.png rename to bzaluminum2/graphics/icons/enriched-aluminum-3.png diff --git a/graphics/icons/enriched-aluminum.png b/bzaluminum2/graphics/icons/enriched-aluminum.png similarity index 100% rename from graphics/icons/enriched-aluminum.png rename to bzaluminum2/graphics/icons/enriched-aluminum.png diff --git a/graphics/icons/molten-aluminum.png b/bzaluminum2/graphics/icons/molten-aluminum.png similarity index 100% rename from graphics/icons/molten-aluminum.png rename to bzaluminum2/graphics/icons/molten-aluminum.png diff --git a/graphics/icons/spark-plug.png b/bzaluminum2/graphics/icons/spark-plug.png similarity index 100% rename from graphics/icons/spark-plug.png rename to bzaluminum2/graphics/icons/spark-plug.png diff --git a/graphics/icons/stacked/acsr-cable-stacked.png b/bzaluminum2/graphics/icons/stacked/acsr-cable-stacked.png similarity index 100% rename from graphics/icons/stacked/acsr-cable-stacked.png rename to bzaluminum2/graphics/icons/stacked/acsr-cable-stacked.png diff --git a/graphics/icons/stacked/alumina-stacked.png b/bzaluminum2/graphics/icons/stacked/alumina-stacked.png similarity index 100% rename from graphics/icons/stacked/alumina-stacked.png rename to bzaluminum2/graphics/icons/stacked/alumina-stacked.png diff --git a/graphics/icons/stacked/aluminum-2219-stacked.png b/bzaluminum2/graphics/icons/stacked/aluminum-2219-stacked.png similarity index 100% rename from graphics/icons/stacked/aluminum-2219-stacked.png rename to bzaluminum2/graphics/icons/stacked/aluminum-2219-stacked.png diff --git a/graphics/icons/stacked/aluminum-6061-stacked.png b/bzaluminum2/graphics/icons/stacked/aluminum-6061-stacked.png similarity index 100% rename from graphics/icons/stacked/aluminum-6061-stacked.png rename to bzaluminum2/graphics/icons/stacked/aluminum-6061-stacked.png diff --git a/graphics/icons/stacked/aluminum-ore-stacked.png b/bzaluminum2/graphics/icons/stacked/aluminum-ore-stacked.png similarity index 100% rename from graphics/icons/stacked/aluminum-ore-stacked.png rename to bzaluminum2/graphics/icons/stacked/aluminum-ore-stacked.png diff --git a/graphics/icons/stacked/aluminum-plate-stacked.png b/bzaluminum2/graphics/icons/stacked/aluminum-plate-stacked.png similarity index 100% rename from graphics/icons/stacked/aluminum-plate-stacked.png rename to bzaluminum2/graphics/icons/stacked/aluminum-plate-stacked.png diff --git a/graphics/icons/stacked/automation-core-stacked.png b/bzaluminum2/graphics/icons/stacked/automation-core-stacked.png similarity index 100% rename from graphics/icons/stacked/automation-core-stacked.png rename to bzaluminum2/graphics/icons/stacked/automation-core-stacked.png diff --git a/graphics/icons/stacked/enriched-aluminum-ore-stacked.png b/bzaluminum2/graphics/icons/stacked/enriched-aluminum-ore-stacked.png similarity index 100% rename from graphics/icons/stacked/enriched-aluminum-ore-stacked.png rename to bzaluminum2/graphics/icons/stacked/enriched-aluminum-ore-stacked.png diff --git a/graphics/icons/stacked/spark-plug-stacked.png b/bzaluminum2/graphics/icons/stacked/spark-plug-stacked.png similarity index 100% rename from graphics/icons/stacked/spark-plug-stacked.png rename to bzaluminum2/graphics/icons/stacked/spark-plug-stacked.png diff --git a/graphics/icons/stacked/ti-sapphire-stacked.png b/bzaluminum2/graphics/icons/stacked/ti-sapphire-stacked.png similarity index 100% rename from graphics/icons/stacked/ti-sapphire-stacked.png rename to bzaluminum2/graphics/icons/stacked/ti-sapphire-stacked.png diff --git a/graphics/icons/ti-sapphire.png b/bzaluminum2/graphics/icons/ti-sapphire.png similarity index 100% rename from graphics/icons/ti-sapphire.png rename to bzaluminum2/graphics/icons/ti-sapphire.png diff --git a/graphics/technology/automation-core.png b/bzaluminum2/graphics/technology/automation-core.png similarity index 100% rename from graphics/technology/automation-core.png rename to bzaluminum2/graphics/technology/automation-core.png diff --git a/graphics/technology/reinforced-cable.png b/bzaluminum2/graphics/technology/reinforced-cable.png similarity index 100% rename from graphics/technology/reinforced-cable.png rename to bzaluminum2/graphics/technology/reinforced-cable.png diff --git a/info.json b/bzaluminum2/info.json similarity index 87% rename from info.json rename to bzaluminum2/info.json index 8b1e2a7..43026c7 100644 --- a/info.json +++ b/bzaluminum2/info.json @@ -1,9 +1,9 @@ { - "name": "bzaluminum", + "name": "bzaluminum2", "version": "2.0.0", "factorio_version": "2.0", "title": "Aluminum", - "author": "Brevven", + "author": "Brevven, cackling fiend", "contact": "", "homepage": "", "dependencies": [ @@ -25,7 +25,8 @@ "(?) bobtech", "(?) bobassembly", "(?) bobpower", - "(?) scattergun_turret" + "(?) scattergun_turret", + "! space-age" ], "description": "Adds aluminum, alumina, cables, alloys and more to the game.\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods." } diff --git a/locale/cs/aluminum.cfg b/bzaluminum2/locale/cs/aluminum.cfg similarity index 100% rename from locale/cs/aluminum.cfg rename to bzaluminum2/locale/cs/aluminum.cfg diff --git a/locale/de/aluminum.cfg b/bzaluminum2/locale/de/aluminum.cfg similarity index 100% rename from locale/de/aluminum.cfg rename to bzaluminum2/locale/de/aluminum.cfg diff --git a/locale/en/aluminum.cfg b/bzaluminum2/locale/en/aluminum.cfg similarity index 100% rename from locale/en/aluminum.cfg rename to bzaluminum2/locale/en/aluminum.cfg diff --git a/locale/ja/aluminum.cfg b/bzaluminum2/locale/ja/aluminum.cfg similarity index 100% rename from locale/ja/aluminum.cfg rename to bzaluminum2/locale/ja/aluminum.cfg diff --git a/locale/ko/aluminum.cfg b/bzaluminum2/locale/ko/aluminum.cfg similarity index 100% rename from locale/ko/aluminum.cfg rename to bzaluminum2/locale/ko/aluminum.cfg diff --git a/locale/ru/aluminum.cfg b/bzaluminum2/locale/ru/aluminum.cfg similarity index 100% rename from locale/ru/aluminum.cfg rename to bzaluminum2/locale/ru/aluminum.cfg diff --git a/locale/zh-CN/bzaluminum.cfg b/bzaluminum2/locale/zh-CN/bzaluminum.cfg similarity index 100% rename from locale/zh-CN/bzaluminum.cfg rename to bzaluminum2/locale/zh-CN/bzaluminum.cfg diff --git a/map-gen-preset-updates.lua b/bzaluminum2/map-gen-preset-updates.lua similarity index 100% rename from map-gen-preset-updates.lua rename to bzaluminum2/map-gen-preset-updates.lua diff --git a/me.lua b/bzaluminum2/me.lua similarity index 97% rename from me.lua rename to bzaluminum2/me.lua index 49275ee..a5241a3 100644 --- a/me.lua +++ b/bzaluminum2/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bzaluminum" +me.name = "bzaluminum2" me.list = {} diff --git a/settings-util.lua b/bzaluminum2/settings-util.lua similarity index 100% rename from settings-util.lua rename to bzaluminum2/settings-util.lua diff --git a/settings.lua b/bzaluminum2/settings.lua similarity index 100% rename from settings.lua rename to bzaluminum2/settings.lua diff --git a/strange-matter.lua b/bzaluminum2/strange-matter.lua similarity index 94% rename from strange-matter.lua rename to bzaluminum2/strange-matter.lua index 00bf2ee..36c2084 100644 --- a/strange-matter.lua +++ b/bzaluminum2/strange-matter.lua @@ -1,7 +1,7 @@ local util = require("data-util"); local ore = "aluminum-ore" -local ore_icon = "__bzaluminum__/graphics/icons/aluminum-ore.png" +local ore_icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png" if mods["StrangeMatter"] then data:extend({ diff --git a/thumbnail.png b/bzaluminum2/thumbnail.png similarity index 100% rename from thumbnail.png rename to bzaluminum2/thumbnail.png diff --git a/graphics/entity/ores/aluminum-ore.png b/graphics/entity/ores/aluminum-ore.png deleted file mode 100644 index 11aa1df..0000000 Binary files a/graphics/entity/ores/aluminum-ore.png and /dev/null differ diff --git a/migrations/bzaluminum.0.2.0.json b/migrations/bzaluminum.0.2.0.json deleted file mode 100644 index b2b44aa..0000000 --- a/migrations/bzaluminum.0.2.0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "item": - [ - ["el_aluminum_item", "aluminum-plate"] - ] -} - diff --git a/graphics/entity/ores/hr-aluminum-ore.xcf b/sources/graphics/entity/ores/hr-aluminum-ore.xcf similarity index 100% rename from graphics/entity/ores/hr-aluminum-ore.xcf rename to sources/graphics/entity/ores/hr-aluminum-ore.xcf diff --git a/graphics/icons/acsr-cable.xcf b/sources/graphics/icons/acsr-cable.xcf similarity index 100% rename from graphics/icons/acsr-cable.xcf rename to sources/graphics/icons/acsr-cable.xcf diff --git a/graphics/icons/alumina-1.xcf b/sources/graphics/icons/alumina-1.xcf similarity index 100% rename from graphics/icons/alumina-1.xcf rename to sources/graphics/icons/alumina-1.xcf diff --git a/graphics/icons/alumina-2.xcf b/sources/graphics/icons/alumina-2.xcf similarity index 100% rename from graphics/icons/alumina-2.xcf rename to sources/graphics/icons/alumina-2.xcf diff --git a/graphics/icons/alumina-3.xcf b/sources/graphics/icons/alumina-3.xcf similarity index 100% rename from graphics/icons/alumina-3.xcf rename to sources/graphics/icons/alumina-3.xcf diff --git a/graphics/icons/alumina.blend b/sources/graphics/icons/alumina.blend similarity index 100% rename from graphics/icons/alumina.blend rename to sources/graphics/icons/alumina.blend diff --git a/graphics/icons/alumina.blend1 b/sources/graphics/icons/alumina.blend1 similarity index 100% rename from graphics/icons/alumina.blend1 rename to sources/graphics/icons/alumina.blend1 diff --git a/graphics/icons/alumina.xcf b/sources/graphics/icons/alumina.xcf similarity index 100% rename from graphics/icons/alumina.xcf rename to sources/graphics/icons/alumina.xcf diff --git a/graphics/icons/aluminum-2219.xcf b/sources/graphics/icons/aluminum-2219.xcf similarity index 100% rename from graphics/icons/aluminum-2219.xcf rename to sources/graphics/icons/aluminum-2219.xcf diff --git a/graphics/icons/aluminum-6061.xcf b/sources/graphics/icons/aluminum-6061.xcf similarity index 100% rename from graphics/icons/aluminum-6061.xcf rename to sources/graphics/icons/aluminum-6061.xcf diff --git a/graphics/icons/aluminum-cable.xcf b/sources/graphics/icons/aluminum-cable.xcf similarity index 100% rename from graphics/icons/aluminum-cable.xcf rename to sources/graphics/icons/aluminum-cable.xcf diff --git a/graphics/icons/aluminum-ingot.xcf b/sources/graphics/icons/aluminum-ingot.xcf similarity index 100% rename from graphics/icons/aluminum-ingot.xcf rename to sources/graphics/icons/aluminum-ingot.xcf diff --git a/graphics/icons/aluminum-ore-2.xcf b/sources/graphics/icons/aluminum-ore-2.xcf similarity index 100% rename from graphics/icons/aluminum-ore-2.xcf rename to sources/graphics/icons/aluminum-ore-2.xcf diff --git a/graphics/icons/aluminum-ore-3.xcf b/sources/graphics/icons/aluminum-ore-3.xcf similarity index 100% rename from graphics/icons/aluminum-ore-3.xcf rename to sources/graphics/icons/aluminum-ore-3.xcf diff --git a/graphics/icons/aluminum-ore-4.xcf b/sources/graphics/icons/aluminum-ore-4.xcf similarity index 100% rename from graphics/icons/aluminum-ore-4.xcf rename to sources/graphics/icons/aluminum-ore-4.xcf diff --git a/graphics/icons/aluminum-ore-powder.xcf b/sources/graphics/icons/aluminum-ore-powder.xcf similarity index 100% rename from graphics/icons/aluminum-ore-powder.xcf rename to sources/graphics/icons/aluminum-ore-powder.xcf diff --git a/graphics/icons/aluminum-ore.xcf b/sources/graphics/icons/aluminum-ore.xcf similarity index 100% rename from graphics/icons/aluminum-ore.xcf rename to sources/graphics/icons/aluminum-ore.xcf diff --git a/graphics/icons/aluminum-plate.xcf b/sources/graphics/icons/aluminum-plate.xcf similarity index 100% rename from graphics/icons/aluminum-plate.xcf rename to sources/graphics/icons/aluminum-plate.xcf diff --git a/graphics/icons/automation-core.xcf b/sources/graphics/icons/automation-core.xcf similarity index 100% rename from graphics/icons/automation-core.xcf rename to sources/graphics/icons/automation-core.xcf diff --git a/graphics/icons/enriched-aluminum-1.xcf b/sources/graphics/icons/enriched-aluminum-1.xcf similarity index 100% rename from graphics/icons/enriched-aluminum-1.xcf rename to sources/graphics/icons/enriched-aluminum-1.xcf diff --git a/graphics/icons/enriched-aluminum-2.xcf b/sources/graphics/icons/enriched-aluminum-2.xcf similarity index 100% rename from graphics/icons/enriched-aluminum-2.xcf rename to sources/graphics/icons/enriched-aluminum-2.xcf diff --git a/graphics/icons/enriched-aluminum-3.xcf b/sources/graphics/icons/enriched-aluminum-3.xcf similarity index 100% rename from graphics/icons/enriched-aluminum-3.xcf rename to sources/graphics/icons/enriched-aluminum-3.xcf diff --git a/graphics/icons/enriched-aluminum.xcf b/sources/graphics/icons/enriched-aluminum.xcf similarity index 100% rename from graphics/icons/enriched-aluminum.xcf rename to sources/graphics/icons/enriched-aluminum.xcf diff --git a/graphics/icons/molten-aluminum.xcf b/sources/graphics/icons/molten-aluminum.xcf similarity index 100% rename from graphics/icons/molten-aluminum.xcf rename to sources/graphics/icons/molten-aluminum.xcf diff --git a/graphics/icons/spark-plug.xcf b/sources/graphics/icons/spark-plug.xcf similarity index 100% rename from graphics/icons/spark-plug.xcf rename to sources/graphics/icons/spark-plug.xcf diff --git a/graphics/icons/stacked/acsr-cable-stacked.xcf b/sources/graphics/icons/stacked/acsr-cable-stacked.xcf similarity index 100% rename from graphics/icons/stacked/acsr-cable-stacked.xcf rename to sources/graphics/icons/stacked/acsr-cable-stacked.xcf diff --git a/graphics/icons/stacked/alumina-stacked.xcf b/sources/graphics/icons/stacked/alumina-stacked.xcf similarity index 100% rename from graphics/icons/stacked/alumina-stacked.xcf rename to sources/graphics/icons/stacked/alumina-stacked.xcf diff --git a/graphics/icons/stacked/aluminum-2219-stacked.xcf b/sources/graphics/icons/stacked/aluminum-2219-stacked.xcf similarity index 100% rename from graphics/icons/stacked/aluminum-2219-stacked.xcf rename to sources/graphics/icons/stacked/aluminum-2219-stacked.xcf diff --git a/graphics/icons/stacked/aluminum-6061-stacked.xcf b/sources/graphics/icons/stacked/aluminum-6061-stacked.xcf similarity index 100% rename from graphics/icons/stacked/aluminum-6061-stacked.xcf rename to sources/graphics/icons/stacked/aluminum-6061-stacked.xcf diff --git a/graphics/icons/stacked/aluminum-ore-stacked.xcf b/sources/graphics/icons/stacked/aluminum-ore-stacked.xcf similarity index 100% rename from graphics/icons/stacked/aluminum-ore-stacked.xcf rename to sources/graphics/icons/stacked/aluminum-ore-stacked.xcf diff --git a/graphics/icons/stacked/aluminum-plate-stacked.xcf b/sources/graphics/icons/stacked/aluminum-plate-stacked.xcf similarity index 100% rename from graphics/icons/stacked/aluminum-plate-stacked.xcf rename to sources/graphics/icons/stacked/aluminum-plate-stacked.xcf diff --git a/graphics/icons/stacked/automation-core-stacked.xcf b/sources/graphics/icons/stacked/automation-core-stacked.xcf similarity index 100% rename from graphics/icons/stacked/automation-core-stacked.xcf rename to sources/graphics/icons/stacked/automation-core-stacked.xcf diff --git a/graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf b/sources/graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf similarity index 100% rename from graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf rename to sources/graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf diff --git a/graphics/icons/stacked/spark-plug-stacked.xcf b/sources/graphics/icons/stacked/spark-plug-stacked.xcf similarity index 100% rename from graphics/icons/stacked/spark-plug-stacked.xcf rename to sources/graphics/icons/stacked/spark-plug-stacked.xcf diff --git a/graphics/icons/stacked/ti-sapphire-stacked.xcf b/sources/graphics/icons/stacked/ti-sapphire-stacked.xcf similarity index 100% rename from graphics/icons/stacked/ti-sapphire-stacked.xcf rename to sources/graphics/icons/stacked/ti-sapphire-stacked.xcf diff --git a/graphics/icons/ti-sapphire.xcf b/sources/graphics/icons/ti-sapphire.xcf similarity index 100% rename from graphics/icons/ti-sapphire.xcf rename to sources/graphics/icons/ti-sapphire.xcf diff --git a/graphics/technology/automation-core.xcf b/sources/graphics/technology/automation-core.xcf similarity index 100% rename from graphics/technology/automation-core.xcf rename to sources/graphics/technology/automation-core.xcf diff --git a/graphics/technology/reinforced-cable.xcf b/sources/graphics/technology/reinforced-cable.xcf similarity index 100% rename from graphics/technology/reinforced-cable.xcf rename to sources/graphics/technology/reinforced-cable.xcf diff --git a/thumbnail.xcf b/sources/thumbnail.xcf similarity index 100% rename from thumbnail.xcf rename to sources/thumbnail.xcf