From 7c81b24442c2ac9a5a7e148ad15724d7aeaea4ff Mon Sep 17 00:00:00 2001
From: Simon Brodtmann <github@accounts.brodtmann.info>
Date: Sun, 19 Oct 2025 17:21:08 +0200
Subject: [PATCH] Rename mod

---
 bzcarbon2/carbon-matter.lua                   |  2 +-
 bzcarbon2/carbon-recipe-final-stacking.lua    | 18 +++---
 bzcarbon2/carbon-recipe-k2.lua                |  6 +-
 bzcarbon2/carbon-recipe-se.lua                |  2 +-
 bzcarbon2/carbon-recipe.lua                   | 62 +++++++++----------
 bzcarbon2/carbon-util.lua                     |  6 +-
 bzcarbon2/data-final-fixes.lua                |  2 +-
 bzcarbon2/info.json                           |  6 +-
 bzcarbon2/me.lua                              |  2 +-
 bzcarbon2/prototypes/activated-carbon.lua     |  6 +-
 .../prototypes/carbon-asteroid-updates.lua    |  4 +-
 bzcarbon2/prototypes/carbon-fiber.lua         |  8 +--
 bzcarbon2/prototypes/diamond-particle.lua     | 16 ++---
 bzcarbon2/prototypes/diamond.lua              | 16 ++---
 bzcarbon2/prototypes/graphite-particle.lua    | 16 ++---
 bzcarbon2/prototypes/graphite.lua             | 16 ++---
 bzcarbon2/strange-matter.lua                  |  2 +-
 17 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/bzcarbon2/carbon-matter.lua b/bzcarbon2/carbon-matter.lua
index d62bd8d..0fbb9df 100644
--- a/bzcarbon2/carbon-matter.lua
+++ b/bzcarbon2/carbon-matter.lua
@@ -14,7 +14,7 @@ data:extend(
         icon_size = 256,
       },
       {
-        icon = "__bzcarbon__/graphics/icons/diamond.png",
+        icon = "__bzcarbon2__/graphics/icons/diamond.png",
         icon_size = 128,
         scale = 0.7,
       }
diff --git a/bzcarbon2/carbon-recipe-final-stacking.lua b/bzcarbon2/carbon-recipe-final-stacking.lua
index b57cf81..b23d169 100644
--- a/bzcarbon2/carbon-recipe-final-stacking.lua
+++ b/bzcarbon2/carbon-recipe-final-stacking.lua
@@ -3,20 +3,20 @@
 local util = require("data-util");
 
 if deadlock and deadlock["add_stack"] then
-  deadlock.add_stack("flake-graphite",  "__bzcarbon__/graphics/icons/stacked/flake-graphite-stacked.png", "deadlock-stacking-1", 64)
-  deadlock.add_stack("graphite",  "__bzcarbon__/graphics/icons/stacked/graphite-stacked.png", "deadlock-stacking-1", 128)
-  deadlock.add_stack("diamond", "__bzcarbon__/graphics/icons/stacked/diamond-stacked.png" , "deadlock-stacking-2", 128)
-  deadlock.add_stack("graphene", "__bzcarbon__/graphics/icons/stacked/graphene-stacked.png" , "deadlock-stacking-2", 128)
-  deadlock.add_stack("crucible", "__bzcarbon__/graphics/icons/stacked/crucible-stacked.png" , "deadlock-stacking-2", 128)
+  deadlock.add_stack("flake-graphite",  "__bzcarbon2__/graphics/icons/stacked/flake-graphite-stacked.png", "deadlock-stacking-1", 64)
+  deadlock.add_stack("graphite",  "__bzcarbon2__/graphics/icons/stacked/graphite-stacked.png", "deadlock-stacking-1", 128)
+  deadlock.add_stack("diamond", "__bzcarbon2__/graphics/icons/stacked/diamond-stacked.png" , "deadlock-stacking-2", 128)
+  deadlock.add_stack("graphene", "__bzcarbon2__/graphics/icons/stacked/graphene-stacked.png" , "deadlock-stacking-2", 128)
+  deadlock.add_stack("crucible", "__bzcarbon2__/graphics/icons/stacked/crucible-stacked.png" , "deadlock-stacking-2", 128)
   if util.me.use_fullerenes() then
-    deadlock.add_stack("fullerenes",  "__bzcarbon__/graphics/icons/stacked/fullerene-stacked.png", "deadlock-stacking-2", 128)
-    deadlock.add_stack("nanotubes",  "__bzcarbon__/graphics/icons/stacked/nanotube-stacked.png", "deadlock-stacking-2", 128)
+    deadlock.add_stack("fullerenes",  "__bzcarbon2__/graphics/icons/stacked/fullerene-stacked.png", "deadlock-stacking-2", 128)
+    deadlock.add_stack("nanotubes",  "__bzcarbon2__/graphics/icons/stacked/nanotube-stacked.png", "deadlock-stacking-2", 128)
   end
   if util.me.use_carbon_black() then
-    deadlock.add_stack("carbon-black",  "__bzcarbon__/graphics/icons/stacked/carbon-black-stacked.png", "deadlock-stacking-2", 64)
+    deadlock.add_stack("carbon-black",  "__bzcarbon2__/graphics/icons/stacked/carbon-black-stacked.png", "deadlock-stacking-2", 64)
   end
   if util.me.use_rough_diamond() then
-    deadlock.add_stack("rough-diamond", "__bzcarbon__/graphics/icons/stacked/rough-diamond-stacked.png" , "deadlock-stacking-2", 64)
+    deadlock.add_stack("rough-diamond", "__bzcarbon2__/graphics/icons/stacked/rough-diamond-stacked.png" , "deadlock-stacking-2", 64)
   end
 end
 
diff --git a/bzcarbon2/carbon-recipe-k2.lua b/bzcarbon2/carbon-recipe-k2.lua
index 1b42ba0..473d144 100644
--- a/bzcarbon2/carbon-recipe-k2.lua
+++ b/bzcarbon2/carbon-recipe-k2.lua
@@ -14,7 +14,7 @@ data:extend({
     name = "enriched-graphite",
     main_product = "graphite",
     icons = {
-          { icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128},
+          { icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128},
           { icon = util.k2assets().."/icons/fluids/hydrogen-chloride.png", icon_size = 64, scale=0.25,  icon_mipmaps = 3, shift= {-8, -8}},
         },
     category = "chemistry",
@@ -85,7 +85,7 @@ data:extend({
       icons =
       {
         {
-          icon = "__bzcarbon__/graphics/icons/graphite.png",
+          icon = "__bzcarbon2__/graphics/icons/graphite.png",
           icon_size = 128,
         },
         {
@@ -130,7 +130,7 @@ data:extend({
     name = "heavy-water-graphene",
     icons = {
           { icon = util.k2assets().."/icons/fluids/heavy-water.png", icon_size = 64, icon_mipmaps = 3,},
-          { icon = "__bzcarbon__/graphics/icons/graphene.png", icon_size = 128,  scale=0.25, shift= {-8, -8}},
+          { icon = "__bzcarbon2__/graphics/icons/graphene.png", icon_size = 128,  scale=0.25, shift= {-8, -8}},
         },
     category = "kr-electrolysis",
     subgroup = "fluid-recipes",
diff --git a/bzcarbon2/carbon-recipe-se.lua b/bzcarbon2/carbon-recipe-se.lua
index 485ee8a..a46a9f5 100644
--- a/bzcarbon2/carbon-recipe-se.lua
+++ b/bzcarbon2/carbon-recipe-se.lua
@@ -43,7 +43,7 @@ data:extend({
       },
       icons =
       {
-        { icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128},
+        { icon = "__bzcarbon2__/graphics/icons/diamond.png", icon_size = 128},
         { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}},
       },
     },
diff --git a/bzcarbon2/carbon-recipe.lua b/bzcarbon2/carbon-recipe.lua
index 18b023d..f2d3d03 100644
--- a/bzcarbon2/carbon-recipe.lua
+++ b/bzcarbon2/carbon-recipe.lua
@@ -20,12 +20,12 @@ data:extend({
   {
     type = "item",
     name = "graphite",
-    icon = "__bzcarbon__/graphics/icons/graphite.png",
+    icon = "__bzcarbon2__/graphics/icons/graphite.png",
     icon_size = 128,
     pictures = {
-      {filename="__bzcarbon__/graphics/icons/graphite.png", size=128, scale=0.25},
-      {filename="__bzcarbon__/graphics/icons/graphite-1.png", size=128, scale=0.25},
-      {filename="__bzcarbon__/graphics/icons/graphite-2.png", size=128, scale=0.25},
+      {filename="__bzcarbon2__/graphics/icons/graphite.png", size=128, scale=0.25},
+      {filename="__bzcarbon2__/graphics/icons/graphite-1.png", size=128, scale=0.25},
+      {filename="__bzcarbon2__/graphics/icons/graphite-2.png", size=128, scale=0.25},
     },
     inventory_move_sound = item_sounds.sulfur_inventory_move,
     pick_sound = item_sounds.resource_inventory_pickup,
@@ -42,8 +42,8 @@ data:extend({
     order = "d[graphite]",
     icons = (util.k2() and
         {
-          { icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128},
-          { icon = "__bzcarbon__/graphics/icons/flake-graphite.png", icon_size = 128, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
+          { icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128},
+          { icon = "__bzcarbon2__/graphics/icons/flake-graphite.png", icon_size = 128, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
         } or nil),
     -- normal = (util.k2() and
     --     {
@@ -70,7 +70,7 @@ data:extend({
     type = "technology",
     name = "graphite-processing",
     icon_size = 128,
-    icon = "__bzcarbon__/graphics/icons/graphite.png",
+    icon = "__bzcarbon2__/graphics/icons/graphite.png",
     effects = {},
     unit =
     {
@@ -93,7 +93,7 @@ if not util.me.use_flake_graphite() then
       {
         type = "recipe",
         name = "graphite",
-        icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size=128,
+        icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size=128,
         category = mods.bzfoundry2 and "founding" or "crafting",
         order = "d[graphite]",
         enabled = false,
@@ -107,7 +107,7 @@ if not util.me.use_flake_graphite() then
       {
         type = "recipe",
         name = "graphite",
-        icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size=128,
+        icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size=128,
         category = mods.bzfoundry2 and "founding" or "crafting",
         subgroup = data.raw.item.graphite.subgroup,
         order = "d[graphite]",
@@ -174,7 +174,7 @@ data:extend({
   {
     type = "item",
     name = "diamond",
-    icon = "__bzcarbon__/graphics/icons/diamond.png",
+    icon = "__bzcarbon2__/graphics/icons/diamond.png",
     inventory_move_sound = item_sounds.brick_inventory_move,
     pick_sound = item_sounds.brick_inventory_pickup,
     drop_sound = item_sounds.brick_inventory_move,
@@ -191,8 +191,8 @@ data:extend({
     order = "d[diamond]",
     icons = (util.me.use_rough_diamond() and
         {
-          { icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128},
-          { icon = "__bzcarbon__/graphics/icons/graphite-2.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
+          { icon = "__bzcarbon2__/graphics/icons/diamond.png", icon_size = 128},
+          { icon = "__bzcarbon2__/graphics/icons/graphite-2.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
         } or nil),
     allow_productivity=true,
     enabled = false,
@@ -215,9 +215,9 @@ data:extend({
     order = "d[diamond]",
     icons = (util.k2() and
         {
-          { icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128},
-          { icon = "__bzcarbon__/graphics/icons/rough-diamond.png", icon_size = 64, scale=0.25, shift= {-8, -8}},
-        } or  {{ icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128}}),
+          { icon = "__bzcarbon2__/graphics/icons/diamond.png", icon_size = 128},
+          { icon = "__bzcarbon2__/graphics/icons/rough-diamond.png", icon_size = 64, scale=0.25, shift= {-8, -8}},
+        } or  {{ icon = "__bzcarbon2__/graphics/icons/diamond.png", icon_size = 128}}),
     -- normal = (util.k2() and
     --     {
     --       enabled = false,
@@ -250,7 +250,7 @@ data:extend({
     type = "technology",
     name = "diamond-processing",
     icon_size = 128,
-    icon = "__bzcarbon__/graphics/icons/diamond.png",
+    icon = "__bzcarbon2__/graphics/icons/diamond.png",
     effects =
     {
       {
@@ -282,7 +282,7 @@ data:extend({
   {
     type = "item",
     name = "graphene",
-    icon = "__bzcarbon__/graphics/icons/graphene.png",
+    icon = "__bzcarbon2__/graphics/icons/graphene.png",
     icon_size = 128,
     inventory_move_sound = item_sounds.plastic_inventory_move,
     pick_sound = item_sounds.plastic_inventory_pickup,
@@ -315,7 +315,7 @@ data:extend({
     type = "technology",
     name = "graphene",
     icon_size = 128,
-    icon = "__bzcarbon__/graphics/icons/graphene.png",
+    icon = "__bzcarbon2__/graphics/icons/graphene.png",
     effects =
     {
       {
@@ -361,7 +361,7 @@ data:extend({
   {
     type = "item",
     name = "fullerenes",
-    icon = "__bzcarbon__/graphics/icons/Fullerene.png",
+    icon = "__bzcarbon2__/graphics/icons/Fullerene.png",
     icon_size = 128,
     inventory_move_sound = item_sounds.plastic_inventory_move,
     pick_sound = item_sounds.plastic_inventory_pickup,
@@ -393,7 +393,7 @@ data:extend({
     type = "technology",
     name = "fullerenes",
     icon_size = 128,
-    icon = "__bzcarbon__/graphics/icons/Fullerene.png",
+    icon = "__bzcarbon2__/graphics/icons/Fullerene.png",
     effects =
     {
       {
@@ -418,7 +418,7 @@ data:extend({
   {
     type = "item",
     name = "nanotubes",
-    icon = "__bzcarbon__/graphics/icons/nanotube.png",
+    icon = "__bzcarbon2__/graphics/icons/nanotube.png",
     icon_size = 128,
     inventory_move_sound = item_sounds.plastic_inventory_move,
     pick_sound = item_sounds.plastic_inventory_pickup,
@@ -432,7 +432,7 @@ data:extend({
     type = "recipe",
     name = "nanotubes",
     main_product = "nanotubes",
-    icon = "__bzcarbon__/graphics/icons/nanotube.png",
+    icon = "__bzcarbon2__/graphics/icons/nanotube.png",
     icon_size = 128,
     category = "chemistry",
     subgroup = "intermediate-product",
@@ -456,7 +456,7 @@ data:extend({
     type = "technology",
     name = "nanotubes",
     icon_size = 128,
-    icon = "__bzcarbon__/graphics/icons/nanotube.png",
+    icon = "__bzcarbon2__/graphics/icons/nanotube.png",
     effects =
     {
       {
@@ -498,7 +498,7 @@ data:extend({
   {
     type = "item",
     name = "carbon-black",
-    icon = "__bzcarbon__/graphics/icons/carbon-black.png",
+    icon = "__bzcarbon2__/graphics/icons/carbon-black.png",
     icon_size = 64,
     inventory_move_sound = item_sounds.sulfur_inventory_move,
     pick_sound = item_sounds.resource_inventory_pickup,
@@ -511,7 +511,7 @@ data:extend({
   {
     type = "recipe",
     name = "carbon-black",
-    icon = "__bzcarbon__/graphics/icons/carbon-black.png",
+    icon = "__bzcarbon2__/graphics/icons/carbon-black.png",
     icon_size = 64, icon_mipmaps = 3,
     category = "chemistry",
     order = "d[graphite-carbon-black]",
@@ -529,8 +529,8 @@ data:extend({
     type = "recipe",
     name = "graphite-carbon-black",
     icons = {
-      { icon = "__bzcarbon__/graphics/icons/carbon-black.png", icon_size = 64, icon_mipmaps = 3},
-      { icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128},
+      { icon = "__bzcarbon2__/graphics/icons/carbon-black.png", icon_size = 64, icon_mipmaps = 3},
+      { icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128},
     },
     category = "chemistry",
     order = "d[graphite]",
@@ -550,7 +550,7 @@ data:extend({
 {
   type = "item",
   name = "crucible",
-  icon = "__bzcarbon__/graphics/icons/crucible.png", icon_size = 128,
+  icon = "__bzcarbon2__/graphics/icons/crucible.png", icon_size = 128,
   inventory_move_sound = item_sounds.brick_inventory_move,
   pick_sound = item_sounds.brick_inventory_pickup,
   drop_sound = item_sounds.brick_inventory_move,
@@ -618,8 +618,8 @@ if mods["space-age"] then
     type = "recipe",
     name = "graphitization",
     icons = {
-      {icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128},
-      {icon = "__bzcarbon__/graphics/icons/rough-diamond.png", icon_size = 128, scale = 0.125, shift={-8,-8}},
+      {icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128},
+      {icon = "__bzcarbon2__/graphics/icons/rough-diamond.png", icon_size = 128, scale = 0.125, shift={-8,-8}},
     },
     category = "smelting",
     order = "d[graphite]",
@@ -639,7 +639,7 @@ if mods["space-age"] then
     type = "technology",
     name = "diamond-processing-2",
     icon_size = 128,
-    icon = "__bzcarbon__/graphics/icons/diamond.png",
+    icon = "__bzcarbon2__/graphics/icons/diamond.png",
     effects =
     {
       {
diff --git a/bzcarbon2/carbon-util.lua b/bzcarbon2/carbon-util.lua
index f9a0554..d5ece5a 100644
--- a/bzcarbon2/carbon-util.lua
+++ b/bzcarbon2/carbon-util.lua
@@ -15,18 +15,18 @@ function cutil.nanotube_recipe(recipe_name, item_name, tech)
     new_recipe.localised_name = {"recipe-name."..recipe_name}
     new_recipe.icons = {
         { icon = data.raw.recipe[recipe_name].icon, icon_size = data.raw.recipe[recipe_name].icon_size},
-        { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
+        { icon = "__bzcarbon2__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
       }
   else
     new_recipe.localised_name = {"item-name."..item_name}
     if new_recipe.icons and #new_recipe.icons > 1 then
       table.insert(new_recipe.icons,
-          { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}
+          { icon = "__bzcarbon2__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}
       )
     else
       new_recipe.icons = {
           { icon = data.raw.item[item_name].icon, icon_size = data.raw.item[item_name].icon_size},
-          { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
+          { icon = "__bzcarbon2__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
         }
     end
   end
diff --git a/bzcarbon2/data-final-fixes.lua b/bzcarbon2/data-final-fixes.lua
index 4f82089..d621509 100644
--- a/bzcarbon2/data-final-fixes.lua
+++ b/bzcarbon2/data-final-fixes.lua
@@ -21,7 +21,7 @@ if data.raw.recipe["supercapacitor"] then
   new_recipe.localised_name = {"item-name.supercapacitor"}
   new_recipe.icons = {
       { icon = data.raw.item["supercapacitor"].icon, icon_size = data.raw.item["supercapacitor"].icon_size},
-      { icon = "__bzcarbon__/graphics/icons/graphene.png", icon_size = 128, scale=0.125, shift= {-8, -8}, tint={1,1,1}},
+      { icon = "__bzcarbon2__/graphics/icons/graphene.png", icon_size = 128, scale=0.125, shift= {-8, -8}, tint={1,1,1}},
     }
   new_recipe.icon = nil
   new_recipe.icon_size = nil
diff --git a/bzcarbon2/info.json b/bzcarbon2/info.json
index 6c82cf1..cf9015a 100644
--- a/bzcarbon2/info.json
+++ b/bzcarbon2/info.json
@@ -1,8 +1,8 @@
 {
-    "name": "bzcarbon",
-    "version": "2.0.21",
+    "name": "bzcarbon2",
+    "version": "2.0.22",
     "factorio_version": "2.0",
-    "title": "Graphite & Diamonds",
+    "title": "Graphite & Diamonds - Legacy",
     "author": "Brevven",
     "contact": "",
     "homepage": "",
diff --git a/bzcarbon2/me.lua b/bzcarbon2/me.lua
index d749a88..c63d486 100644
--- a/bzcarbon2/me.lua
+++ b/bzcarbon2/me.lua
@@ -1,6 +1,6 @@
 local me = {}
 
-me.name = "bzcarbon"
+me.name = "bzcarbon2"
 me.resources = {} -- see end of file
 
 me.list = {}
diff --git a/bzcarbon2/prototypes/activated-carbon.lua b/bzcarbon2/prototypes/activated-carbon.lua
index 6b68a38..67774c8 100644
--- a/bzcarbon2/prototypes/activated-carbon.lua
+++ b/bzcarbon2/prototypes/activated-carbon.lua
@@ -7,7 +7,7 @@ if mods["wood-industry"] then precursor = "charcoal" end
   {
     type = "item",
     name = "activated-carbon",
-    icon = "__bzcarbon__/graphics/icons/activated-carbon.png",
+    icon = "__bzcarbon2__/graphics/icons/activated-carbon.png",
     icon_size = 128,
     subgroup = "intermediate-product",
     order = "g[activated-carbon]",
@@ -38,8 +38,8 @@ if mods["wood-industry"] then precursor = "charcoal" end
     name = "activated-carbon-black",
     localised_name = {"item-name.activated-carbon"},
     icons = {
-      { icon = "__bzcarbon__/graphics/icons/activated-carbon.png", icon_size = 128},
-      { icon = "__bzcarbon__/graphics/icons/carbon-black.png", icon_size = 64, scale = 0.25, shift = {-8, -8}},
+      { icon = "__bzcarbon2__/graphics/icons/activated-carbon.png", icon_size = 128},
+      { icon = "__bzcarbon2__/graphics/icons/carbon-black.png", icon_size = 64, scale = 0.25, shift = {-8, -8}},
     },
     category = "chemistry",
     order = "d[graphite-carbon-fiber]",
diff --git a/bzcarbon2/prototypes/carbon-asteroid-updates.lua b/bzcarbon2/prototypes/carbon-asteroid-updates.lua
index 866b6bb..174afc1 100644
--- a/bzcarbon2/prototypes/carbon-asteroid-updates.lua
+++ b/bzcarbon2/prototypes/carbon-asteroid-updates.lua
@@ -18,8 +18,8 @@ if mods["space-age"] then
       icons = 
       {
         {icon="__space-age__/graphics/icons/carbonic-asteroid-crushing.png", size=64},
-        {icon="__bzcarbon__/graphics/icons/flake-graphite.png", icon_size=128, scale=0.125, shift={8,0}},
-        {icon="__bzcarbon__/graphics/icons/rough-diamond.png", icon_size=128, scale=0.125, shift={-8,0}},
+        {icon="__bzcarbon2__/graphics/icons/flake-graphite.png", icon_size=128, scale=0.125, shift={8,0}},
+        {icon="__bzcarbon2__/graphics/icons/rough-diamond.png", icon_size=128, scale=0.125, shift={-8,0}},
       },
       category = "crushing",
       subgroup="space-crushing",
diff --git a/bzcarbon2/prototypes/carbon-fiber.lua b/bzcarbon2/prototypes/carbon-fiber.lua
index 6d7febd..492304d 100644
--- a/bzcarbon2/prototypes/carbon-fiber.lua
+++ b/bzcarbon2/prototypes/carbon-fiber.lua
@@ -28,7 +28,7 @@ data:extend({
   {
     type = "item",
     name = "polyacrylonitrile",
-    icon = "__bzcarbon__/graphics/icons/pan.png",
+    icon = "__bzcarbon2__/graphics/icons/pan.png",
     icon_size = 128,
     subgroup = "intermediate-product",
     order = "g[graphite-acrylic-fiber]",
@@ -61,7 +61,7 @@ if mods["space-age"] then
   util.add_ingredient("polyacrylonitrile", "ammonia", 10)
   util.add_ingredient("carbon-fiber", "ammonia", 10)
   util.replace_ingredient("carbon-fiber", "carbon", "polyacrylonitrile")
-  util.set_item_icons("carbon-fiber", { {icon = "__bzcarbon__/graphics/icons/carbon-fiber.png", icon_size = 128,} })
+  util.set_item_icons("carbon-fiber", { {icon = "__bzcarbon2__/graphics/icons/carbon-fiber.png", icon_size = 128,} })
   util.add_unlock("biochamber", "ammonia-from-spoilage")
   util.add_unlock("carbon-fiber", "polyacrylonitrile")
 else
@@ -69,7 +69,7 @@ else
     {
       type = "item",
       name = "carbon-fiber",
-      icon = "__bzcarbon__/graphics/icons/carbon-fiber.png",
+      icon = "__bzcarbon2__/graphics/icons/carbon-fiber.png",
       icon_size = 128,
       subgroup = "intermediate-product",
       order = "g[graphite-carbon-fiber]",
@@ -97,7 +97,7 @@ else
       type = "technology",
       name = "carbon-fiber",
       icon_size = 256,
-      icon = "__bzcarbon__/graphics/technology/carbon-fiber.png",
+      icon = "__bzcarbon2__/graphics/technology/carbon-fiber.png",
       effects = {
         {type="unlock-recipe", recipe="polyacrylonitrile"},
         {type="unlock-recipe", recipe="carbon-fiber"},
diff --git a/bzcarbon2/prototypes/diamond-particle.lua b/bzcarbon2/prototypes/diamond-particle.lua
index b9aad21..1f7e885 100644
--- a/bzcarbon2/prototypes/diamond-particle.lua
+++ b/bzcarbon2/prototypes/diamond-particle.lua
@@ -8,7 +8,7 @@ data:extend(
     pictures =
     {
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-1.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-1.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -16,7 +16,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-2.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-2.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -24,7 +24,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-3.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-3.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -32,7 +32,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-4.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-4.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -43,7 +43,7 @@ data:extend(
     shadows =
     {
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-1.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-1.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -51,7 +51,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-2.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-2.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -59,7 +59,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-3.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-3.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -67,7 +67,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-4.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-4.png",
           priority = "extra-high",
           width = 32,
           height = 32,
diff --git a/bzcarbon2/prototypes/diamond.lua b/bzcarbon2/prototypes/diamond.lua
index 9dc97a1..0bc8c46 100644
--- a/bzcarbon2/prototypes/diamond.lua
+++ b/bzcarbon2/prototypes/diamond.lua
@@ -28,7 +28,7 @@ data:extend({
 	{
     type = "resource",
     name = "diamond",
-    icon = "__bzcarbon__/graphics/icons/rough-diamond.png",
+    icon = "__bzcarbon2__/graphics/icons/rough-diamond.png",
     icon_size = 128,
     flags = {"placeable-neutral"},
     order="a-b-a",
@@ -56,7 +56,7 @@ data:extend({
     {
       sheet =
       {
-        filename = "__bzcarbon__/graphics/entity/ores/hr-diamond.png",
+        filename = "__bzcarbon2__/graphics/entity/ores/hr-diamond.png",
         priority = "extra-high",
         size = 128,
         frame_count = 8,
@@ -69,13 +69,13 @@ data:extend({
       type = "item",
       name = "rough-diamond",
       icon_size = 128,
-      icon = "__bzcarbon__/graphics/icons/rough-diamond.png",
+      icon = "__bzcarbon2__/graphics/icons/rough-diamond.png",
       pictures = {
-        {filename="__bzcarbon__/graphics/icons/rough-diamond.png", size=128, scale=0.25},
-        {filename="__bzcarbon__/graphics/icons/rough-diamond-1.png", size=128, scale=0.25},
-        {filename="__bzcarbon__/graphics/icons/rough-diamond-2.png", size=128, scale=0.25},
-        {filename="__bzcarbon__/graphics/icons/rough-diamond-3.png", size=128, scale=0.25},
-        {filename="__bzcarbon__/graphics/icons/rough-diamond-4.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/rough-diamond.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/rough-diamond-1.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/rough-diamond-2.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/rough-diamond-3.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/rough-diamond-4.png", size=128, scale=0.25},
       },
       inventory_move_sound = item_sounds.resource_inventory_move,
       pick_sound = item_sounds.resource_inventory_pickup,
diff --git a/bzcarbon2/prototypes/graphite-particle.lua b/bzcarbon2/prototypes/graphite-particle.lua
index 703192f..12898a9 100644
--- a/bzcarbon2/prototypes/graphite-particle.lua
+++ b/bzcarbon2/prototypes/graphite-particle.lua
@@ -8,7 +8,7 @@ data:extend(
     pictures =
     {
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-1.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-1.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -16,7 +16,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-2.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-2.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -24,7 +24,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-3.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-3.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -32,7 +32,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-4.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-4.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -43,7 +43,7 @@ data:extend(
     shadows =
     {
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-1.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-1.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -51,7 +51,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-2.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-2.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -59,7 +59,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-3.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-3.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -67,7 +67,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-4.png",
+          filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-4.png",
           priority = "extra-high",
           width = 32,
           height = 32,
diff --git a/bzcarbon2/prototypes/graphite.lua b/bzcarbon2/prototypes/graphite.lua
index a4eaaa9..34d7293 100644
--- a/bzcarbon2/prototypes/graphite.lua
+++ b/bzcarbon2/prototypes/graphite.lua
@@ -28,7 +28,7 @@ data:extend({
 	{
     type = "resource",
     name = "graphite",
-    icon = "__bzcarbon__/graphics/icons/flake-graphite.png",
+    icon = "__bzcarbon2__/graphics/icons/flake-graphite.png",
     icon_size = 128,
     flags = {"placeable-neutral"},
     order="a-b-a",
@@ -60,7 +60,7 @@ data:extend({
     {
       sheet =
       {
-        filename = "__bzcarbon__/graphics/entity/ores/hr-graphite.png",
+        filename = "__bzcarbon2__/graphics/entity/ores/hr-graphite.png",
         priority = "extra-high",
         size = 128,
         frame_count = 8,
@@ -73,13 +73,13 @@ data:extend({
       type = "item",
       name = "flake-graphite",
       icon_size = 128, 
-      icon = "__bzcarbon__/graphics/icons/flake-graphite.png",
+      icon = "__bzcarbon2__/graphics/icons/flake-graphite.png",
       pictures = {
-        {filename="__bzcarbon__/graphics/icons/flake-graphite.png", size=128, scale=0.25},
-        {filename="__bzcarbon__/graphics/icons/flake-graphite-1.png", size=128, scale=0.25},
-        {filename="__bzcarbon__/graphics/icons/flake-graphite-2.png", size=128, scale=0.25},
-        {filename="__bzcarbon__/graphics/icons/flake-graphite-3.png", size=128, scale=0.25},
-        {filename="__bzcarbon__/graphics/icons/flake-graphite-4.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/flake-graphite.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/flake-graphite-1.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/flake-graphite-2.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/flake-graphite-3.png", size=128, scale=0.25},
+        {filename="__bzcarbon2__/graphics/icons/flake-graphite-4.png", size=128, scale=0.25},
       },
       inventory_move_sound = item_sounds.resource_inventory_move,
       pick_sound = item_sounds.resource_inventory_pickup,
diff --git a/bzcarbon2/strange-matter.lua b/bzcarbon2/strange-matter.lua
index b2b36a4..aff7bfa 100644
--- a/bzcarbon2/strange-matter.lua
+++ b/bzcarbon2/strange-matter.lua
@@ -1,7 +1,7 @@
 local util = require("data-util");
 
 local ore = "flake-graphite"
-local ore_icon = "__bzcarbon__/graphics/icons/flake-graphite.png"
+local ore_icon = "__bzcarbon2__/graphics/icons/flake-graphite.png"
 
 if util.me.use_flake_graphite() and mods["StrangeMatter"] then
 data:extend({