From d95ed353498a1fc96b3013804df33e1be475ba10 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Wed, 1 Apr 2026 20:18:55 -0700
Subject: [PATCH 01/38] Update functions.lua

---
 bobenemies/prototypes/functions.lua | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/bobenemies/prototypes/functions.lua b/bobenemies/prototypes/functions.lua
index 74b9c8fdb..45013ce55 100644
--- a/bobenemies/prototypes/functions.lua
+++ b/bobenemies/prototypes/functions.lua
@@ -693,6 +693,11 @@ function bobmods.enemies.new_biter(inputs)
     flags = { "placeable-neutral", "placeable-off-grid", "building-direction-8-way", "not-on-map" },
   })
 
+  table.remove(corpse_prototype.animation.layers)
+  corpse_prototype.animation_render_layer = "corpse"
+  corpse_prototype.final_render_layer = "corpse"
+  corpse_prototype.use_decay_layer = false
+  
   data:extend({ biter_prototype, corpse_prototype })
 end
 
@@ -1342,6 +1347,11 @@ function bobmods.enemies.new_spitter(inputs)
     flags = { "placeable-neutral", "placeable-off-grid", "building-direction-8-way", "not-on-map" },
   })
 
+  table.remove(corpse_prototype.animation.layers)
+  corpse_prototype.animation_render_layer = "corpse"
+  corpse_prototype.final_render_layer = "corpse"
+  corpse_prototype.use_decay_layer = false
+
   if not inputs.no_acid_stream == true then
     bobmods.enemies.acid_stream(inputs, final_scale)
   end
@@ -2815,6 +2825,10 @@ function bobmods.enemies.new_worm(inputs)
   worm_corpse_2.icon = "__base__/graphics/icons/big-worm-corpse.png"
   worm_corpse_1.localised_name = { "entity-name.bob-enemies-corpse" }
   worm_corpse_2.localised_name = { "entity-name.bob-enemies-corpse" }
+  worm_corpse_1.animation_render_layer = "corpse"
+  worm_corpse_2.animation_render_layer = "corpse"
+  worm_corpse_1.final_render_layer = "corpse"
+  worm_corpse_2.final_render_layer = "corpse"
 
   if inputs.tint2 then
     table.insert(
@@ -3170,9 +3184,19 @@ function bobmods.enemies.new_spawner(inputs)
       spawner_decay_animation(3, inputs.tint),
     },
     decay_frame_transition_duration = 360,
-    final_render_layer = "lower-object-above-shadow",
+    animation_render_layer = "corpse",
+    final_render_layer = "corpse",
   }
 
+  table.remove(spawner_corpse.animation[1].layers)
+  table.remove(spawner_corpse.animation[2].layers)
+  table.remove(spawner_corpse.animation[3].layers)
+  table.remove(spawner_corpse.animation[4].layers)
+  table.remove(spawner_corpse.decay_animation[1].layers)
+  table.remove(spawner_corpse.decay_animation[2].layers)
+  table.remove(spawner_corpse.decay_animation[3].layers)
+  table.remove(spawner_corpse.decay_animation[4].layers)
+
   if inputs.tint2 then
     table.insert(
       spawner_prototype.graphics_set.animations[1].layers,

From 9d479102326efc8cad104d59731a754f3121c150 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Sun, 5 Apr 2026 11:48:46 -0700
Subject: [PATCH 02/38] Update functions.lua

---
 bobenemies/prototypes/functions.lua | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/bobenemies/prototypes/functions.lua b/bobenemies/prototypes/functions.lua
index 45013ce55..74b9c8fdb 100644
--- a/bobenemies/prototypes/functions.lua
+++ b/bobenemies/prototypes/functions.lua
@@ -693,11 +693,6 @@ function bobmods.enemies.new_biter(inputs)
     flags = { "placeable-neutral", "placeable-off-grid", "building-direction-8-way", "not-on-map" },
   })
 
-  table.remove(corpse_prototype.animation.layers)
-  corpse_prototype.animation_render_layer = "corpse"
-  corpse_prototype.final_render_layer = "corpse"
-  corpse_prototype.use_decay_layer = false
-  
   data:extend({ biter_prototype, corpse_prototype })
 end
 
@@ -1347,11 +1342,6 @@ function bobmods.enemies.new_spitter(inputs)
     flags = { "placeable-neutral", "placeable-off-grid", "building-direction-8-way", "not-on-map" },
   })
 
-  table.remove(corpse_prototype.animation.layers)
-  corpse_prototype.animation_render_layer = "corpse"
-  corpse_prototype.final_render_layer = "corpse"
-  corpse_prototype.use_decay_layer = false
-
   if not inputs.no_acid_stream == true then
     bobmods.enemies.acid_stream(inputs, final_scale)
   end
@@ -2825,10 +2815,6 @@ function bobmods.enemies.new_worm(inputs)
   worm_corpse_2.icon = "__base__/graphics/icons/big-worm-corpse.png"
   worm_corpse_1.localised_name = { "entity-name.bob-enemies-corpse" }
   worm_corpse_2.localised_name = { "entity-name.bob-enemies-corpse" }
-  worm_corpse_1.animation_render_layer = "corpse"
-  worm_corpse_2.animation_render_layer = "corpse"
-  worm_corpse_1.final_render_layer = "corpse"
-  worm_corpse_2.final_render_layer = "corpse"
 
   if inputs.tint2 then
     table.insert(
@@ -3184,19 +3170,9 @@ function bobmods.enemies.new_spawner(inputs)
       spawner_decay_animation(3, inputs.tint),
     },
     decay_frame_transition_duration = 360,
-    animation_render_layer = "corpse",
-    final_render_layer = "corpse",
+    final_render_layer = "lower-object-above-shadow",
   }
 
-  table.remove(spawner_corpse.animation[1].layers)
-  table.remove(spawner_corpse.animation[2].layers)
-  table.remove(spawner_corpse.animation[3].layers)
-  table.remove(spawner_corpse.animation[4].layers)
-  table.remove(spawner_corpse.decay_animation[1].layers)
-  table.remove(spawner_corpse.decay_animation[2].layers)
-  table.remove(spawner_corpse.decay_animation[3].layers)
-  table.remove(spawner_corpse.decay_animation[4].layers)
-
   if inputs.tint2 then
     table.insert(
       spawner_prototype.graphics_set.animations[1].layers,

From 5f0325446635263d865e94bcfda53ada3249a33e Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:11:05 -0700
Subject: [PATCH 03/38] Update hard-mode-updates.lua

---
 bobrevamp/prototypes/hard-mode-updates.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bobrevamp/prototypes/hard-mode-updates.lua b/bobrevamp/prototypes/hard-mode-updates.lua
index 4b70a7de3..04ef6a352 100644
--- a/bobrevamp/prototypes/hard-mode-updates.lua
+++ b/bobrevamp/prototypes/hard-mode-updates.lua
@@ -18,8 +18,13 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true
 
   bobmods.lib.tech.add_recipe_unlock("bob-chemical-processing-2", "bob-limestone")
 
-  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-sodium-chlorate")
-  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-sodium-perchlorate")
+  if not mods["space-age"] then
+    bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-sodium-chlorate")
+    bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-sodium-perchlorate")
+  else
+    bobmods.lib.tech.add_recipe_unlock("lithium-processing", "bob-sodium-chlorate")
+    bobmods.lib.tech.add_recipe_unlock("lithium-processing", "bob-sodium-perchlorate")
+  end
   if data.raw.fluid["bob-pure-water"] then
     bobmods.lib.recipe.replace_ingredient("bob-sodium-chlorate", "water", "bob-pure-water")
     bobmods.lib.recipe.replace_ingredient("bob-sodium-perchlorate", "water", "bob-pure-water")

From 20e135982262f4ee0ae89a6ee09a97d0b3a391ac Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:45:12 -0700
Subject: [PATCH 04/38] Update nuclear-recipe.lua

---
 bobplates/prototypes/recipe/nuclear-recipe.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bobplates/prototypes/recipe/nuclear-recipe.lua b/bobplates/prototypes/recipe/nuclear-recipe.lua
index 446320da0..1484e997e 100644
--- a/bobplates/prototypes/recipe/nuclear-recipe.lua
+++ b/bobplates/prototypes/recipe/nuclear-recipe.lua
@@ -249,7 +249,7 @@ data:extend({
         ignored_by_productivity = 10,
         ignored_by_stats = 10,
       },
-      { type = "item", name = "bob-lithium", amount = 1, probability = 0.1 },
+      { type = "item", name = "lithium", amount = 1, probability = 0.1 },
       { type = "item", name = "bob-fusion-catalyst", amount = 1 },
     },
     crafting_machine_tint = {

From 7a70d51b4f3b02245b8d24b969796511d3eafa34 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:46:17 -0700
Subject: [PATCH 05/38] Update plates-recipe.lua

---
 bobplates/prototypes/recipe/plates-recipe.lua | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/bobplates/prototypes/recipe/plates-recipe.lua b/bobplates/prototypes/recipe/plates-recipe.lua
index 7b1cbdf13..cc294c0d4 100644
--- a/bobplates/prototypes/recipe/plates-recipe.lua
+++ b/bobplates/prototypes/recipe/plates-recipe.lua
@@ -201,20 +201,25 @@ data:extend({
     allow_decomposition = false,
     allow_productivity = true,
   },
+})
 
-  {
-    type = "recipe",
-    name = "bob-lithium",
-    category = "bob-electrolysis",
-    subgroup = "bob-material-electrolysis",
-    energy_required = 3.2,
-    enabled = false,
-    auto_recycle = false,
-    ingredients = {
-      { type = "item", name = "bob-lithium-chloride", amount = 1 },
+if not mods["space-age"] then
+  data:extend({
+    {
+      type = "recipe",
+      name = "lithium",
+      localised_name = { "item-name.bob-lithium" },
+      category = "bob-electrolysis",
+      subgroup = "bob-material-electrolysis",
+      energy_required = 3.2,
+      enabled = false,
+      auto_recycle = false,
+      ingredients = {
+        { type = "item", name = "bob-lithium-chloride", amount = 1 },
+      },
+      results = { { type = "item", name = "lithium", amount = 1 } },
+      allow_decomposition = false,
+      allow_productivity = true,
     },
-    results = { { type = "item", name = "bob-lithium", amount = 1 } },
-    allow_decomposition = false,
-    allow_productivity = true,
-  },
-})
+  })
+end

From 0d246661caea276c0e46a271c0e0118d96924c75 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:47:40 -0700
Subject: [PATCH 06/38] Update resource-recipe.lua

---
 bobplates/prototypes/recipe/resource-recipe.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bobplates/prototypes/recipe/resource-recipe.lua b/bobplates/prototypes/recipe/resource-recipe.lua
index c3c89b377..b1f489041 100644
--- a/bobplates/prototypes/recipe/resource-recipe.lua
+++ b/bobplates/prototypes/recipe/resource-recipe.lua
@@ -142,7 +142,7 @@ data:extend({
     enabled = false,
     auto_recycle = false,
     ingredients = {
-      { type = "item", name = "bob-lithium", amount = 1 },
+      { type = "item", name = "lithium", amount = 1 },
       { type = "item", name = "bob-cobalt-oxide", amount = 1 },
     },
     results = { { type = "item", name = "bob-lithium-cobalt-oxide", amount = 2 } },

From 7391715fb4a93033bd955ba1d58773a7397327c1 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:49:07 -0700
Subject: [PATCH 07/38] Update data-final-fixes.lua

---
 bobplates/data-final-fixes.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bobplates/data-final-fixes.lua b/bobplates/data-final-fixes.lua
index ce7d20500..e6978c099 100644
--- a/bobplates/data-final-fixes.lua
+++ b/bobplates/data-final-fixes.lua
@@ -15,3 +15,7 @@ end
 if mods["aai-industry"] then
   bobmods.lib.tech.remove_recipe_unlock("glass-processing", "glass")
 end
+
+if mods["space-age"] then
+  bobmods.lib.tech.replace_prerequisite_in_all("bob-lithium-processing", "lithium-processing")
+end

From fb610ff161971278e10976784b23f4471ed52818 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:50:29 -0700
Subject: [PATCH 08/38] Add files via upload

---
 bobplates/migrations/bobplates_2.0.6.lua | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 bobplates/migrations/bobplates_2.0.6.lua

diff --git a/bobplates/migrations/bobplates_2.0.6.lua b/bobplates/migrations/bobplates_2.0.6.lua
new file mode 100644
index 000000000..8bafe7aaa
--- /dev/null
+++ b/bobplates/migrations/bobplates_2.0.6.lua
@@ -0,0 +1,5 @@
+for index, force in pairs(game.forces) do
+  if force.technologies["bob-lithium-processing"].researched and prototypes.technology["lithium-processing"] then
+    force.technologies["lithium-processing"].researched = true
+  end
+end
\ No newline at end of file

From 30395160dfcd91bd0df310a4671855a27b5342b6 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 16:51:38 -0700
Subject: [PATCH 09/38] Update plates.lua

---
 bobplates/prototypes/item/plates.lua | 31 +++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/bobplates/prototypes/item/plates.lua b/bobplates/prototypes/item/plates.lua
index 7f5e0246f..a576a3348 100644
--- a/bobplates/prototypes/item/plates.lua
+++ b/bobplates/prototypes/item/plates.lua
@@ -128,18 +128,6 @@ data:extend({
       volume = 0.6,
     },
   },
-  {
-    type = "item",
-    name = "bob-lithium",
-    icon = "__bobplates__/graphics/icons/plate/lithium-plate.png",
-    icon_size = 64,
-    subgroup = "bob-material",
-    order = "c-a-e[bob-lithium-plate]",
-    stack_size = 200,
-    drop_sound = plate_drop_move,
-    inventory_move_sound = plate_drop_move,
-    pick_sound = plate_pick,
-  },
   {
     type = "item",
     name = "bob-cobalt-plate",
@@ -153,3 +141,22 @@ data:extend({
     pick_sound = plate_pick,
   },
 })
+
+if not data.raw.item.lithium then
+  data:extend({
+    {
+      type = "item",
+      name = "lithium",
+      localised_name = { "item-name.bob-lithium" },
+      icon = "__bobplates__/graphics/icons/plate/lithium-plate.png",
+      icon_size = 64,
+      subgroup = "bob-material",
+      order = "c-a-e[bob-lithium-plate]",
+      stack_size = 200,
+      drop_sound = plate_drop_move,
+      inventory_move_sound = plate_drop_move,
+      pick_sound = plate_pick,
+      weight = 500,
+    },
+  })
+end

From 4c942c863a3dc28c37bf698a1c8b54b07c271f35 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:31:51 -0700
Subject: [PATCH 10/38] Update bobplates_2.0.6.json

---
 bobplates/migrations/bobplates_2.0.6.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.0.6.json
index fc3848149..29146f0eb 100644
--- a/bobplates/migrations/bobplates_2.0.6.json
+++ b/bobplates/migrations/bobplates_2.0.6.json
@@ -1,6 +1,17 @@
 {
+  "item":
+  [
+    ["bob-lithium-ion-battery", "bob-battery-2"],
+    ["lithium-ion-battery", "bob-battery-2"],
+    ["bob-silver-zinc-battery", "bob-battery-2"],
+    ["silver-zinc-battery", "bob-battery-2"]
+  ],
   "recipe":
   [
-    ["bob-heavy-water-electrolysis", "bob-deuterium"]
+    ["bob-heavy-water-electrolysis", "bob-deuterium"],
+    ["bob-lithium-ion-battery", "bob-battery-2"],
+    ["lithium-ion-battery", "bob-battery-2"],
+    ["bob-silver-zinc-battery", "bob-battery-2"],
+    ["silver-zinc-battery", "bob-battery-2"]
   ]
 }

From c00e373e97a749cdf4af1b2d295325c1106ca1a4 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:34:26 -0700
Subject: [PATCH 11/38] Update parts.lua

---
 bobplates/prototypes/item/parts.lua | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bobplates/prototypes/item/parts.lua b/bobplates/prototypes/item/parts.lua
index 9a38033cf..3b52f5db4 100644
--- a/bobplates/prototypes/item/parts.lua
+++ b/bobplates/prototypes/item/parts.lua
@@ -238,7 +238,8 @@ data:extend({
 
   {
     type = "item",
-    name = "bob-lithium-ion-battery",
+    name = "bob-battery-2",
+    localised_name = { "item-name.bob-lithium-ion-battery" },
     icon = "__bobplates__/graphics/icons/lithium-ion-battery.png",
     icon_size = 64,
     subgroup = "intermediate-product",
@@ -260,7 +261,8 @@ data:extend({
 
   {
     type = "item",
-    name = "bob-silver-zinc-battery",
+    name = "bob-battery-3",
+    localised_name = { "item-name.bob-silver-zinc-battery" },
     icon = "__bobplates__/graphics/icons/silver-zinc-battery.png",
     icon_size = 64,
     subgroup = "intermediate-product",
@@ -328,3 +330,11 @@ data:extend({
     },
   },
 })
+
+if mods["space-age"] then
+  data.raw.item["bob-battery-2"].localised_name = { "item-name.bob-silver-zinc-battery" }
+  data.raw.item["bob-battery-3"].localised_name = { "item-name.bob-lithium-ion-battery" }
+  data.raw.item["bob-battery-2"].icon = "__bobplates__/graphics/icons/silver-zinc-battery.png"
+  data.raw.item["bob-battery-3"].icon = "__bobplates__/graphics/icons/lithium-ion-battery.png"
+end
+

From 190953c2938c250361487d3ba214d3b1e443162e Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:35:29 -0700
Subject: [PATCH 12/38] Update parts-recipe.lua

---
 bobplates/prototypes/recipe/parts-recipe.lua | 25 ++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/bobplates/prototypes/recipe/parts-recipe.lua b/bobplates/prototypes/recipe/parts-recipe.lua
index d403aa409..c241b97ff 100644
--- a/bobplates/prototypes/recipe/parts-recipe.lua
+++ b/bobplates/prototypes/recipe/parts-recipe.lua
@@ -188,7 +188,7 @@ data:extend({
 
   {
     type = "recipe",
-    name = "bob-lithium-ion-battery",
+    name = "bob-battery-2",
     category = "chemistry",
     energy_required = 5,
     enabled = false,
@@ -198,7 +198,7 @@ data:extend({
       { type = "item", name = "bob-carbon", amount = 1 },
       { type = "item", name = "plastic-bar", amount = 1 },
     },
-    results = { { type = "item", name = "bob-lithium-ion-battery", amount = 1 } },
+    results = { { type = "item", name = "bob-battery-2", amount = 1 } },
     crafting_machine_tint = {
       primary = { r = 0.1, g = 1.0, b = 0.8, a = 1.000 },
       secondary = { r = 0.2, g = 0.6, b = 0.9, a = 1.000 },
@@ -210,7 +210,7 @@ data:extend({
 
   {
     type = "recipe",
-    name = "bob-silver-zinc-battery",
+    name = "bob-battery-3",
     category = "chemistry",
     energy_required = 5,
     enabled = false,
@@ -220,7 +220,7 @@ data:extend({
       { type = "item", name = "bob-zinc-plate", amount = 1 },
       { type = "item", name = "plastic-bar", amount = 1 },
     },
-    results = { { type = "item", name = "bob-silver-zinc-battery", amount = 1 } },
+    results = { { type = "item", name = "bob-battery-3", amount = 1 } },
     crafting_machine_tint = {
       primary = { r = 0.1, g = 1.0, b = 0.1, a = 1.000 },
       secondary = { r = 0.8, g = 0.8, b = 0.8, a = 1.000 },
@@ -258,3 +258,20 @@ data:extend({
     allow_productivity = true,
   },
 })
+
+if mods["space-age"] then
+  data.raw.recipe["bob-battery-2"].category = "chemistry-or-cryogenics"
+  data.raw.recipe["bob-battery-3"].category = "chemistry-or-cryogenics"
+  data.raw.recipe["bob-battery-2"].ingredients = {
+    { type = "item", name = "bob-sodium-hydroxide", amount = 2 },
+    { type = "item", name = "bob-silver-oxide", amount = 1 },
+    { type = "item", name = "bob-zinc-plate", amount = 1 },
+    { type = "item", name = "plastic-bar", amount = 1 },
+  }
+  data.raw.recipe["bob-battery-3"].ingredients = {
+    { type = "item", name = "bob-lithium-perchlorate", amount = 2 },
+    { type = "item", name = "bob-lithium-cobalt-oxide", amount = 1 },
+    { type = "item", name = "carbon", amount = 1 },
+    { type = "item", name = "plastic-bar", amount = 1 },
+  }
+end

From f582b42dec9eed82d5246510c3360ab3c008041c Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:36:06 -0700
Subject: [PATCH 13/38] Update technology.lua

---
 bobplates/prototypes/technology.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bobplates/prototypes/technology.lua b/bobplates/prototypes/technology.lua
index 45b86dde6..c3aaf1c86 100644
--- a/bobplates/prototypes/technology.lua
+++ b/bobplates/prototypes/technology.lua
@@ -967,7 +967,7 @@ data:extend({
       },
       {
         type = "unlock-recipe",
-        recipe = "bob-lithium-ion-battery",
+        recipe = "bob-battery-2",
       },
     },
     order = "b-c-a",
@@ -1007,7 +1007,7 @@ data:extend({
       },
       {
         type = "unlock-recipe",
-        recipe = "bob-silver-zinc-battery",
+        recipe = "bob-battery-3",
       },
     },
     order = "b-c-b",

From c25df54f3d4e16414e533e182d3903806c3d4a27 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:37:14 -0700
Subject: [PATCH 14/38] Update bobplates_2.0.6.json

---
 bobplates/migrations/bobplates_2.0.6.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.0.6.json
index 29146f0eb..36306fef1 100644
--- a/bobplates/migrations/bobplates_2.0.6.json
+++ b/bobplates/migrations/bobplates_2.0.6.json
@@ -1,6 +1,7 @@
 {
   "item":
   [
+    ["bob-lithium", "lithium"],
     ["bob-lithium-ion-battery", "bob-battery-2"],
     ["lithium-ion-battery", "bob-battery-2"],
     ["bob-silver-zinc-battery", "bob-battery-2"],
@@ -8,6 +9,7 @@
   ],
   "recipe":
   [
+    ["bob-lithium", "lithium"],
     ["bob-heavy-water-electrolysis", "bob-deuterium"],
     ["bob-lithium-ion-battery", "bob-battery-2"],
     ["lithium-ion-battery", "bob-battery-2"],

From 0e1dda20bb1e832f6edb41de277c17ab29b04c8a Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:38:29 -0700
Subject: [PATCH 15/38] Update bobplates_2.0.0.json

---
 bobplates/migrations/bobplates_2.0.0.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/bobplates/migrations/bobplates_2.0.0.json b/bobplates/migrations/bobplates_2.0.0.json
index 9be430568..affbf3f2f 100644
--- a/bobplates/migrations/bobplates_2.0.0.json
+++ b/bobplates/migrations/bobplates_2.0.0.json
@@ -121,10 +121,8 @@
     ["lead-plate", "bob-lead-plate"],
     ["liquid-fuel-barrel", "bob-liquid-fuel-barrel"],
     ["lithia-water-barrel", "bob-lithia-water-barrel"],
-    ["lithium", "bob-lithium"],
     ["lithium-chloride", "bob-lithium-chloride"],
     ["lithium-cobalt-oxide", "bob-lithium-cobalt-oxide"],
-    ["lithium-ion-battery", "bob-lithium-ion-battery"],
     ["lithium-perchlorate", "bob-lithium-perchlorate"],
     ["nickel-ore", "bob-nickel-ore"],
     ["nickel-plate", "bob-nickel-plate"],
@@ -165,7 +163,6 @@
     ["silver-ore", "bob-silver-ore"],
     ["silver-oxide", "bob-silver-oxide"],
     ["silver-plate", "bob-silver-plate"],
-    ["silver-zinc-battery", "bob-silver-zinc-battery"],
     ["sodium-hydroxide", "bob-sodium-hydroxide"],
     ["steel-bearing", "bob-steel-bearing"],
     ["steel-bearing-ball", "bob-steel-bearing-ball"],
@@ -317,10 +314,8 @@
     ["liquid-air", "bob-liquid-air"],
     ["liquid-fuel", "bob-liquid-fuel"],
     ["lithia-water", "bob-lithia-water"],
-    ["lithium", "bob-lithium"],
     ["lithium-chloride", "bob-lithium-chloride"],
     ["lithium-cobalt-oxide", "bob-lithium-cobalt-oxide"],
-    ["lithium-ion-battery", "bob-lithium-ion-battery"],
     ["lithium-water-electrolysis", "bob-lithium-perchlorate"],
     ["nickel-plate", "bob-nickel-plate"],
     ["nitinol-alloy", "bob-nitinol-alloy"],
@@ -358,7 +353,6 @@
     ["silver-nitrate", "bob-silver-nitrate"],
     ["silver-oxide", "bob-silver-oxide"],
     ["silver-plate", "bob-silver-plate"],
-    ["silver-zinc-battery", "bob-silver-zinc-battery"],
     ["solid-fuel-from-hydrogen", "bob-solid-fuel-from-hydrogen"],
     ["steel-bearing", "bob-steel-bearing"],
     ["steel-bearing-ball", "bob-steel-bearing-ball"],

From 1b6ea6315564f33790202b8a0cc699d296678ca8 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:41:17 -0700
Subject: [PATCH 16/38] Update data-updates.lua

---
 bobplates/data-updates.lua | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/bobplates/data-updates.lua b/bobplates/data-updates.lua
index d05c5bef9..5801ca118 100644
--- a/bobplates/data-updates.lua
+++ b/bobplates/data-updates.lua
@@ -443,8 +443,8 @@ if mods["quality"] then
     "bob-steel-chemical-furnace",
     "bob-electric-chemical-furnace",
     "bob-polishing-wheel",
-    "bob-lithium-ion-battery",
-    "bob-silver-zinc-battery",
+    "bob-battery-2",
+    "bob-battery-3",
     "battery",
     "cargo-landing-pad",
     "rocket-silo",
@@ -455,8 +455,3 @@ if mods["quality"] then
     "quality-module-3",
   })
 end
-
-if mods["space-age"] then
-  data.raw.recipe["bob-lithium-ion-battery"].category = "chemistry-or-cryogenics"
-  data.raw.recipe["bob-silver-zinc-battery"].category = "chemistry-or-cryogenics"
-end

From 319d9b4c902b6e65daffee5b7bad3e46a48799cb Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:42:42 -0700
Subject: [PATCH 17/38] Update technology-updates.lua

---
 bobplates/prototypes/technology-updates.lua | 38 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/bobplates/prototypes/technology-updates.lua b/bobplates/prototypes/technology-updates.lua
index 4f4e51f90..b83b991be 100644
--- a/bobplates/prototypes/technology-updates.lua
+++ b/bobplates/prototypes/technology-updates.lua
@@ -95,9 +95,41 @@ bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-steel-ge
 bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-steel-bearing-ball")
 bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-steel-bearing")
 
-bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium")
-bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium-chloride")
-bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium-perchlorate")
+if not mods["space-age"] then
+  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "lithium")
+  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium-chloride")
+  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium-perchlorate")
+else
+  data.raw.technology["bob-battery-2"].prerequisites = {}
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "battery")
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "bob-nitrogen-processing")
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "bob-electrolysis-2")
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "bob-zinc-processing")
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "chemical-science-pack")
+  data.raw.technology["bob-battery-3"].prerequisites = {}
+  bobmods.lib.tech.add_prerequisite("bob-battery-3", "bob-battery-2")
+  bobmods.lib.tech.add_prerequisite("bob-battery-3", "cryogenic-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-battery-3", "bob-cobalt-processing")
+  bobmods.lib.tech.set_science_packs("bob-battery-3",
+    {
+      { "automation-science-pack", 1 },
+      { "logistic-science-pack", 1 },
+      { "chemical-science-pack", 1 },
+      { "production-science-pack", 1 },
+      { "cryogenic-science-pack", 1 },
+    }
+  )
+  data.raw.technology["bob-battery-2"].effects = {}
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-2", "bob-silver-oxide")
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-2", "bob-silver-nitrate")
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-2", "bob-battery-2")
+  data.raw.technology["bob-battery-3"].effects = {}
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-3", "bob-lithium-cobalt-oxide")
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-3", "bob-battery-3")
+  bobmods.lib.tech.hide("bob-lithium-processing")
+  bobmods.lib.tech.add_recipe_unlock("lithium-processing", "bob-lithium-chloride")
+  bobmods.lib.tech.add_recipe_unlock("lithium-processing", "bob-lithium-perchlorate")
+end
 
 bobmods.lib.tech.add_recipe_unlock("bob-titanium-processing", "bob-titanium-gear-wheel")
 bobmods.lib.tech.add_recipe_unlock("bob-titanium-processing", "bob-titanium-bearing-ball")

From 43f0daab16f13a40728ee7aca99c6bd8dfc69cd6 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:45:21 -0700
Subject: [PATCH 18/38] Update roboport-recipe-updates.lua

---
 .../prototypes/recipe/roboport-recipe-updates.lua    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
index 741d36e4f..67d85bf0f 100644
--- a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
@@ -49,8 +49,8 @@ if data.raw.item["bob-insulated-cable"] then
   bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-3", "copper-cable", "bob-insulated-cable")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-3", "battery", "bob-lithium-ion-battery")
+if data.raw.item["bob-battery-2"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-3", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "bob-battery-2")
 end
 
@@ -101,12 +101,12 @@ if data.raw.item["bob-advanced-processing-unit"] then
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "bob-advanced-processing-unit")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-silver-zinc-battery")
+if data.raw.item["bob-battery-3"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "bob-battery-3")
 else
-  if data.raw.item["bob-lithium-ion-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-lithium-ion-battery")
+  if data.raw.item["bob-battery-2"] then
+    bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-battery-2")
   end
 end
 

From c025102f77424106dcf2664efa9506274de45561 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:45:44 -0700
Subject: [PATCH 19/38] Update robots-recipe-updates.lua

---
 .../recipe/robots-recipe-updates.lua          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/boblogistics/prototypes/recipe/robots-recipe-updates.lua b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
index aafe64b10..d2352f2c1 100644
--- a/boblogistics/prototypes/recipe/robots-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
@@ -310,8 +310,8 @@ else
 end
 
 if data.raw.item["bob-flying-robot-frame-3"] then
-  if data.raw.item["bob-lithium-ion-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-3", "battery", "bob-lithium-ion-battery")
+  if data.raw.item["bob-battery-2"] then
+    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-3", "battery", "bob-battery-2")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -334,8 +334,8 @@ else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
     end
 
-    if data.raw.item["bob-lithium-ion-battery"] then
-      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-lithium-ion-battery", amount = 2 })
+    if data.raw.item["bob-battery-2"] then
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-2", amount = 2 })
     else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
     end
@@ -351,11 +351,11 @@ else
 end
 
 if data.raw.item["bob-flying-robot-frame-4"] then
-  if data.raw.item["bob-silver-zinc-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-silver-zinc-battery")
+  if data.raw.item["bob-battery-3"] then
+    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-battery-3")
   else
-    if data.raw.item["bob-lithium-ion-battery"] then
-      bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-lithium-ion-battery")
+    if data.raw.item["bob-battery-2"] then
+      bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-battery-2")
     end
   end
 
@@ -379,11 +379,11 @@ else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
     end
 
-    if data.raw.item["bob-silver-zinc-battery"] then
-      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-silver-zinc-battery", amount = 2 })
+    if data.raw.item["bob-battery-3"] then
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-3", amount = 2 })
     else
-      if data.raw.item["bob-lithium-ion-battery"] then
-        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-lithium-ion-battery", amount = 2 })
+      if data.raw.item["bob-battery-2"] then
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-2", amount = 2 })
       else
         bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
       end

From b1622eaac085688ae7458bad561944ea3e5cb7db Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:46:35 -0700
Subject: [PATCH 20/38] Update technology-updates.lua

---
 boblogistics/prototypes/technology-updates.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boblogistics/prototypes/technology-updates.lua b/boblogistics/prototypes/technology-updates.lua
index 23d7a8d3a..d761507cd 100644
--- a/boblogistics/prototypes/technology-updates.lua
+++ b/boblogistics/prototypes/technology-updates.lua
@@ -257,7 +257,7 @@ end
 
 bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "processing-unit")
 
-if data.raw.item["bob-lithium-ion-battery"] and data.raw.technology["bob-battery-2"] then
+if data.raw.item["bob-battery-2"] and data.raw.technology["bob-battery-2"] then
   if data.raw.technology["bob-robotics-3"] then
     bobmods.lib.tech.add_prerequisite("bob-robotics-3", "bob-battery-2")
   else
@@ -282,7 +282,7 @@ else
   end
 end
 
-if data.raw.item["bob-silver-zinc-battery"] and data.raw.technology["bob-battery-3"] then
+if data.raw.item["bob-battery-3"] and data.raw.technology["bob-battery-3"] then
   if data.raw.technology["bob-robotics-4"] then
     bobmods.lib.tech.add_prerequisite("bob-robotics-4", "bob-battery-3")
   else

From e31858de943cac5d7e559446a5faf92c52a0dc9e Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:47:33 -0700
Subject: [PATCH 21/38] Update accumulators-updates.lua

---
 .../recipe/accumulators-updates.lua           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bobpower/prototypes/recipe/accumulators-updates.lua b/bobpower/prototypes/recipe/accumulators-updates.lua
index 6daa442bd..7e77deeb4 100644
--- a/bobpower/prototypes/recipe/accumulators-updates.lua
+++ b/bobpower/prototypes/recipe/accumulators-updates.lua
@@ -1,8 +1,8 @@
 if settings.startup["bobmods-power-accumulators"].value == true then
-  if data.raw.item["bob-lithium-ion-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-2", "battery", "bob-lithium-ion-battery")
-    bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-2", "battery", "bob-lithium-ion-battery")
-    bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-2", "battery", "bob-lithium-ion-battery")
+  if data.raw.item["bob-battery-2"] then
+    bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-2", "battery", "bob-battery-2")
+    bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-2", "battery", "bob-battery-2")
+    bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-2", "battery", "bob-battery-2")
     bobmods.lib.tech.add_prerequisite("bob-electric-energy-accumulators-2", "bob-battery-2")
   end
 
@@ -20,16 +20,16 @@ if settings.startup["bobmods-power-accumulators"].value == true then
     end
   end
 
-  if data.raw.item["bob-silver-zinc-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-3", "battery", "bob-silver-zinc-battery")
-    bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-3", "battery", "bob-silver-zinc-battery")
-    bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-3", "battery", "bob-silver-zinc-battery")
+  if data.raw.item["bob-battery-3"] then
+    bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-3", "battery", "bob-battery-3")
+    bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-3", "battery", "bob-battery-3")
+    bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-3", "battery", "bob-battery-3")
     bobmods.lib.tech.add_prerequisite("bob-electric-energy-accumulators-3", "bob-battery-3")
   else
-    if data.raw.item["bob-lithium-ion-battery"] then
-      bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-3", "battery", "bob-lithium-ion-battery")
-      bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-3", "battery", "bob-lithium-ion-battery")
-      bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-3", "battery", "bob-lithium-ion-battery")
+    if data.raw.item["bob-battery-2"] then
+      bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-3", "battery", "bob-battery-2")
+      bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-3", "battery", "bob-battery-2")
+      bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-3", "battery", "bob-battery-2")
     end
   end
 

From ee97790090aa0d58760deb86851b3ffb21ee8b91 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:47:51 -0700
Subject: [PATCH 22/38] Update technology-updates.lua

---
 bobpower/prototypes/technology/technology-updates.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bobpower/prototypes/technology/technology-updates.lua b/bobpower/prototypes/technology/technology-updates.lua
index 82e6c782d..aa47efde5 100644
--- a/bobpower/prototypes/technology/technology-updates.lua
+++ b/bobpower/prototypes/technology/technology-updates.lua
@@ -1,9 +1,9 @@
 if settings.startup["bobmods-power-accumulators"].value == true then
-  if data.raw.item["bob-lithium-ion-battery"] and data.raw.technology["bob-battery-2"] then
+  if data.raw.item["bob-battery-2"] and data.raw.technology["bob-battery-2"] then
     bobmods.lib.tech.add_prerequisite("bob-electric-energy-accumulators-2", "bob-battery-2")
   end
 
-  if data.raw.item["bob-silver-zinc-battery"] and data.raw.technology["bob-battery-3"] then
+  if data.raw.item["bob-battery-3"] and data.raw.technology["bob-battery-3"] then
     bobmods.lib.tech.add_prerequisite("bob-electric-energy-accumulators-3", "bob-battery-3")
   end
 end

From 931796ef6238d24fcb8f8110359327b6b04d36b1 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:48:19 -0700
Subject: [PATCH 23/38] Update recipe-updates.lua

---
 bobtech/prototypes/recipe/recipe-updates.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bobtech/prototypes/recipe/recipe-updates.lua b/bobtech/prototypes/recipe/recipe-updates.lua
index 2300e7a2d..f910b8084 100644
--- a/bobtech/prototypes/recipe/recipe-updates.lua
+++ b/bobtech/prototypes/recipe/recipe-updates.lua
@@ -73,10 +73,10 @@ else
   bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "solar-panel", amount = 1 })
 end
 bobmods.lib.tech.add_prerequisite("utility-science-pack", "solar-energy")
-if data.raw.item["bob-lithium-ion-battery"] then
+if data.raw.item["bob-battery-2"] then
   bobmods.lib.recipe.add_ingredient(
     "utility-science-pack",
-    { type = "item", name = "bob-lithium-ion-battery", amount = 5 }
+    { type = "item", name = "bob-battery-2", amount = 5 }
   )
 else
   bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "battery", amount = 7 })

From 26a8ce72b02204078c38e617070cc56815394dd6 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:48:52 -0700
Subject: [PATCH 24/38] Update technology-updates.lua

---
 bobtech/prototypes/technology/technology-updates.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bobtech/prototypes/technology/technology-updates.lua b/bobtech/prototypes/technology/technology-updates.lua
index c76e707e6..4b0890d23 100644
--- a/bobtech/prototypes/technology/technology-updates.lua
+++ b/bobtech/prototypes/technology/technology-updates.lua
@@ -251,7 +251,7 @@ elseif data.raw.technology["bob-chemical-plant-2"] then
 end
 
 bobmods.lib.tech.replace_prerequisite("utility-science-pack", "robotics", "electric-engine")
-if data.raw.item["bob-lithium-ion-battery"] then
+if data.raw.item["bob-battery-2"] then
   bobmods.lib.tech.add_prerequisite("utility-science-pack", "bob-battery-2")
 else
   bobmods.lib.tech.add_prerequisite("utility-science-pack", "battery")

From d4175c1b6485d33f9f374d8cef5ddfd62c696ca7 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:49:36 -0700
Subject: [PATCH 25/38] Update recipe-updates.lua

---
 .../prototypes/recipe/recipe-updates.lua      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/bobwarfare/prototypes/recipe/recipe-updates.lua b/bobwarfare/prototypes/recipe/recipe-updates.lua
index 9ab9a90ab..e59109720 100644
--- a/bobwarfare/prototypes/recipe/recipe-updates.lua
+++ b/bobwarfare/prototypes/recipe/recipe-updates.lua
@@ -129,15 +129,15 @@ if data.raw.item["bob-aluminium-plate"] then
   bobmods.lib.tech.add_prerequisite("military-3", "bob-aluminium-processing")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
+if data.raw.item["bob-battery-2"] then
   bobmods.lib.tech.add_prerequisite("bob-laser-rifle-ammo-3", "bob-battery-2")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-emerald", "battery", "bob-lithium-ion-battery")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-amethyst", "battery", "bob-lithium-ion-battery")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-3", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-emerald", "battery", "bob-battery-2")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-amethyst", "battery", "bob-battery-2")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-3", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-laser-turrets-3", "bob-battery-2")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-4", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-4", "battery", "bob-battery-2")
 
-  bobmods.lib.recipe.replace_ingredient("bob-plasma-turret-2", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-plasma-turret-2", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "bob-battery-2")
 end
 
@@ -195,14 +195,14 @@ if data.raw.item["bob-silicon-nitride"] then
   bobmods.lib.tech.add_prerequisite("bob-artillery-turret-2", "bob-ceramics")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
+if data.raw.item["bob-battery-3"] then
   bobmods.lib.tech.add_prerequisite("bob-laser-rifle-ammo-5", "bob-battery-3")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-diamond", "battery", "bob-silver-zinc-battery")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-topaz", "battery", "bob-silver-zinc-battery")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-5", "battery", "bob-silver-zinc-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-diamond", "battery", "bob-battery-3")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-topaz", "battery", "bob-battery-3")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-5", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-laser-turrets-5", "bob-battery-3")
 
-  bobmods.lib.recipe.replace_ingredient("bob-plasma-turret-3", "battery", "bob-silver-zinc-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-plasma-turret-3", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-3", "bob-battery-3")
 end
 

From 4feaa7c9fb1888d14ed1badd4cdcce6cf38a642f Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:58:21 -0700
Subject: [PATCH 26/38] Update robots-updates.lua

---
 bobwarfare/prototypes/robots-updates.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bobwarfare/prototypes/robots-updates.lua b/bobwarfare/prototypes/robots-updates.lua
index c1034f2fc..bd7e6e79c 100644
--- a/bobwarfare/prototypes/robots-updates.lua
+++ b/bobwarfare/prototypes/robots-updates.lua
@@ -278,10 +278,10 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
         { type = "item", name = "iron-gear-wheel", amount = 2 }
       )
     end
-    if data.raw.item["bob-lithium-ion-battery"] then
+    if data.raw.item["bob-battery-2"] then
       bobmods.lib.recipe.add_ingredient(
         "bob-robot-tool-combat-3",
-        { type = "item", name = "bob-lithium-ion-battery", amount = 1 }
+        { type = "item", name = "bob-battery-2", amount = 1 }
       )
     else
       bobmods.lib.recipe.add_ingredient("bob-robot-tool-combat-3", { type = "item", name = "battery", amount = 1 })
@@ -317,10 +317,10 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
         { type = "item", name = "iron-gear-wheel", amount = 2 }
       )
     end
-    if data.raw.item["bob-silver-zinc-battery"] then
+    if data.raw.item["bob-battery-3"] then
       bobmods.lib.recipe.add_ingredient(
         "bob-robot-tool-combat-4",
-        { type = "item", name = "bob-silver-zinc-battery", amount = 1 }
+        { type = "item", name = "bob-battery-3", amount = 1 }
       )
     else
       bobmods.lib.recipe.add_ingredient("bob-robot-tool-combat-4", { type = "item", name = "battery", amount = 1 })

From 328883f1fc1d35baa821d6a861433c4f1fac7fd1 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 17:59:37 -0700
Subject: [PATCH 27/38] Update rocket-parts-updates.lua

---
 bobrevamp/prototypes/rocket-parts-updates.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua
index eb90ba5b9..ee25c5f31 100644
--- a/bobrevamp/prototypes/rocket-parts-updates.lua
+++ b/bobrevamp/prototypes/rocket-parts-updates.lua
@@ -69,8 +69,8 @@ if data.raw.recipe["satellite"] then
     bobmods.lib.tech.remove_prerequisite("rocket-silo", "solar-energy")
   end
 
-  if data.raw.item["bob-silver-zinc-battery"] then
-    bobmods.lib.recipe.replace_ingredient("satellite", "accumulator", "bob-silver-zinc-battery")
+  if data.raw.item["bob-battery-3"] then
+    bobmods.lib.recipe.replace_ingredient("satellite", "accumulator", "bob-battery-3")
     bobmods.lib.tech.add_prerequisite("rocket-silo", "bob-battery-3")
     bobmods.lib.tech.remove_prerequisite("rocket-silo", "electric-energy-accumulators")
   end

From fd5f88564d6dcc0130780b4daf0fd1133516bb32 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 18:08:35 -0700
Subject: [PATCH 28/38] Update updates.lua

---
 bobequipment/prototypes/recipe/updates.lua | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
index 6c613ed3a..b56d95737 100644
--- a/bobequipment/prototypes/recipe/updates.lua
+++ b/bobequipment/prototypes/recipe/updates.lua
@@ -172,7 +172,7 @@ then
 else
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk3-equipment", "battery", "bob-lithium-ion-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk3-equipment", "battery", "bob-battery-2")
       bobmods.lib.recipe.add_ingredient(
         "bob-personal-roboport-mk3-equipment",
         { type = "item", name = "bob-titanium-bearing", amount = 5 }
@@ -186,7 +186,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-3",
       "battery",
-      "bob-lithium-ion-battery"
+      "bob-battery-2"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-antenna-equipment-3",
@@ -267,7 +267,7 @@ then
 else
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk4-equipment", "battery", "bob-silver-zinc-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk4-equipment", "battery", "bob-battery-3")
       bobmods.lib.recipe.add_ingredient(
         "bob-personal-roboport-mk4-equipment",
         { type = "item", name = "bob-nitinol-bearing", amount = 5 }
@@ -286,7 +286,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-4",
       "battery",
-      "bob-silver-zinc-battery"
+      "bob-battery-3"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-4",
@@ -449,14 +449,14 @@ if data.raw.item["bob-gilded-copper-cable"] then
   bobmods.lib.tech.add_prerequisite("bob-solar-panel-equipment-3", "bob-advanced-processing-unit")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-battery-mk3-equipment", "battery", "bob-lithium-ion-battery")
+if data.raw.item["bob-battery-2"] then
+  bobmods.lib.recipe.replace_ingredient("battery-mk3-equipment", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-battery-equipment-3", "bob-battery-2")
 
   bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-3", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-personal-laser-defense-equipment-3",
-    { type = "item", name = "bob-lithium-ion-battery", amount = 3 }
+    { type = "item", name = "bob-battery-2", amount = 3 }
   )
   bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-3", "bob-battery-2")
 end
@@ -591,21 +591,27 @@ if data.raw.item["bob-tungsten-carbide"] then
   bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-tungsten-alloy-processing")
 end
 
-if data.raw.item["bob-lithium"] then
+if mods["space-age"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-fission-reactor-equipment-4",
+    { type = "item", name = "lithium-plate", amount = 40 }
+  )
+  bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-4", "lithium-processing")
+elseif data.raw.item["lithium"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-fission-reactor-equipment-3",
-    { type = "item", name = "bob-lithium", amount = 40 }
+    { type = "item", name = "lithium", amount = 40 }
   )
   bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-lithium-processing")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-battery-mk5-equipment", "battery", "bob-silver-zinc-battery")
+if data.raw.item["bob-battery-3"] then
+  bobmods.lib.recipe.replace_ingredient("bob-battery-mk5-equipment", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-battery-equipment-5", "bob-battery-3")
   bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-5", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-personal-laser-defense-equipment-5",
-    { type = "item", name = "bob-silver-zinc-battery", amount = 3 }
+    { type = "item", name = "bob-battery-3", amount = 3 }
   )
   bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-5", "bob-battery-3")
 end

From 0918ee1d0fd29dc798c920ffd9a68fda043b6caf Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 18:17:32 -0700
Subject: [PATCH 29/38] Update recipe-updates.lua

---
 .../prototypes/recipe-updates.lua             | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua
index d21d108b4..b494d257d 100644
--- a/bobvehicleequipment/prototypes/recipe-updates.lua
+++ b/bobvehicleequipment/prototypes/recipe-updates.lua
@@ -179,7 +179,7 @@ then
 else
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-3", "battery", "bob-lithium-ion-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-3", "battery", "bob-battery-2")
       bobmods.lib.recipe.add_ingredient(
         "bob-vehicle-roboport-equipment-3",
         { type = "item", name = "bob-titanium-bearing", amount = 10 }
@@ -193,7 +193,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-chargepad-equipment-3",
       "battery",
-      "bob-lithium-ion-battery"
+      "bob-battery-2"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-antenna-equipment-3",
@@ -290,7 +290,7 @@ else
 
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-4", "battery", "bob-silver-zinc-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-4", "battery", "bob-battery-3")
       bobmods.lib.recipe.add_ingredient(
         "bob-vehicle-roboport-equipment-4",
         { type = "item", name = "bob-nitinol-bearing", amount = 5 }
@@ -304,7 +304,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-chargepad-equipment-4",
       "battery",
-      "bob-silver-zinc-battery"
+      "bob-battery-3"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-antenna-equipment-4",
@@ -481,18 +481,18 @@ if data.raw.item["bob-gilded-copper-cable"] then
   bobmods.lib.tech.add_prerequisite("bob-vehicle-solar-panel-equipment-3", "bob-advanced-processing-unit")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-battery-equipment-3", "battery", "bob-lithium-ion-battery")
+if data.raw.item["bob-battery-2"] then
+  bobmods.lib.recipe.replace_ingredient("bob-vehicle-battery-equipment-3", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-battery-equipment-3", "bob-battery-2")
 
   bobmods.lib.recipe.remove_ingredient("bob-vehicle-laser-defense-equipment-3", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-laser-defense-equipment-3",
-    { type = "item", name = "bob-lithium-ion-battery", amount = 6 }
+    { type = "item", name = "bob-battery-2", amount = 6 }
   )
   bobmods.lib.tech.add_prerequisite("bob-vehicle-laser-defense-equipment-3", "bob-battery-2")
 
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-2", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-2", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-2", "bob-battery-2")
 end
 
@@ -649,17 +649,17 @@ if data.raw.item["bob-titanium-plate"] then
   bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-2", "bob-titanium-processing")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-battery-equipment-5", "battery", "bob-silver-zinc-battery")
+if data.raw.item["bob-battery-3"] then
+  bobmods.lib.recipe.replace_ingredient("bob-vehicle-battery-equipment-5", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-battery-equipment-5", "bob-battery-3")
 
   bobmods.lib.recipe.remove_ingredient("bob-vehicle-laser-defense-equipment-5", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-laser-defense-equipment-5",
-    { type = "item", name = "bob-silver-zinc-battery", amount = 6 }
+    { type = "item", name = "bob-battery-3", amount = 6 }
   )
   bobmods.lib.tech.add_prerequisite("bob-vehicle-laser-defense-equipment-5", "bob-battery-3")
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-3", "battery", "bob-silver-zinc-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-3", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-3", "bob-battery-3")
 end
 
@@ -803,14 +803,25 @@ if data.raw.item["bob-heat-shield-tile"] then
   )
 end
 
-if data.raw.item["bob-lithium"] then
+if mods["space-age"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-vehicle-fission-reactor-equipment-6",
+    { type = "item", name = "lithium-plate", amount = 40 }
+  )
+  bobmods.lib.recipe.add_ingredient(
+    "bob-vehicle-fission-cell-equipment-6",
+    { type = "item", name = "lithium-plate", amount = 20 }
+  )
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-6", "lithium-processing")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-6", "lithium-processing")
+elseif data.raw.item["lithium"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-fission-reactor-equipment-4",
-    { type = "item", name = "bob-lithium", amount = 40 }
+    { type = "item", name = "lithium", amount = 40 }
   )
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-fission-cell-equipment-4",
-    { type = "item", name = "bob-lithium", amount = 20 }
+    { type = "item", name = "lithium", amount = 20 }
   )
   bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-lithium-processing")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-lithium-processing")

From 1396982e61fe30a717d595803a58c85d821f2ae6 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:28:43 -0700
Subject: [PATCH 30/38] Update data-final-fixes.lua

---
 bobplates/data-final-fixes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bobplates/data-final-fixes.lua b/bobplates/data-final-fixes.lua
index e6978c099..130c7f740 100644
--- a/bobplates/data-final-fixes.lua
+++ b/bobplates/data-final-fixes.lua
@@ -17,5 +17,5 @@ if mods["aai-industry"] then
 end
 
 if mods["space-age"] then
-  bobmods.lib.tech.replace_prerequisite_in_all("bob-lithium-processing", "lithium-processing")
+  bobmods.lib.tech.replace_prerequisite_in_all("bob-lithium-processing", "cryogenic-science-pack")
 end

From e1bab964f6092e95aa41cb11bfa75d616c1c7e13 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:29:55 -0700
Subject: [PATCH 31/38] Update chemistry-recipe.lua

---
 bobplates/prototypes/recipe/chemistry-recipe.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bobplates/prototypes/recipe/chemistry-recipe.lua b/bobplates/prototypes/recipe/chemistry-recipe.lua
index b87a3d09a..ae7526df7 100644
--- a/bobplates/prototypes/recipe/chemistry-recipe.lua
+++ b/bobplates/prototypes/recipe/chemistry-recipe.lua
@@ -949,3 +949,8 @@ data:extend({
 if mods["bobpower"] then
   data.raw.recipe["bob-sodium-hydroxide-sink"].results[1].temperature = 465
 end
+
+if mods["space-age"] then
+  bobmods.lib.recipe.replace_ingredient("bob-lithium-chloride", "bob-lithia-water", "lithium-brine")
+  bobmods.lib.recipe.hide("bob-pure-water-from-lithia")
+end

From e89c47cc147b553457dcbf66141655ef6a835188 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:31:15 -0700
Subject: [PATCH 32/38] Update data-updates.lua

---
 bobplates/data-updates.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bobplates/data-updates.lua b/bobplates/data-updates.lua
index 5801ca118..74d512818 100644
--- a/bobplates/data-updates.lua
+++ b/bobplates/data-updates.lua
@@ -308,7 +308,9 @@ if settings.startup["bobmods-plates-purewater"].value == true then
 
   bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-distillery")
   bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water")
-  bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water-from-lithia")
+  if not mods["space-age"] then
+    bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water-from-lithia")
+  end
 end
 
 data.raw.fluid["petroleum-gas"].gas_temperature = -42
@@ -455,3 +457,13 @@ if mods["quality"] then
     "quality-module-3",
   })
 end
+
+if mods["space-age"] then
+  data.raw.fluid["bob-lithia-water"].hidden = true
+  data.raw.resource["bob-lithia-water"].hidden = true
+  data.raw.item["bob-lithia-water-barrel"].hidden = true
+  data.raw.recipe["bob-lithia-water-barrel"].hidden = true
+  data.raw.recipe["empty-bob-lithia-water-barrel"].hidden = true
+  bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "bob-lithia-water-barrel")
+  bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-bob-lithia-water-barrel")
+end

From 588f675bb46ec294e21ff0d51f793a90f14cd0b7 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:31:33 -0700
Subject: [PATCH 33/38] Update data.lua

---
 bobplates/data.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bobplates/data.lua b/bobplates/data.lua
index 1e9f3549d..85c4556e4 100644
--- a/bobplates/data.lua
+++ b/bobplates/data.lua
@@ -23,7 +23,9 @@ if bobmods.ores.bauxite.create_autoplace then
   end
   if settings.startup["bobmods-plates-groundwater"].value == false then
     bobmods.ores.water.create_autoplace()
-    bobmods.ores.lithia_water.create_autoplace()
+    if not mods["space-age"] then
+      bobmods.ores.lithia_water.create_autoplace()
+    end
   end
   bobmods.ores.thorium.create_autoplace()
 end

From ec14e4e6e02cc17e290053cf1f12b00c89a4c629 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:32:51 -0700
Subject: [PATCH 34/38] Update plates-recipe.lua

---
 bobplates/prototypes/recipe/plates-recipe.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bobplates/prototypes/recipe/plates-recipe.lua b/bobplates/prototypes/recipe/plates-recipe.lua
index cc294c0d4..e3d53f9df 100644
--- a/bobplates/prototypes/recipe/plates-recipe.lua
+++ b/bobplates/prototypes/recipe/plates-recipe.lua
@@ -222,4 +222,7 @@ if not mods["space-age"] then
       allow_productivity = true,
     },
   })
+else
+  bobmods.lib.recipe.remove_ingredient("lithium", "lithium-brine")
+  bobmods.lib.recipe.add_ingredient("lithium", { type = "item", name = "bob-lithium-chloride", amount = 5 })
 end

From 90e798e650d2e2d0b918dabfa57117846bccb1b0 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:33:32 -0700
Subject: [PATCH 35/38] Update updates.lua

---
 bobequipment/prototypes/recipe/updates.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
index b56d95737..70f3ffc97 100644
--- a/bobequipment/prototypes/recipe/updates.lua
+++ b/bobequipment/prototypes/recipe/updates.lua
@@ -596,7 +596,7 @@ if mods["space-age"] then
     "bob-fission-reactor-equipment-4",
     { type = "item", name = "lithium-plate", amount = 40 }
   )
-  bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-4", "lithium-processing")
+  bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-4", "cryogenic-science-pack")
 elseif data.raw.item["lithium"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-fission-reactor-equipment-3",

From 07f8f4cba5ab1a8c44d8d6aead626848371300fb Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:34:31 -0700
Subject: [PATCH 36/38] Update recipe-updates.lua

---
 bobvehicleequipment/prototypes/recipe-updates.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua
index b494d257d..267479db5 100644
--- a/bobvehicleequipment/prototypes/recipe-updates.lua
+++ b/bobvehicleequipment/prototypes/recipe-updates.lua
@@ -812,8 +812,8 @@ if mods["space-age"] then
     "bob-vehicle-fission-cell-equipment-6",
     { type = "item", name = "lithium-plate", amount = 20 }
   )
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-6", "lithium-processing")
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-6", "lithium-processing")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-6", "cryogenic-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-6", "cryogenic-science-pack")
 elseif data.raw.item["lithium"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-fission-reactor-equipment-4",

From dbd5c6e843f06819617ce2cb97f6fb132c04526e Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:47:14 -0700
Subject: [PATCH 37/38] Update bobplates_2.0.6.json

---
 bobplates/migrations/bobplates_2.0.6.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.0.6.json
index 36306fef1..7951615aa 100644
--- a/bobplates/migrations/bobplates_2.0.6.json
+++ b/bobplates/migrations/bobplates_2.0.6.json
@@ -9,8 +9,8 @@
   ],
   "recipe":
   [
-    ["bob-lithium", "lithium"],
     ["bob-heavy-water-electrolysis", "bob-deuterium"],
+    ["bob-lithium", "lithium"],
     ["bob-lithium-ion-battery", "bob-battery-2"],
     ["lithium-ion-battery", "bob-battery-2"],
     ["bob-silver-zinc-battery", "bob-battery-2"],

From f7589dea79c0faccc629c7a6c1a3727618cd7960 Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Wed, 8 Apr 2026 12:45:00 -0700
Subject: [PATCH 38/38] Update bobplates_2.0.6.json

---
 bobplates/migrations/bobplates_2.0.6.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.0.6.json
index 7951615aa..d5ca38e52 100644
--- a/bobplates/migrations/bobplates_2.0.6.json
+++ b/bobplates/migrations/bobplates_2.0.6.json
@@ -4,8 +4,8 @@
     ["bob-lithium", "lithium"],
     ["bob-lithium-ion-battery", "bob-battery-2"],
     ["lithium-ion-battery", "bob-battery-2"],
-    ["bob-silver-zinc-battery", "bob-battery-2"],
-    ["silver-zinc-battery", "bob-battery-2"]
+    ["bob-silver-zinc-battery", "bob-battery-3"],
+    ["silver-zinc-battery", "bob-battery-3"]
   ],
   "recipe":
   [
@@ -13,7 +13,7 @@
     ["bob-lithium", "lithium"],
     ["bob-lithium-ion-battery", "bob-battery-2"],
     ["lithium-ion-battery", "bob-battery-2"],
-    ["bob-silver-zinc-battery", "bob-battery-2"],
-    ["silver-zinc-battery", "bob-battery-2"]
+    ["bob-silver-zinc-battery", "bob-battery-3"],
+    ["silver-zinc-battery", "bob-battery-3"]
   ]
 }