Restructure repository

Makefile

@@ -1,37 +0,0 @@
-# General makefile for factorio mods.
-#
-# Presumes the development work is done in a <factoriodir>/dev/<modname>/
-# directory where this makefile resides.  This directory must be parallel to
-# the <factoriodir>/mods/ directory where mods are installed. Run `make
-# install` from dev/<modname> 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
-

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)

aluminum-ore.lua

@@ -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
-  },
-})

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,

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,
       }

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
+  },
+})

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

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},

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",

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}
             },
         } 
     },

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
 

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."
 }

bzaluminum2/me.lua

@@ -1,6 +1,6 @@
 local me = {}
 
-me.name = "bzaluminum"
+me.name = "bzaluminum2"
 me.list = {}
 
 

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({

migrations/bzaluminum.0.2.0.json

@@ -1,7 +0,0 @@
-{
-  "item":
-  [
-    ["el_aluminum_item", "aluminum-plate"]
-  ]
-}
-