diff --git a/bobassembly/changelog.txt b/bobassembly/changelog.txt
index d29dbd614..a4175f504 100644
--- a/bobassembly/changelog.txt
+++ b/bobassembly/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.6
+Version: 2.1.0
 Date: ???
   Bugfixes:
     - Fixed Burner and Steam Assembling machines not being able to craft some recipes #528
@@ -8,6 +8,7 @@ Date: ???
     - Disallowed certain entities in space #551
     - Set item weights #553
     - Adjust ingredients for some T4 and T5 recipes #583
+    - Reworked machine recipe ingredients #585
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.5
 Date: 18. 01. 2026
diff --git a/bobassembly/data-updates.lua b/bobassembly/data-updates.lua
index 488cd3311..90b312ed1 100644
--- a/bobassembly/data-updates.lua
+++ b/bobassembly/data-updates.lua
@@ -19,11 +19,14 @@ data.raw.fluid["petroleum-gas"].fuel_value = "1.2MJ"
 
 if mods["quality"] then
   bobmods.lib.recipe.update_recycling_recipe({
+    "assembling-machine-2",
     "assembling-machine-3",
     "bob-assembling-machine-4",
     "bob-assembling-machine-5",
     "bob-assembling-machine-6",
+    "centrifuge",
     "chemical-plant",
+    "oil-refinery",
   })
   if data.raw.recipe["bob-fluid-furnace"] then
     bobmods.lib.recipe.update_recycling_recipe_single("bob-fluid-furnace", false)
diff --git a/bobassembly/info.json b/bobassembly/info.json
index a172e531f..78bc6a825 100644
--- a/bobassembly/info.json
+++ b/bobassembly/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobassembly",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Assembling machines mod",
   "author": "Bobingabout",
@@ -8,8 +8,8 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.49",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6",
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0",
     "? space-age >= 2.0.0"
   ],
   "description": "Requires Bob's functions library mod\n\nThis mod adds assembling machines 4, 5 and 6, and updates the recipe for assembling machine 3 to fit my progression pattern.\nThe mod also adds higher tiers of Electric furnace, Chemical plant and Oil refinery.\nIt also includes the Electronic assembling machine chain, and additional tiers of machines added by Bob's Metals, Chemicals and Intermediates mod.\n\nDesigned to work best with my full mod pack.\nAll additional machine tiers other than assembling machines can be turned off in the mod options."
diff --git a/bobassembly/prototypes/assembly-electronics-updates.lua b/bobassembly/prototypes/assembly-electronics-updates.lua
index 7227ac513..3df2cd73a 100644
--- a/bobassembly/prototypes/assembly-electronics-updates.lua
+++ b/bobassembly/prototypes/assembly-electronics-updates.lua
@@ -1,4 +1,8 @@
 if settings.startup["bobmods-assembly-electronicmachines"].value == true then
+  if data.raw.item["bob-steel-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-1", "iron-gear-wheel", "bob-steel-gear-wheel")
+  end
+
   if data.raw.item["bob-bronze-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-1", "steel-plate", "bob-bronze-alloy")
     if mods["bobelectronics"] then
@@ -8,16 +12,17 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
     end
   end
 
-  if data.raw.item["bob-cobalt-steel-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-electronics-machine-2", "bob-cobalt-processing")
+  if data.raw.item["bob-brass-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-2", "iron-gear-wheel", "bob-brass-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-electronics-machine-2", "bob-brass-processing")
   end
 
-  if data.raw.item["bob-cobalt-steel-bearing"] then
+  if data.raw.item["bob-titanium-bearing"] then
     bobmods.lib.recipe.add_ingredient(
       "bob-electronics-machine-2",
-      { type = "item", name = "bob-cobalt-steel-bearing", amount = 5 }
+      { type = "item", name = "bob-titanium-bearing", amount = 5 }
     )
+    bobmods.lib.tech.add_prerequisite("bob-electronics-machine-2", "bob-titanium-processing")
   else
     bobmods.lib.recipe.add_ingredient(
       "bob-electronics-machine-2",
@@ -25,9 +30,9 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
     )
   end
 
-  if data.raw.item["bob-aluminium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-2", "steel-plate", "bob-aluminium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-electronics-machine-2", "bob-aluminium-processing")
+  if data.raw.item["bob-invar-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-2", "steel-plate", "bob-invar-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-electronics-machine-2", "bob-invar-processing")
   end
 
   if data.raw.item["bob-nitinol-alloy"] then
@@ -37,15 +42,14 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
 
   if data.raw.item["bob-copper-tungsten-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-3", "iron-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-electronics-machine-3", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-electronics-machine-3", "bob-tungsten-processing")
   end
 
-  if data.raw.item["bob-ceramic-bearing"] then
+  if data.raw.item["bob-nitinol-bearing"] then
     bobmods.lib.recipe.add_ingredient(
       "bob-electronics-machine-3",
-      { type = "item", name = "bob-ceramic-bearing", amount = 5 }
+      { type = "item", name = "bob-nitinol-bearing", amount = 5 }
     )
-    bobmods.lib.tech.add_prerequisite("bob-electronics-machine-3", "bob-ceramics")
   else
     bobmods.lib.recipe.add_ingredient(
       "bob-electronics-machine-3",
diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua
index 1c1ad0d7c..98e6a004a 100644
--- a/bobassembly/prototypes/assembly-updates.lua
+++ b/bobassembly/prototypes/assembly-updates.lua
@@ -38,28 +38,54 @@ data.raw.recipe["assembling-machine-3"].ingredients = {
   { type = "item", name = "advanced-circuit", amount = 3 },
 }
 
+if data.raw.item["bob-bronze-pipe"] then
+  bobmods.lib.recipe.add_ingredient(
+    "assembling-machine-2",
+    { type = "item", name = "bob-bronze-pipe", amount = 5 }
+  )
+  bobmods.lib.tech.add_prerequisite("automation-2", "bob-alloy-processing")
+end
+
 if data.raw.item["bob-steel-gear-wheel"] then
+  bobmods.lib.recipe.replace_ingredient("assembling-machine-2", "iron-gear-wheel", "bob-steel-gear-wheel")
+else
+  bobmods.lib.recipe.add_ingredient("assembling-machine-2", { type = "item", name = "iron-gear-wheel", amount = 5 })
+end
+
+if data.raw.item["bob-bronze-alloy"] then
+  bobmods.lib.recipe.replace_ingredient("assembling-machine-2", "steel-plate", "bob-bronze-alloy")
+  bobmods.lib.tech.add_prerequisite("automation-2", "bob-alloy-processing")
+end
+
+if data.raw.item["bob-cobalt-steel-gear-wheel"] then
   bobmods.lib.recipe.add_ingredient(
     "assembling-machine-3",
-    { type = "item", name = "bob-steel-gear-wheel", amount = 5 }
+    { type = "item", name = "bob-cobalt-steel-gear-wheel", amount = 5 }
   )
-else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { type = "item", name = "iron-gear-wheel", amount = 5 })
+  bobmods.lib.recipe.replace_ingredient("assembling-machine-3", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.tech.add_prerequisite("automation-3", "bob-cobalt-processing")
 end
 
-data.raw["assembling-machine"]["assembling-machine-3"].module_slots = 3
-data.raw["assembling-machine"]["assembling-machine-3"].next_upgrade = "bob-assembling-machine-4"
-data.raw["assembling-machine"]["assembling-machine-3"].drawing_box_vertical_extension = nil
+if data.raw.item["bob-aluminium-pipe"] then
+  bobmods.lib.recipe.add_ingredient(
+    "assembling-machine-3",
+    { type = "item", name = "bob-aluminium-pipe", amount = 5 }
+  )
+end
 
 if data.raw.item["bob-aluminium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-4", "steel-plate", "bob-aluminium-plate")
-  bobmods.lib.tech.add_prerequisite("automation-4", "bob-aluminium-processing")
+  bobmods.lib.recipe.replace_ingredient("assembling-machine-3", "steel-plate", "bob-aluminium-plate")
+  bobmods.lib.tech.add_prerequisite("automation-3", "bob-aluminium-processing")
 end
 
-if data.raw.item["bob-steel-bearing"] then
+data.raw["assembling-machine"]["assembling-machine-3"].module_slots = 3
+data.raw["assembling-machine"]["assembling-machine-3"].next_upgrade = "bob-assembling-machine-4"
+data.raw["assembling-machine"]["assembling-machine-3"].drawing_box_vertical_extension = nil
+
+if data.raw.item["bob-titanium-bearing"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-assembling-machine-4",
-    { type = "item", name = "bob-steel-bearing", amount = 5 }
+    { type = "item", name = "bob-titanium-bearing", amount = 5 }
   )
 else
   bobmods.lib.recipe.add_ingredient("bob-assembling-machine-4", { type = "item", name = "iron-gear-wheel", amount = 3 })
@@ -67,36 +93,51 @@ end
 
 if data.raw.item["bob-brass-gear-wheel"] then
   bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-4", "iron-gear-wheel", "bob-brass-gear-wheel")
-  bobmods.lib.tech.add_prerequisite("automation-4", "bob-zinc-processing")
+  bobmods.lib.tech.add_prerequisite("automation-4", "bob-brass-processing")
+end
+
+if data.raw.item["bob-brass-pipe"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-assembling-machine-4",
+    { type = "item", name = "bob-brass-pipe", amount = 5 }
+  )
 end
 
 if data.raw.item["bob-titanium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-5", "steel-plate", "bob-titanium-plate")
-  bobmods.lib.tech.add_prerequisite("automation-5", "bob-titanium-processing")
+  bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-4", "steel-plate", "bob-titanium-plate")
+  bobmods.lib.tech.add_prerequisite("automation-4", "bob-titanium-processing")
 end
 
-if data.raw.item["bob-titanium-bearing"] then
+if data.raw.item["bob-nitinol-bearing"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-assembling-machine-5",
-    { type = "item", name = "bob-titanium-bearing", amount = 5 }
+    { type = "item", name = "bob-nitinol-bearing", amount = 5 }
   )
 else
   bobmods.lib.recipe.add_ingredient("bob-assembling-machine-5", { type = "item", name = "iron-gear-wheel", amount = 3 })
 end
 
+if data.raw.item["bob-nitinol-alloy"] then
+  bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-5", "steel-plate", "bob-nitinol-alloy")
+  bobmods.lib.tech.add_prerequisite("automation-5", "bob-nitinol-processing")
+end
+
 if data.raw.item["bob-tungsten-gear-wheel"] then
   bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-5", "iron-gear-wheel", "bob-tungsten-gear-wheel")
   bobmods.lib.tech.add_prerequisite("automation-5", "bob-tungsten-processing")
 end
 
-if data.raw.item["bob-nitinol-alloy"] then
-  bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "steel-plate", "bob-nitinol-alloy")
-  bobmods.lib.tech.add_prerequisite("automation-6", "bob-nitinol-processing")
+if data.raw.item["bob-tungsten-pipe"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-assembling-machine-5",
+    { type = "item", name = "bob-tungsten-pipe", amount = 5 }
+  )
 end
 
 if data.raw.item["tungsten-carbide"] then
   bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "iron-plate", "tungsten-carbide")
-  bobmods.lib.tech.add_prerequisite("automation-6", "bob-tungsten-alloy-processing")
+  bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "steel-plate", "tungsten-carbide")
+  bobmods.lib.tech.add_prerequisite("automation-6", "bob-tungsten-processing")
 end
 
 if data.raw.item["bob-nitinol-bearing"] then
@@ -113,10 +154,28 @@ if data.raw.item["bob-nitinol-gear-wheel"] then
   bobmods.lib.tech.add_prerequisite("automation-6", "bob-nitinol-processing")
 end
 
+if data.raw.item["bob-copper-tungsten-pipe"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-assembling-machine-6",
+    { type = "item", name = "bob-copper-tungsten-pipe", amount = 5 }
+  )
+end
+
 if data.raw.item["bob-advanced-processing-unit"] then
   bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-5", "processing-unit", "bob-advanced-processing-unit")
   bobmods.lib.tech.add_prerequisite("automation-5", "bob-advanced-processing-unit")
-  bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "processing-unit", "bob-advanced-processing-unit")
+end
+
+if mods["bobmodules"] then
+bobmods.lib.recipe.remove_ingredient("bob-assembling-machine-6", "processing-unit")
+  bobmods.lib.recipe.add_ingredient(
+    "bob-assembling-machine-6",
+    { type = "item", name = "bob-speed-module-4", amount = 1 }
+  )
+  bobmods.lib.tech.add_prerequisite("automation-6", "bob-speed-module-4")
+else
+  bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "processing-unit", "speed-module-3")
+  bobmods.lib.tech.add_prerequisite("automation-6", "speed-module-3")
 end
 
 if settings.startup["bobmods-assembly-limits"].value == true then
diff --git a/bobassembly/prototypes/centrifuge-updates.lua b/bobassembly/prototypes/centrifuge-updates.lua
index f1bc55e42..dc04d53af 100644
--- a/bobassembly/prototypes/centrifuge-updates.lua
+++ b/bobassembly/prototypes/centrifuge-updates.lua
@@ -1,42 +1,32 @@
 if settings.startup["bobmods-assembly-centrifuge"].value == true then
-  if data.raw.item["bob-silicon-nitride"] then
+  if mods["bobplates"] then
+    bobmods.lib.recipe.replace_ingredient("centrifuge", "steel-plate", "bob-cobalt-steel-alloy")
+    bobmods.lib.recipe.replace_ingredient("centrifuge", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("uranium-processing", "bob-cobalt-processing")
+  
     bobmods.lib.recipe.replace_ingredient("bob-centrifuge-2", "refined-concrete", "bob-silicon-nitride")
     bobmods.lib.tech.add_prerequisite("bob-centrifuge-2", "bob-ceramics")
-  end
-
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-centrifuge-2", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-centrifuge-2", "bob-titanium-processing")
-  end
 
-  if data.raw.item["bob-titanium-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-centrifuge-2", "iron-gear-wheel", "bob-titanium-gear-wheel")
-  end
+    bobmods.lib.recipe.replace_ingredient("bob-centrifuge-2", "steel-plate", "bob-brass-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-centrifuge-2", "iron-gear-wheel", "bob-brass-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-centrifuge-2", "bob-brass-processing")
 
-  if data.raw.item["bob-titanium-bearing"] then
     bobmods.lib.recipe.add_ingredient("bob-centrifuge-2", { type = "item", name = "bob-titanium-bearing", amount = 50 })
-  end
+    bobmods.lib.tech.add_prerequisite("bob-centrifuge-2", "bob-titanium-processing")
 
-  if data.raw.item["bob-nitinol-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-centrifuge-3", "steel-plate", "bob-nitinol-alloy")
     bobmods.lib.tech.add_prerequisite("bob-centrifuge-3", "bob-nitinol-processing")
-  end
 
-  if data.raw.item["tungsten-carbide"] then
     bobmods.lib.recipe.replace_ingredient("bob-centrifuge-3", "refined-concrete", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-centrifuge-3", "bob-tungsten-alloy-processing")
-  end
+    bobmods.lib.recipe.replace_ingredient("bob-centrifuge-3", "iron-gear-wheel", "bob-tungsten-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-centrifuge-3", "bob-tungsten-processing")
 
-  if data.raw.item["bob-advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("bob-centrifuge-3", "processing-unit", "bob-advanced-processing-unit")
     bobmods.lib.tech.add_prerequisite("bob-centrifuge-3", "bob-advanced-processing-unit")
-  end
-
-  if data.raw.item["bob-tungsten-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-centrifuge-3", "iron-gear-wheel", "bob-tungsten-gear-wheel")
-  end
 
-  if data.raw.item["bob-nitinol-bearing"] then
     bobmods.lib.recipe.add_ingredient("bob-centrifuge-3", { type = "item", name = "bob-nitinol-bearing", amount = 50 })
+  elseif mods["bobelectronics"] then
+    bobmods.lib.recipe.replace_ingredient("bob-centrifuge-3", "processing-unit", "bob-advanced-processing-unit")
+    bobmods.lib.tech.add_prerequisite("bob-centrifuge-3", "bob-advanced-processing-unit")
   end
 end
diff --git a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua
index feb73375e..c626f6569 100644
--- a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua
+++ b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua
@@ -27,8 +27,8 @@ then
     bobmods.lib.recipe.replace_ingredient("bob-electric-chemical-mixing-furnace", "pipe", "bob-titanium-pipe")
   end
 
-  if data.raw.item["bob-copper-tungsten-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electric-chemical-mixing-furnace-2", "pipe", "bob-copper-tungsten-pipe")
+  if data.raw.item["bob-tungsten-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electric-chemical-mixing-furnace-2", "pipe", "bob-tungsten-pipe")
   end
 
   if data.raw.item["bob-copper-tungsten-alloy"] then
@@ -37,12 +37,12 @@ then
       "steel-plate",
       "bob-copper-tungsten-alloy"
     )
-    bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-2", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-2", "bob-tungsten-processing")
   end
 
-  if data.raw.item["tungsten-carbide"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electric-chemical-mixing-furnace-2", "stone-brick", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-2", "bob-tungsten-alloy-processing")
+  if data.raw.item["tungsten-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electric-chemical-mixing-furnace-2", "stone-brick", "tungsten-plate")
+    bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-2", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
diff --git a/bobassembly/prototypes/chemical-plant-updates.lua b/bobassembly/prototypes/chemical-plant-updates.lua
index 651b4910f..d68fbb9c5 100644
--- a/bobassembly/prototypes/chemical-plant-updates.lua
+++ b/bobassembly/prototypes/chemical-plant-updates.lua
@@ -9,38 +9,56 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-chemical-plant-2", "oil-processing")
   end
 
-  if data.raw.item["bob-steel-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-2", "pipe", "bob-steel-pipe")
-  end
-
   if data.raw.item["bob-glass"] then
     bobmods.lib.recipe.add_ingredient("chemical-plant", { type = "item", name = "bob-glass", amount = 5 })
   end
 
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-2", "bob-invar-processing")
+  if data.raw.item["bob-steel-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("chemical-plant", "iron-gear-wheel", "bob-steel-gear-wheel")
   end
 
-  if data.raw.item["bob-steel-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-2", "iron-gear-wheel", "bob-steel-gear-wheel")
+  if data.raw.item["bob-bronze-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("chemical-plant", "steel-plate", "bob-bronze-alloy")
+    if data.raw.technology["bob-chemical-plant"] then
+      bobmods.lib.tech.add_prerequisite("bob-chemical-plant", "bob-alloy-processing")
+    end
   end
 
-  if data.raw.item["bob-steel-bearing"] then
-    bobmods.lib.recipe.add_ingredient("bob-chemical-plant-2", { type = "item", name = "bob-steel-bearing", amount = 5 })
+  if data.raw.item["bob-bronze-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("chemical-plant", "pipe", "bob-bronze-pipe")
   end
 
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-3", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-3", "bob-titanium-processing")
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-2", "pipe", "bob-aluminium-pipe")
+    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-2", "bob-aluminium-processing")
+  end
+
+  if data.raw.item["bob-zinc-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-2", "steel-plate", "bob-zinc-plate")
+    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-2", "bob-zinc-processing")
+  end
+
+  if data.raw.item["bob-cobalt-steel-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-2", "bob-cobalt-processing")
   end
 
-  if data.raw.item["bob-titanium-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-3", "pipe", "bob-titanium-pipe")
+  if data.raw.item["bob-cobalt-steel-bearing"] then
+    bobmods.lib.recipe.add_ingredient("bob-chemical-plant-2", { type = "item", name = "bob-cobalt-steel-bearing", amount = 5 })
+  end
+
+  if data.raw.item["bob-brass-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-3", "steel-plate", "bob-brass-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-3", "bob-brass-processing")
+  end
+
+  if data.raw.item["bob-brass-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-3", "pipe", "bob-brass-pipe")
   end
 
   if data.raw.item["bob-titanium-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-3", "bob-titanium-processing")
   end
 
   if data.raw.item["bob-titanium-bearing"] then
@@ -50,9 +68,9 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
     )
   end
 
-  if data.raw.item["bob-nitinol-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-4", "steel-plate", "bob-nitinol-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-4", "bob-nitinol-processing")
+  if data.raw.item["tungsten-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-4", "steel-plate", "tungsten-plate")
+    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-4", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-nitinol-pipe"] then
@@ -61,11 +79,6 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
 
   if data.raw.item["bob-tungsten-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-4", "iron-gear-wheel", "bob-tungsten-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-4", "bob-tungsten-processing")
-  end
-
-  if data.raw.item["bob-advanced-processing-unit"] then
-    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-4", "processing-unit", "bob-advanced-processing-unit")
   end
 
   if data.raw.item["bob-nitinol-bearing"] then
@@ -73,9 +86,11 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       "bob-chemical-plant-4",
       { type = "item", name = "bob-nitinol-bearing", amount = 5 }
     )
+    bobmods.lib.tech.add_prerequisite("bob-chemical-plant-4", "bob-nitinol-processing")
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
+    bobmods.lib.recipe.replace_ingredient("bob-chemical-plant-4", "processing-unit", "bob-advanced-processing-unit")
     bobmods.lib.tech.add_prerequisite("bob-chemical-plant-4", "bob-advanced-processing-unit")
   end
 
diff --git a/bobassembly/prototypes/distillery-updates.lua b/bobassembly/prototypes/distillery-updates.lua
index a03ce9a55..2c79132d2 100644
--- a/bobassembly/prototypes/distillery-updates.lua
+++ b/bobassembly/prototypes/distillery-updates.lua
@@ -23,33 +23,34 @@ then
     bobmods.lib.recipe.replace_ingredient("bob-distillery-2", "pipe", "bob-bronze-pipe")
   end
 
-  if data.raw.item["bob-brass-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-distillery-3", "copper-plate", "bob-brass-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-distillery-3", "bob-zinc-processing")
+  if data.raw.item["bob-aluminium-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-distillery-3", "copper-plate", "bob-aluminium-plate")
+    bobmods.lib.tech.add_prerequisite("bob-distillery-3", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-distillery-3", "pipe", "bob-brass-pipe")
-    bobmods.lib.tech.add_prerequisite("bob-distillery-3", "bob-zinc-processing")
+  if data.raw.item["bob-plastic-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-distillery-3", "pipe", "bob-plastic-pipe")
+    bobmods.lib.tech.add_prerequisite("bob-distillery-3", "plastics")
   end
 
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-distillery-3", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-distillery-3", "bob-invar-processing")
+  if data.raw.item["bob-nickel-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-distillery-3", "steel-plate", "bob-nickel-plate")
+    bobmods.lib.tech.add_prerequisite("bob-distillery-3", "bob-nickel-processing")
   end
 
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-distillery-4", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-distillery-4", "bob-titanium-processing")
+  if data.raw.item["bob-brass-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-distillery-4", "copper-plate", "bob-brass-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-distillery-4", "bob-brass-processing")
   end
 
-  if data.raw.item["bob-ceramic-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-distillery-4", "pipe", "bob-ceramic-pipe")
+  if data.raw.item["bob-brass-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-distillery-4", "pipe", "bob-brass-pipe")
+    bobmods.lib.tech.add_prerequisite("bob-distillery-4", "bob-brass-processing")
   end
 
-  if data.raw.item["bob-silicon-nitride"] then
-    bobmods.lib.recipe.replace_ingredient("bob-distillery-4", "copper-plate", "bob-silicon-nitride")
-    bobmods.lib.tech.add_prerequisite("bob-distillery-4", "bob-ceramics")
+  if data.raw.item["bob-invar-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-distillery-4", "steel-plate", "bob-invar-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-distillery-4", "bob-invar-processing")
   end
 
   if data.raw.item["bob-nitinol-alloy"] then
@@ -59,11 +60,11 @@ then
 
   if data.raw.item["bob-copper-tungsten-pipe"] then
     bobmods.lib.recipe.replace_ingredient("bob-distillery-5", "pipe", "bob-copper-tungsten-pipe")
-    bobmods.lib.tech.add_prerequisite("bob-distillery-5", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-distillery-5", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-copper-tungsten-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-distillery-5", "copper-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-distillery-5", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-distillery-5", "bob-tungsten-processing")
   end
 end
diff --git a/bobassembly/prototypes/electric-furnace-updates.lua b/bobassembly/prototypes/electric-furnace-updates.lua
index 01dac625b..ebc173531 100644
--- a/bobassembly/prototypes/electric-furnace-updates.lua
+++ b/bobassembly/prototypes/electric-furnace-updates.lua
@@ -14,12 +14,12 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
 
   if data.raw.item["bob-copper-tungsten-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-electric-furnace-3", "steel-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("advanced-material-processing-4", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("advanced-material-processing-4", "bob-tungsten-processing")
   end
 
-  if data.raw.item["tungsten-carbide"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electric-furnace-3", "stone-brick", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("advanced-material-processing-4", "bob-tungsten-alloy-processing")
+  if data.raw.item["tungsten-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electric-furnace-3", "stone-brick", "tungsten-plate")
+    bobmods.lib.tech.add_prerequisite("advanced-material-processing-4", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
diff --git a/bobassembly/prototypes/electrolyser-updates.lua b/bobassembly/prototypes/electrolyser-updates.lua
index dfb9e9c86..9f86e9e44 100644
--- a/bobassembly/prototypes/electrolyser-updates.lua
+++ b/bobassembly/prototypes/electrolyser-updates.lua
@@ -34,9 +34,14 @@ then
     bobmods.lib.recipe.replace_ingredient("bob-electrolyser-2", "pipe", "bob-steel-pipe")
   end
 
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-3", "iron-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-electrolyser-3", "bob-invar-processing")
+  if data.raw.item["bob-zinc-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-3", "iron-plate", "bob-zinc-plate")
+    bobmods.lib.tech.add_prerequisite("bob-electrolyser-3", "bob-zinc-processing")
+  end
+
+  if data.raw.item["bob-nickel-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-3", "plastic-bar", "bob-nickel-plate")
+    bobmods.lib.tech.add_prerequisite("bob-electrolyser-3", "bob-nickel-processing")
   end
 
   if data.raw.item["bob-aluminium-plate"] then
@@ -44,7 +49,9 @@ then
     bobmods.lib.tech.add_prerequisite("bob-electrolyser-3", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-plastic-pipe"] then
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-3", "pipe", "bob-aluminium-pipe")
+  elseif data.raw.item["bob-plastic-pipe"] then
     bobmods.lib.recipe.replace_ingredient("bob-electrolyser-3", "pipe", "bob-plastic-pipe")
   end
 
@@ -53,28 +60,34 @@ then
     bobmods.lib.tech.add_prerequisite("bob-electrolyser-4", "bob-ceramics")
   end
 
+  if data.raw.item["bob-brass-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-4", "iron-plate", "bob-brass-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-electrolyser-4", "bob-brass-processing")
+  end
+
   if data.raw.item["bob-titanium-plate"] then
     bobmods.lib.recipe.replace_ingredient("bob-electrolyser-4", "iron-plate", "bob-titanium-plate")
     bobmods.lib.recipe.replace_ingredient("bob-electrolyser-4", "steel-plate", "bob-titanium-plate")
     bobmods.lib.tech.add_prerequisite("bob-electrolyser-4", "bob-titanium-processing")
   end
 
-  if data.raw.item["bob-ceramic-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-4", "pipe", "bob-ceramic-pipe")
-  end
-
-  if data.raw.item["tungsten-carbide"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-5", "plastic-bar", "tungsten-carbide")
+  if data.raw.item["bob-titanium-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-4", "pipe", "bob-titanium-pipe")
   end
 
   if data.raw.item["bob-nitinol-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-5", "iron-plate", "bob-nitinol-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-5", "plastic-bar", "bob-nitinol-alloy")
     bobmods.lib.tech.add_prerequisite("bob-electrolyser-5", "bob-nitinol-processing")
   end
 
+  if data.raw.item["tungsten-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-electrolyser-5", "iron-plate", "tungsten-plate")
+    bobmods.lib.tech.add_prerequisite("bob-electrolyser-5", "bob-tungsten-processing")
+  end
+
   if data.raw.item["bob-copper-tungsten-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-electrolyser-5", "steel-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-electrolyser-5", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-electrolyser-5", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
diff --git a/bobassembly/prototypes/oil-refinery-updates.lua b/bobassembly/prototypes/oil-refinery-updates.lua
index a5d883ef1..8beb2b8b8 100644
--- a/bobassembly/prototypes/oil-refinery-updates.lua
+++ b/bobassembly/prototypes/oil-refinery-updates.lua
@@ -1,77 +1,42 @@
 if settings.startup["bobmods-assembly-oilrefineries"].value == true then
   data.raw["assembling-machine"]["oil-refinery"].next_upgrade = "bob-oil-refinery-2"
 
-  if data.raw.item["bob-brass-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-2", "steel-plate", "bob-brass-alloy")
+  if mods["bobplates"] then
+    bobmods.lib.recipe.replace_ingredient("oil-refinery", "iron-gear-wheel", "bob-steel-gear-wheel")
+    bobmods.lib.recipe.add_ingredient("oil-refinery", { type = "item", name = "bob-steel-bearing", amount = 5 })
+
+    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-2", "steel-plate", "bob-zinc-plate")
+    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-2", "stone-brick", "bob-nickel-plate")
+    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.recipe.add_ingredient("bob-oil-refinery-2", { type = "item", name = "bob-cobalt-steel-bearing", amount = 5 })
     bobmods.lib.tech.add_prerequisite("oil-processing-2", "bob-zinc-processing")
-  end
-
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-2", "stone-brick", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("oil-processing-2", "bob-invar-processing")
-  end
-
-  if data.raw.item["bob-brass-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-2", "iron-gear-wheel", "bob-brass-gear-wheel")
-  end
-
-  if data.raw.item["bob-steel-bearing"] then
-    bobmods.lib.recipe.add_ingredient("bob-oil-refinery-2", { type = "item", name = "bob-steel-bearing", amount = 5 })
-  end
+    bobmods.lib.tech.add_prerequisite("oil-processing-2", "bob-nickel-processing")
+    bobmods.lib.tech.add_prerequisite("oil-processing-2", "bob-cobalt-processing")
 
-  if data.raw.item["bob-steel-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-2", "pipe", "bob-steel-pipe")
-  end
-
-  if data.raw.item["bob-titanium-plate"] then
     bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-3", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("oil-processing-3", "bob-titanium-processing")
-  end
-
-  if data.raw.item["bob-silicon-nitride"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-3", "stone-brick", "bob-silicon-nitride")
-    bobmods.lib.tech.add_prerequisite("oil-processing-3", "bob-ceramics")
-  end
-
-  if data.raw.item["bob-titanium-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-3", "stone-brick", "bob-brass-alloy")
     bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
-  end
-
-  if data.raw.item["bob-titanium-bearing"] then
-    bobmods.lib.recipe.add_ingredient(
-      "bob-oil-refinery-3",
-      { type = "item", name = "bob-titanium-bearing", amount = 5 }
-    )
-  end
-
-  if data.raw.item["bob-titanium-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-3", "pipe", "bob-titanium-pipe")
-  end
-
-  if data.raw.item["bob-nitinol-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "steel-plate", "bob-nitinol-alloy")
-    bobmods.lib.tech.add_prerequisite("oil-processing-4", "bob-nitinol-processing")
-  end
+    bobmods.lib.recipe.add_ingredient("bob-oil-refinery-3", { type = "item", name = "bob-titanium-bearing", amount = 5 })
+    bobmods.lib.tech.add_prerequisite("oil-processing-3", "bob-titanium-processing")
+    bobmods.lib.tech.add_prerequisite("oil-processing-3", "bob-brass-processing")
 
-  if data.raw.item["bob-copper-tungsten-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "steel-plate", "tungsten-plate")
     bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "stone-brick", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("oil-processing-4", "bob-tungsten-alloy-processing")
-  end
-
-  if data.raw.item["bob-tungsten-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "iron-gear-wheel", "bob-tungsten-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-oil-refinery-4", "bob-tungsten-processing")
-  end
-
-  if data.raw.item["bob-nitinol-bearing"] then
     bobmods.lib.recipe.add_ingredient("bob-oil-refinery-4", { type = "item", name = "bob-nitinol-bearing", amount = 5 })
-  end
+    bobmods.lib.tech.add_prerequisite("oil-processing-4", "bob-tungsten-processing")
+    bobmods.lib.tech.add_prerequisite("oil-processing-4", "bob-nitinol-processing")
 
-  if data.raw.item["bob-nitinol-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "pipe", "bob-nitinol-pipe")
+    if mods["boblogistics"] then
+      bobmods.lib.recipe.replace_ingredient("oil-refinery", "pipe", "bob-steel-pipe")
+      bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-2", "pipe", "bob-aluminium-pipe")
+      bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-3", "pipe", "bob-titanium-pipe")
+      bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "pipe", "bob-nitinol-pipe")
+      bobmods.lib.tech.add_prerequisite("oil-processing-2", "bob-aluminium-processing")
+    end
   end
 
-  if data.raw.item["bob-advanced-processing-unit"] then
+  if mods["bobplates"] or mods["bobelectronics"] then
     bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "processing-unit", "bob-advanced-processing-unit")
     bobmods.lib.tech.add_prerequisite("oil-processing-4", "bob-advanced-processing-unit")
   end
diff --git a/bobclasses/changelog.txt b/bobclasses/changelog.txt
index 00e19ffc1..644591e3c 100644
--- a/bobclasses/changelog.txt
+++ b/bobclasses/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.6
+Version: 2.1.0
 Date: ???
   Changes:
     - Removed Editor mode setting #466
diff --git a/bobclasses/info.json b/bobclasses/info.json
index 77fd60cb6..dce6cfb93 100644
--- a/bobclasses/info.json
+++ b/bobclasses/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobclasses",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Classes and Multiple characters mod",
   "author": "Bobingabout",
@@ -8,9 +8,9 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.49",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6",
-    "? boblogistics >= 2.0.0"
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0",
+    "? boblogistics >= 2.1.0"
   ],
   "description": "Adds 3 new starting character classes to the game and 6 late-game classes. These have various bonuses and disadvantages, including changes to initial equipment.\n\nFighter: Has various combat bonuses, high speed, rapid healing, short reach, poor crafting and inventory.\nCrafter: Can hand smelt. Has fast crafting speed and more inventory, but is slow and poor in combat.\nBuilder: Has very long reach for easy factory building, and increased inventory, but is middling in combat.\n\nThis mod also allows multiple bodies to be placed in the game world, and free switching between them.\nWhen dying, if you own multiple bodies, instead of respawning you will automatically switch to the first body in the list."
 }
diff --git a/bobelectronics/changelog.txt b/bobelectronics/changelog.txt
index 0fb8e275b..e21623cce 100644
--- a/bobelectronics/changelog.txt
+++ b/bobelectronics/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.6
+Version: 2.1.0
 Date: ???
   Changes:
     - Set item weights #553
diff --git a/bobelectronics/info.json b/bobelectronics/info.json
index 2456b7810..cce7f07a3 100644
--- a/bobelectronics/info.json
+++ b/bobelectronics/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobelectronics",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Electronics mod",
   "author": "Bobingabout",
@@ -8,8 +8,8 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.49",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6"
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0"
   ],
   "description": "Requires Bob's functions library mod.\n\nThis mod changes the way you build electronics, making the process more realistic.\nFirst you have to assemble electronic components, then combine them into circuit boards.\nUnlike in the base game, each tier of circuit board does NOT require the previous tier.\nIt also adds a 4th tier of electronics used for high end machinery.\n\nAlthough it can work by itself, it is designed to function best with my entire set of mods installed."
 }
diff --git a/bobenemies/changelog.txt b/bobenemies/changelog.txt
index 817c5a760..e0abd06c3 100644
--- a/bobenemies/changelog.txt
+++ b/bobenemies/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.5
+Version: 2.1.0
 Date: ???
   Bugfixes:
     - Enemy spawn table adjustments #537
diff --git a/bobenemies/info.json b/bobenemies/info.json
index 848d80f87..f9ff387f4 100644
--- a/bobenemies/info.json
+++ b/bobenemies/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobenemies",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Enemies mod",
   "author": "Bobingabout",
@@ -8,7 +8,7 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.4",
+    "boblibrary >= 2.1.0",
     "? space-age >= 2.0.0",
     "(?) combat-mechanics-overhaul >= 0.7.1"
   ],
diff --git a/bobequipment/changelog.txt b/bobequipment/changelog.txt
index b0e1f5ae1..55d9e6163 100644
--- a/bobequipment/changelog.txt
+++ b/bobequipment/changelog.txt
@@ -1,11 +1,12 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.4
+Version: 2.1.0
 Date: ???
   Changes:
     - Set item weights #553
     - Reduced personal batteries from 6 tiers down to 5 #572
     - Prevented duplicate Personal battery MK3 with Space Age mod #572
     - Adjust ingredients for some T4 and T5 recipes #583
+    - Reworked equipment recipe ingredients #585
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.3
 Date: 15. 01. 2026
diff --git a/bobequipment/info.json b/bobequipment/info.json
index b1126a581..e49179b00 100644
--- a/bobequipment/info.json
+++ b/bobequipment/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobequipment",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Personal Equipment mod",
   "author": "Bobingabout",
@@ -8,10 +8,10 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.4",
-    "? bobenemies >= 2.0.0",
-    "? bobplates >= 2.0.6",
-    "? boblogistics >= 2.0.0",
+    "boblibrary >= 2.1.0",
+    "? bobenemies >= 2.1.0",
+    "? bobplates >= 2.1.0",
+    "? boblogistics >= 2.1.0",
     "(?) space-age"
   ],
   "description": "Requires Bob's functions library mod.\n\nExpands the range of equipment available in base mod for the modular armor.\n\nAlthough it can function as a stand alone mod, it is intended to be used with the full Bob's Mods set."
diff --git a/bobequipment/migrations/bobequipment_2.0.4.json b/bobequipment/migrations/bobequipment_2.1.0.json
similarity index 94%
rename from bobequipment/migrations/bobequipment_2.0.4.json
rename to bobequipment/migrations/bobequipment_2.1.0.json
index a1f5c6308..f67c37f18 100644
--- a/bobequipment/migrations/bobequipment_2.0.4.json
+++ b/bobequipment/migrations/bobequipment_2.1.0.json
@@ -1,18 +1,18 @@
-{
-  "item":
-  [
-    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
-  ],
-  "equipment":
-  [
-    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
-  ],
-  "recipe":
-  [
-    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
-  ],
-  "technology":
-  [
-    ["bob-battery-equipment-3", "battery-mk3-equipment"]
-  ]
-}
+{
+  "item":
+  [
+    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
+  ],
+  "equipment":
+  [
+    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
+  ],
+  "recipe":
+  [
+    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
+  ],
+  "technology":
+  [
+    ["bob-battery-equipment-3", "battery-mk3-equipment"]
+  ]
+}
diff --git a/bobequipment/prototypes/armor-updates.lua b/bobequipment/prototypes/armor-updates.lua
index 692c3a44b..489324843 100644
--- a/bobequipment/prototypes/armor-updates.lua
+++ b/bobequipment/prototypes/armor-updates.lua
@@ -48,7 +48,7 @@ if not mods["bobwarfare"] then
   end
   if data.raw.item["tungsten-carbide"] then
     bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk5", "steel-plate", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-nitinol-alloy"] then
diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
index ee504d3d7..942a16da3 100644
--- a/bobequipment/prototypes/recipe/updates.lua
+++ b/bobequipment/prototypes/recipe/updates.lua
@@ -56,15 +56,6 @@ then
     { type = "item", name = "steel-plate", amount = 2 },
   }
 
-  if mods["bobplates"] then
-    if combined_roboports == true then
-      bobmods.lib.tech.add_prerequisite("personal-roboport-mk2-equipment", "bob-zinc-processing")
-      bobmods.lib.tech.add_prerequisite("personal-roboport-mk2-equipment", "bob-invar-processing")
-    else
-      bobmods.lib.tech.add_prerequisite("bob-personal-roboport-modular-equipment-2", "bob-zinc-processing")
-      bobmods.lib.tech.add_prerequisite("bob-personal-roboport-modular-equipment-2", "bob-invar-processing")
-    end
-  end
 else
   data.raw.recipe["personal-roboport-mk2-equipment"].ingredients = {
     { type = "item", name = "personal-roboport-equipment", amount = 1 },
@@ -89,14 +80,14 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-antenna-equipment-2",
       "steel-plate",
-      "bob-aluminium-plate"
+      "bob-nickel-plate"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-2",
       "steel-plate",
-      "bob-invar-alloy"
+      "bob-nickel-plate"
     )
-    bobmods.lib.tech.add_prerequisite("bob-personal-roboport-modular-equipment-2", "bob-invar-processing")
+    bobmods.lib.tech.add_prerequisite("bob-personal-roboport-modular-equipment-2", "bob-nickel-processing")
     bobmods.lib.recipe.add_ingredient(
       "bob-personal-roboport-antenna-equipment-2",
       { type = "item", name = "bob-steel-bearing", amount = 5 }
@@ -113,8 +104,10 @@ if mods["bobplates"] then
   if combined_roboports == true then
     bobmods.lib.recipe.replace_ingredient("personal-roboport-mk2-equipment", "steel-plate", "bob-aluminium-plate")
     bobmods.lib.tech.add_prerequisite("personal-roboport-mk2-equipment", "bob-aluminium-processing")
+    bobmods.lib.tech.add_prerequisite("personal-roboport-mk2-equipment", "bob-nickel-processing")
   else
     bobmods.lib.tech.add_prerequisite("bob-personal-roboport-modular-equipment-2", "bob-aluminium-processing")
+    bobmods.lib.tech.add_prerequisite("bob-personal-roboport-modular-equipment-2", "bob-nickel-processing")
   end
   bobmods.lib.recipe.replace_ingredient(
     "bob-personal-roboport-antenna-equipment-2",
@@ -400,15 +393,15 @@ if data.raw.item["bob-silver-plate"] then
   bobmods.lib.tech.add_prerequisite("bob-solar-panel-equipment-2", "bob-lead-processing")
 end
 
-if data.raw.item["bob-invar-alloy"] then
+if data.raw.item["bob-aluminium-plate"] then
   bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-3", "steel-plate")
   bobmods.lib.recipe.add_ingredient(
     "bob-personal-laser-defense-equipment-3",
-    { type = "item", name = "bob-invar-alloy", amount = 5 }
+    { type = "item", name = "bob-aluminium-plate", amount = 5 }
   )
-  bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-3", "bob-invar-processing")
-  bobmods.lib.recipe.replace_ingredient("bob-exoskeleton-equipment-2", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.tech.add_prerequisite("bob-exoskeleton-equipment-2", "bob-invar-processing")
+  bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-3", "bob-aluminium-processing")
+  bobmods.lib.recipe.replace_ingredient("bob-exoskeleton-equipment-2", "steel-plate", "bob-aluminium-plate")
+  bobmods.lib.tech.add_prerequisite("bob-exoskeleton-equipment-2", "bob-aluminium-processing")
 end
 
 if data.raw.item["bob-cobalt-steel-gear-wheel"] then
@@ -580,7 +573,7 @@ if data.raw.item["tungsten-carbide"] then
     "bob-fission-reactor-equipment-3",
     { type = "item", name = "tungsten-carbide", amount = 80 }
   )
-  bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-tungsten-processing")
 end
 
 if mods["space-age"] then
diff --git a/bobgreenhouse/changelog.txt b/bobgreenhouse/changelog.txt
index 8c2fdfac0..f871aed3d 100644
--- a/bobgreenhouse/changelog.txt
+++ b/bobgreenhouse/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.4
+Version: 2.1.0
 Date: ???
   Changes:
     - Changed Greehouse tech to ignore tech cost multiplier #534
diff --git a/bobgreenhouse/info.json b/bobgreenhouse/info.json
index 3fea98831..dccd98de0 100644
--- a/bobgreenhouse/info.json
+++ b/bobgreenhouse/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobgreenhouse",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Greenhouse mod",
   "author": "Bobingabout",
@@ -8,8 +8,8 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.0",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6",
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0",
     "? space-age >= 2.0.0"
   ],
   "description": "Requires Bob's functions library mod.\n\nThis mod adds a greenhouse, and recipes for it to make wood.\nAlso an advanced recipe that uses Fertiliser to make even more wood"
diff --git a/boblibrary/changelog.txt b/boblibrary/changelog.txt
index 6e9301559..72fb49c8f 100644
--- a/boblibrary/changelog.txt
+++ b/boblibrary/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.4
+Version: 2.1.0
 Date: ???
   Changes:
     - Set item weights #553
diff --git a/boblibrary/info.json b/boblibrary/info.json
index 58da7c077..7ed960393 100644
--- a/boblibrary/info.json
+++ b/boblibrary/info.json
@@ -1,6 +1,6 @@
 {
   "name": "boblibrary",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Functions Library mod",
   "author": "Bobingabout",
diff --git a/boblogistics/changelog.txt b/boblogistics/changelog.txt
index 1a20ec966..93dce5868 100644
--- a/boblogistics/changelog.txt
+++ b/boblogistics/changelog.txt
@@ -1,15 +1,19 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.7
+Version: 2.1.0
 Date: ???
   Changes:
     - Reduced charge approach distance for robochests. Robots waiting to charge will now wait closer to the robochest. #533
     - Disallowed certain entities in space #551
     - Set item weights #553
-    - Increasd pump speed when Quality mod is not enabled #557
-    - Increasd bot health and explosion resistance #563
+    - Increased pump speed when Quality mod is not enabled #557
+    - Increased bot health and explosion resistance #563
     - Improved Turbo belt Space Age compatibility. Renamed Bob's Turbo belt/splitter/underground, removing the "bob-" prefix #569
     - Adjust ingredients for some T4 and T5 recipes #583
     - Spread Fluid handling and Railway techs out in the tech tree #584
+    - Reworked recipe ingredient tiers #585
+      - Added Aluminium pipe and pipe to ground
+      - Increased tech tier of Bronze pipes
+      - Reworked recipe ingredients #585
   Bugfixes:
     - Allowed Basic loaders (AAI Loaders mod) to be crafted in Assembling maching 1 / hand crafted when using expensive mode. #535
     - Fixed next_upgrade for Steam powered inserter and Ultimate inserter #542
diff --git a/boblogistics/data-updates.lua b/boblogistics/data-updates.lua
index df1373442..c1614bd28 100644
--- a/boblogistics/data-updates.lua
+++ b/boblogistics/data-updates.lua
@@ -173,82 +173,69 @@ data.raw["pump"]["pump"].next_upgrade = "bob-pump-2"
 
 if mods["quality"] then
   bobmods.lib.recipe.update_recycling_recipe({
-    "transport-belt",
-    "underground-belt",
-    "splitter",
-    "fast-transport-belt",
-    "fast-underground-belt",
-    "fast-splitter",
-    "express-transport-belt",
-    "express-underground-belt",
-    "express-splitter",
-    "turbo-transport-belt",
-    "turbo-underground-belt",
-    "turbo-splitter",
-    "bob-ultimate-transport-belt",
-    "bob-ultimate-underground-belt",
-    "bob-ultimate-splitter",
-    "inserter",
-    "long-handed-inserter",
-    "bob-red-bulk-inserter",
-    "fast-inserter",
-    "bulk-inserter",
-    "bob-turbo-inserter",
-    "bob-turbo-bulk-inserter",
-    "bob-express-inserter",
-    "bob-express-bulk-inserter",
-    "passive-provider-chest",
-    "storage-chest",
-    "bob-passive-provider-chest-2",
     "bob-active-provider-chest-2",
-    "bob-storage-chest-2",
-    "bob-buffer-chest-2",
-    "bob-requester-chest-2",
-    "bob-passive-provider-chest-3",
     "bob-active-provider-chest-3",
-    "bob-storage-chest-3",
+    "bob-armoured-cargo-wagon",
+    "bob-armoured-cargo-wagon-2",
+    "bob-armoured-fluid-wagon",
+    "bob-armoured-fluid-wagon-2",
+    "bob-armoured-locomotive",
+    "bob-armoured-locomotive-2",
+    "bob-buffer-chest-2",
     "bob-buffer-chest-3",
-    "bob-requester-chest-3",
-    "pump",
+    "bob-cargo-wagon-2",
+    "bob-cargo-wagon-3",
+    "bob-construction-robot-2",
+    "bob-construction-robot-3",
+    "bob-construction-robot-4",
+    "bob-construction-robot-5",
+    "bob-express-bulk-inserter",
+    "bob-express-inserter",
+    "bob-fluid-wagon-2",
+    "bob-fluid-wagon-3",
+    "bob-flying-robot-frame-2",
+    "bob-flying-robot-frame-3",
+    "bob-flying-robot-frame-4",
+    "bob-locomotive-2",
+    "bob-locomotive-3",
+    "bob-logistic-robot-2",
+    "bob-logistic-robot-3",
+    "bob-logistic-robot-4",
+    "bob-logistic-robot-5",
+    "bob-logistic-zone-expander-2",
+    "bob-logistic-zone-expander-3",
+    "bob-logistic-zone-expander-4",
+    "bob-passive-provider-chest-2",
+    "bob-passive-provider-chest-3",
     "bob-pump-2",
     "bob-pump-3",
     "bob-pump-4",
+    "bob-red-bulk-inserter",
+    "bob-repair-pack-2",
+    "bob-repair-pack-3",
+    "bob-repair-pack-4",
+    "bob-repair-pack-5",
+    "bob-requester-chest-2",
+    "bob-requester-chest-3",
+    "bob-robo-charge-port-2",
+    "bob-robo-charge-port-3",
+    "bob-robo-charge-port-4",
+    "bob-robo-charge-port-large-2",
+    "bob-robo-charge-port-large-3",
+    "bob-robo-charge-port-large-4",
+    "bob-robochest-2",
+    "bob-robochest-3",
+    "bob-robochest-4",
     "bob-roboport-antenna-2",
     "bob-roboport-antenna-3",
     "bob-roboport-antenna-4",
     "bob-roboport-chargepad-2",
     "bob-roboport-chargepad-3",
     "bob-roboport-chargepad-4",
+    "bob-roboport-door-1",
     "bob-roboport-door-2",
     "bob-roboport-door-3",
     "bob-roboport-door-4",
-    "roboport",
-    "bob-robochest-2",
-    "bob-robochest-3",
-    "bob-robochest-4",
-    "bob-logistic-zone-expander-2",
-    "bob-logistic-zone-expander-3",
-    "bob-logistic-zone-expander-4",
-    "bob-robo-charge-port-2",
-    "bob-robo-charge-port-3",
-    "bob-robo-charge-port-4",
-    "bob-robo-charge-port-large-2",
-    "bob-robo-charge-port-large-3",
-    "bob-robo-charge-port-large-4",
-    "logistic-robot",
-    "bob-logistic-robot-2",
-    "bob-logistic-robot-3",
-    "bob-logistic-robot-4",
-    "bob-logistic-robot-5",
-    "construction-robot",
-    "bob-construction-robot-2",
-    "bob-construction-robot-3",
-    "bob-construction-robot-4",
-    "bob-construction-robot-5",
-    "flying-robot-frame",
-    "bob-flying-robot-frame-2",
-    "bob-flying-robot-frame-3",
-    "bob-flying-robot-frame-4",
     "bob-robot-brain",
     "bob-robot-brain-2",
     "bob-robot-brain-3",
@@ -261,30 +248,49 @@ if mods["quality"] then
     "bob-robot-tool-logistic-2",
     "bob-robot-tool-logistic-3",
     "bob-robot-tool-logistic-4",
+    "bob-storage-chest-2",
+    "bob-storage-chest-3",
     "bob-storage-tank-2",
     "bob-storage-tank-3",
     "bob-storage-tank-4",
+    "bob-storage-tank-all-corners",
     "bob-storage-tank-all-corners-2",
     "bob-storage-tank-all-corners-3",
     "bob-storage-tank-all-corners-4",
-    "repair-pack",
-    "bob-repair-pack-2",
-    "bob-repair-pack-3",
-    "bob-repair-pack-4",
-    "bob-repair-pack-5",
-    "bob-locomotive-2",
-    "bob-locomotive-3",
-    "bob-armoured-locomotive",
-    "bob-armoured-locomotive-2",
-    "bob-cargo-wagon-2",
-    "bob-cargo-wagon-3",
-    "bob-armoured-cargo-wagon",
-    "bob-armoured-cargo-wagon-2",
-    "bob-fluid-wagon-2",
-    "bob-fluid-wagon-3",
-    "bob-armoured-fluid-wagon",
-    "bob-armoured-fluid-wagon-2",
+    "bob-turbo-bulk-inserter",
+    "bob-turbo-inserter",
+    "bob-ultimate-splitter",
+    "bob-ultimate-transport-belt",
+    "bob-ultimate-underground-belt",
+    "bulk-inserter",
+    "cargo-wagon",
+    "construction-robot",
+    "express-splitter",
+    "express-transport-belt",
+    "express-underground-belt",
+    "fast-inserter",
+    "fast-splitter",
+    "fast-transport-belt",
+    "fast-underground-belt",
+    "fluid-wagon",
+    "flying-robot-frame",
+    "inserter",
     "lab",
+    "locomotive",
+    "logistic-robot",
+    "long-handed-inserter",
+    "passive-provider-chest",
+    "pump",
+    "repair-pack",
+    "roboport",
+    "splitter",
+    "storage-chest",
+    "storage-tank",
+    "transport-belt",
+    "turbo-splitter",
+    "turbo-transport-belt",
+    "turbo-underground-belt",
+    "underground-belt",
   })
   if data.raw.recipe["bob-roboport-2"] then
     bobmods.lib.recipe.update_recycling_recipe({
diff --git a/boblogistics/info.json b/boblogistics/info.json
index 620de562f..a3b2ffe64 100644
--- a/boblogistics/info.json
+++ b/boblogistics/info.json
@@ -1,6 +1,6 @@
 {
   "name": "boblogistics",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Logistics mod",
   "author": "Bobingabout",
@@ -8,9 +8,9 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.49",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6",
-    "? bobinserters >= 1.3.2",
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0",
+    "? bobinserters >= 2.0.0",
     "? space-age >= 2.0.0",
     "? valves",
     "(?) Krastorio2",
diff --git a/boblogistics/locale/en/boblogistics.cfg b/boblogistics/locale/en/boblogistics.cfg
index 1faa7fbc6..2084965a3 100644
--- a/boblogistics/locale/en/boblogistics.cfg
+++ b/boblogistics/locale/en/boblogistics.cfg
@@ -127,6 +127,7 @@ bob-stone-pipe=Stone pipe
 bob-bronze-pipe=Bronze pipe
 bob-steel-pipe=Steel pipe
 bob-plastic-pipe=Plastic pipe
+bob-aluminium-pipe=Aluminium pipe
 bob-brass-pipe=Brass pipe
 bob-titanium-pipe=Titanium pipe
 bob-ceramic-pipe=Ceramic pipe
@@ -139,6 +140,7 @@ bob-stone-pipe-to-ground=Stone pipe-to-ground
 bob-bronze-pipe-to-ground=Bronze pipe-to-ground
 bob-steel-pipe-to-ground=Steel pipe-to-ground
 bob-plastic-pipe-to-ground=Plastic pipe-to-ground
+bob-aluminium-pipe-to-ground=Aluminium pipe-to-ground
 bob-brass-pipe-to-ground=Brass pipe-to-ground
 bob-titanium-pipe-to-ground=Titanium pipe-to-ground
 bob-ceramic-pipe-to-ground=Ceramic pipe-to-ground
@@ -277,6 +279,7 @@ bob-stone-pipe=Stone pipe
 bob-bronze-pipe=Bronze pipe
 bob-steel-pipe=Steel pipe
 bob-plastic-pipe=Plastic pipe
+bob-aluminium-pipe=Aluminium pipe
 bob-brass-pipe=Brass pipe
 bob-titanium-pipe=Titanium pipe
 bob-ceramic-pipe=Ceramic pipe
@@ -291,6 +294,7 @@ bob-stone-pipe-to-ground=Stone pipe-to-ground
 bob-bronze-pipe-to-ground=Bronze pipe-to-ground
 bob-steel-pipe-to-ground=Steel pipe-to-ground
 bob-plastic-pipe-to-ground=Plastic pipe-to-ground
+bob-aluminium-pipe-to-ground=Aluminium pipe-to-ground
 bob-brass-pipe-to-ground=Brass pipe-to-ground
 bob-titanium-pipe-to-ground=Titanium pipe-to-ground
 bob-ceramic-pipe-to-ground=Ceramic pipe-to-ground
diff --git a/boblogistics/migrations/boblogistics_2.0.7.json b/boblogistics/migrations/boblogistics_2.1.0.json
similarity index 96%
rename from boblogistics/migrations/boblogistics_2.0.7.json
rename to boblogistics/migrations/boblogistics_2.1.0.json
index 8619ae0a8..f211d4855 100644
--- a/boblogistics/migrations/boblogistics_2.0.7.json
+++ b/boblogistics/migrations/boblogistics_2.1.0.json
@@ -1,20 +1,20 @@
-{
-  "item":
-  [
-    ["bob-turbo-splitter", "turbo-splitter"],
-    ["bob-turbo-transport-belt", "turbo-transport-belt"],
-    ["bob-turbo-underground-belt", "turbo-underground-belt"]
-  ],
-  "recipe":
-  [
-    ["bob-turbo-splitter", "turbo-splitter"],
-    ["bob-turbo-transport-belt", "turbo-transport-belt"],
-    ["bob-turbo-underground-belt", "turbo-underground-belt"]
-  ],
-  "entity":
-  [
-    ["bob-turbo-splitter", "turbo-splitter"],
-    ["bob-turbo-transport-belt", "turbo-transport-belt"],
-    ["bob-turbo-underground-belt", "turbo-underground-belt"]
-  ]
-}
+{
+  "item":
+  [
+    ["bob-turbo-splitter", "turbo-splitter"],
+    ["bob-turbo-transport-belt", "turbo-transport-belt"],
+    ["bob-turbo-underground-belt", "turbo-underground-belt"]
+  ],
+  "recipe":
+  [
+    ["bob-turbo-splitter", "turbo-splitter"],
+    ["bob-turbo-transport-belt", "turbo-transport-belt"],
+    ["bob-turbo-underground-belt", "turbo-underground-belt"]
+  ],
+  "entity":
+  [
+    ["bob-turbo-splitter", "turbo-splitter"],
+    ["bob-turbo-transport-belt", "turbo-transport-belt"],
+    ["bob-turbo-underground-belt", "turbo-underground-belt"]
+  ]
+}
diff --git a/boblogistics/migrations/boblogistics_2.0.7.lua b/boblogistics/migrations/boblogistics_2.1.0.lua
similarity index 100%
rename from boblogistics/migrations/boblogistics_2.0.7.lua
rename to boblogistics/migrations/boblogistics_2.1.0.lua
diff --git a/boblogistics/prototypes/entity/pipes.lua b/boblogistics/prototypes/entity/pipes.lua
index 667fc747e..a0fcbdece 100644
--- a/boblogistics/prototypes/entity/pipes.lua
+++ b/boblogistics/prototypes/entity/pipes.lua
@@ -1036,6 +1036,90 @@ if mods["bobplates"] then
       impact_category = "metal",
     },
 
+    {
+      type = "pipe",
+      name = "bob-aluminium-pipe",
+      icon = "__boblogistics__/graphics/icons/pipe/ceramic-pipe.png",
+      icon_size = 64,
+      flags = { "placeable-neutral", "player-creation" },
+      minable = { mining_time = 0.2, result = "bob-aluminium-pipe" },
+      max_health = 200,
+      corpse = "small-remnants",
+      icon_draw_specification = { scale = 0.5 },
+      resistances = {
+        {
+          type = "fire",
+          percent = 90,
+        },
+      },
+      fast_replaceable_group = "pipe",
+      collision_box = { { -0.29, -0.29 }, { 0.29, 0.29 } },
+      selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } },
+      fluid_box = {
+        volume = 100,
+        pipe_connections = {
+          { position = { 0, 0 }, direction = defines.direction.north },
+          { position = { 0, 0 }, direction = defines.direction.east },
+          { position = { 0, 0 }, direction = defines.direction.south },
+          { position = { 0, 0 }, direction = defines.direction.west },
+        },
+        hide_connection_info = true,
+      },
+      pictures = bob_pipepictures("ceramic"),
+      impact_category = "metal",
+      working_sound = {
+        sound = {
+          {
+            filename = "__base__/sound/pipe.ogg",
+            volume = 0.65,
+          },
+        },
+        match_volume_to_activity = true,
+        max_sounds_per_prototype = 3,
+      },
+      horizontal_window_bounding_box = { { -0.25, -0.25 }, { 0.25, 0.15625 } },
+      vertical_window_bounding_box = { { -0.28125, -0.5 }, { 0.03125, 0.125 } },
+    },
+
+    {
+      type = "pipe-to-ground",
+      name = "bob-aluminium-pipe-to-ground",
+      icon = "__boblogistics__/graphics/icons/pipe/ceramic-pipe-to-ground.png",
+      icon_size = 64,
+      flags = { "placeable-neutral", "player-creation" },
+      minable = { mining_time = 0.2, result = "bob-aluminium-pipe-to-ground" },
+      max_health = 250,
+      corpse = "small-remnants",
+      icon_draw_specification = { scale = 0.5 },
+      resistances = {
+        {
+          type = "fire",
+          percent = 80,
+        },
+      },
+      fast_replaceable_group = "pipe",
+      collision_box = { { -0.29, -0.29 }, { 0.29, 0.2 } },
+      selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } },
+      fluid_box = {
+        volume = 100,
+        pipe_covers = bob_pipecoverspictures("ceramic"),
+        pipe_connections = {
+          { position = { 0, 0 }, direction = defines.direction.north },
+          {
+            position = { 0, 0 },
+            direction = defines.direction.south,
+            connection_type = "underground",
+            max_underground_distance = 20,
+          },
+        },
+        hide_connection_info = true,
+      },
+      pictures = bob_pipetogroundpictures("ceramic"),
+      visualization = bob_pipetoground_visualization(),
+      disabled_visualization = bob_pipetoground_disabled_visualizaton(),
+      impact_category = "metal",
+    },
+
     {
       type = "pipe",
       name = "bob-brass-pipe",
@@ -1043,7 +1127,7 @@ if mods["bobplates"] then
       icon_size = 64,
       flags = { "placeable-neutral", "player-creation" },
       minable = { mining_time = 0.1, result = "bob-brass-pipe" },
-      max_health = 200,
+      max_health = 250,
       corpse = "small-remnants",
       icon_draw_specification = { scale = 0.5 },
       resistances = {
@@ -1088,7 +1172,7 @@ if mods["bobplates"] then
       icon_size = 64,
       flags = { "placeable-neutral", "player-creation" },
       minable = { mining_time = 0.1, result = "bob-brass-pipe-to-ground" },
-      max_health = 250,
+      max_health = 300,
       corpse = "small-remnants",
       icon_draw_specification = { scale = 0.5 },
       resistances = {
@@ -1109,7 +1193,7 @@ if mods["bobplates"] then
             position = { 0, 0 },
             direction = defines.direction.south,
             connection_type = "underground",
-            max_underground_distance = 20,
+            max_underground_distance = 25,
           },
         },
         hide_connection_info = true,
@@ -1542,6 +1626,7 @@ if mods["bobplates"] then
   })
 
   if feature_flags["freezing"] then
+    data.raw.pipe["bob-aluminium-pipe"].heating_energy = "1kW"
     data.raw.pipe["bob-brass-pipe"].heating_energy = "1kW"
     data.raw.pipe["bob-bronze-pipe"].heating_energy = "1kW"
     data.raw.pipe["bob-ceramic-pipe"].heating_energy = "1kW"
@@ -1550,7 +1635,8 @@ if mods["bobplates"] then
     data.raw.pipe["bob-titanium-pipe"].heating_energy = "1kW"
     data.raw.pipe["bob-tungsten-pipe"].heating_energy = "1kW"
     data.raw["pipe-to-ground"]["bob-bronze-pipe-to-ground"].heating_energy = "150kW"
-    data.raw["pipe-to-ground"]["bob-brass-pipe-to-ground"].heating_energy = "200kW"
+    data.raw["pipe-to-ground"]["bob-aluminium-pipe-to-ground"].heating_energy = "200kW"
+    data.raw["pipe-to-ground"]["bob-brass-pipe-to-ground"].heating_energy = "250kW"
     data.raw["pipe-to-ground"]["bob-ceramic-pipe-to-ground"].heating_energy = "250kW"
     data.raw["pipe-to-ground"]["bob-titanium-pipe-to-ground"].heating_energy = "250kW"
     data.raw["pipe-to-ground"]["bob-tungsten-pipe-to-ground"].heating_energy = "250kW"
@@ -1562,6 +1648,7 @@ if mods["bobplates"] then
         return result
       end
       data.raw["pipe-to-ground"]["bob-bronze-pipe-to-ground"].frozen_patch = frozenpatch()
+      data.raw["pipe-to-ground"]["bob-aluminium-pipe-to-ground"].frozen_patch = frozenpatch()
       data.raw["pipe-to-ground"]["bob-brass-pipe-to-ground"].frozen_patch = frozenpatch()
       data.raw["pipe-to-ground"]["bob-ceramic-pipe-to-ground"].frozen_patch = frozenpatch()
       data.raw["pipe-to-ground"]["bob-titanium-pipe-to-ground"].frozen_patch = frozenpatch()
@@ -1572,6 +1659,7 @@ if mods["bobplates"] then
         local result = util.table.deepcopy(data.raw.pipe.pipe.fluid_box.pipe_covers_frozen)
         return result
       end
+      data.raw.pipe["bob-aluminium-pipe"].fluid_box.pipe_covers_frozen = frozenpatch2()
       data.raw.pipe["bob-brass-pipe"].fluid_box.pipe_covers_frozen = frozenpatch2()
       data.raw.pipe["bob-bronze-pipe"].fluid_box.pipe_covers_frozen = frozenpatch2()
       data.raw.pipe["bob-ceramic-pipe"].fluid_box.pipe_covers_frozen = frozenpatch2()
@@ -1579,6 +1667,7 @@ if mods["bobplates"] then
       data.raw.pipe["bob-nitinol-pipe"].fluid_box.pipe_covers_frozen = frozenpatch2()
       data.raw.pipe["bob-titanium-pipe"].fluid_box.pipe_covers_frozen = frozenpatch2()
       data.raw.pipe["bob-tungsten-pipe"].fluid_box.pipe_covers_frozen = frozenpatch2()
+      data.raw["pipe-to-ground"]["bob-aluminium-pipe-to-ground"].fluid_box.pipe_covers_frozen = frozenpatch2()
       data.raw["pipe-to-ground"]["bob-bronze-pipe-to-ground"].fluid_box.pipe_covers_frozen = frozenpatch2()
       data.raw["pipe-to-ground"]["bob-brass-pipe-to-ground"].fluid_box.pipe_covers_frozen = frozenpatch2()
       data.raw["pipe-to-ground"]["bob-ceramic-pipe-to-ground"].fluid_box.pipe_covers_frozen = frozenpatch2()
@@ -1597,7 +1686,8 @@ if settings.startup["bobmods-logistics-ugdistanceoverhaul"].value == true then
   bobmods.logistics.set_pipe_distance("bob-steel-pipe-to-ground", 2)
   bobmods.logistics.set_pipe_distance("bob-bronze-pipe-to-ground", 2)
   bobmods.logistics.set_pipe_distance("bob-plastic-pipe-to-ground", 3)
-  bobmods.logistics.set_pipe_distance("bob-brass-pipe-to-ground", 3)
+  bobmods.logistics.set_pipe_distance("bob-aluminium-pipe-to-ground", 3)
+  bobmods.logistics.set_pipe_distance("bob-brass-pipe-to-ground", 4)
   bobmods.logistics.set_pipe_distance("bob-ceramic-pipe-to-ground", 4)
   bobmods.logistics.set_pipe_distance("bob-titanium-pipe-to-ground", 4)
   bobmods.logistics.set_pipe_distance("bob-tungsten-pipe-to-ground", 5)
diff --git a/boblogistics/prototypes/item/pipes.lua b/boblogistics/prototypes/item/pipes.lua
index 16b69bbea..8a3207fbc 100644
--- a/boblogistics/prototypes/item/pipes.lua
+++ b/boblogistics/prototypes/item/pipes.lua
@@ -205,6 +205,40 @@ if data.raw.item["bob-bronze-alloy"] then
   })
 end
 
+if data.raw.item["bob-aluminium-plate"] then
+  data:extend({
+    {
+      type = "item",
+      name = "bob-aluminium-pipe",
+      icon = "__boblogistics__/graphics/icons/pipe/ceramic-pipe.png",
+      icon_size = 64,
+      subgroup = "bob-pipe",
+      order = "a[pipe]-a[pipe]-2-4",
+      place_result = "bob-aluminium-pipe",
+      stack_size = 100,
+      drop_sound = pipe_drop_move,
+      inventory_move_sound = pipe_drop_move,
+      pick_sound = pipe_pick,
+      weight = 5000,
+    },
+
+    {
+      type = "item",
+      name = "bob-aluminium-pipe-to-ground",
+      icon = "__boblogistics__/graphics/icons/pipe/ceramic-pipe-to-ground.png",
+      icon_size = 64,
+      subgroup = "bob-pipe-to-ground",
+      order = "a[pipe]-b[pipe-to-ground]-2-4",
+      place_result = "bob-aluminium-pipe-to-ground",
+      stack_size = 50,
+      drop_sound = pipe_drop_move,
+      inventory_move_sound = pipe_drop_move,
+      pick_sound = pipe_pick,
+      weight = 20000,
+    },
+  })
+end
+
 if data.raw.item["bob-brass-alloy"] then
   data:extend({
     {
diff --git a/boblogistics/prototypes/recipe/pipes-recipe.lua b/boblogistics/prototypes/recipe/pipes-recipe.lua
index 741775a7c..71b4c18e6 100644
--- a/boblogistics/prototypes/recipe/pipes-recipe.lua
+++ b/boblogistics/prototypes/recipe/pipes-recipe.lua
@@ -84,7 +84,7 @@ data:extend({
   },
 })
 
-if data.raw.item["bob-bronze-alloy"] then
+if mods["bobplates"] then
   data:extend({
     {
       type = "recipe",
@@ -107,9 +107,30 @@ if data.raw.item["bob-bronze-alloy"] then
       results = { { type = "item", name = "bob-bronze-pipe-to-ground", amount = 2 } },
     },
   })
-end
 
-if data.raw.item["bob-brass-alloy"] then
+  data:extend({
+    {
+      type = "recipe",
+      name = "bob-aluminium-pipe",
+      enabled = false,
+      ingredients = {
+        { type = "item", name = "bob-aluminium-plate", amount = 1 },
+      },
+      results = { { type = "item", name = "bob-aluminium-pipe", amount = 1 } },
+    },
+
+    {
+      type = "recipe",
+      name = "bob-aluminium-pipe-to-ground",
+      enabled = false,
+      ingredients = {
+        { type = "item", name = "bob-aluminium-pipe", amount = 14 },
+        { type = "item", name = "bob-aluminium-plate", amount = 5 },
+      },
+      results = { { type = "item", name = "bob-aluminium-pipe-to-ground", amount = 2 } },
+    },
+  })
+
   data:extend({
     {
       type = "recipe",
@@ -132,9 +153,7 @@ if data.raw.item["bob-brass-alloy"] then
       results = { { type = "item", name = "bob-brass-pipe-to-ground", amount = 2 } },
     },
   })
-end
 
-if data.raw.item["bob-silicon-nitride"] then
   data:extend({
     {
       type = "recipe",
@@ -157,9 +176,7 @@ if data.raw.item["bob-silicon-nitride"] then
       results = { { type = "item", name = "bob-ceramic-pipe-to-ground", amount = 2 } },
     },
   })
-end
 
-if data.raw.item["bob-titanium-plate"] then
   data:extend({
     {
       type = "recipe",
@@ -182,9 +199,7 @@ if data.raw.item["bob-titanium-plate"] then
       results = { { type = "item", name = "bob-titanium-pipe-to-ground", amount = 2 } },
     },
   })
-end
 
-if data.raw.item["tungsten-plate"] then
   data:extend({
     {
       type = "recipe",
@@ -207,9 +222,7 @@ if data.raw.item["tungsten-plate"] then
       results = { { type = "item", name = "bob-tungsten-pipe-to-ground", amount = 2 } },
     },
   })
-end
 
-if data.raw.item["bob-nitinol-alloy"] then
   data:extend({
     {
       type = "recipe",
@@ -232,9 +245,7 @@ if data.raw.item["bob-nitinol-alloy"] then
       results = { { type = "item", name = "bob-nitinol-pipe-to-ground", amount = 2 } },
     },
   })
-end
 
-if data.raw.item["bob-copper-tungsten-alloy"] then
   data:extend({
     {
       type = "recipe",
diff --git a/boblogistics/prototypes/recipe/pump-recipe-updates.lua b/boblogistics/prototypes/recipe/pump-recipe-updates.lua
index aeaf9f932..2fbc1b104 100644
--- a/boblogistics/prototypes/recipe/pump-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/pump-recipe-updates.lua
@@ -1,32 +1,17 @@
-if data.raw.item["bob-copper-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("pump", "pipe", "bob-copper-pipe")
-end
+if mods["bobplates"] then
+  bobmods.lib.recipe.replace_ingredient("pump", "steel-plate", "bob-bronze-alloy")
+  bobmods.lib.recipe.replace_ingredient("pump", "pipe", "bob-bronze-pipe")
+  bobmods.lib.tech.add_prerequisite("fluid-handling", "bob-alloy-processing")
 
-if data.raw.item["bob-aluminium-plate"] then
   bobmods.lib.recipe.replace_ingredient("bob-pump-2", "steel-plate", "bob-aluminium-plate")
+  bobmods.lib.recipe.replace_ingredient("bob-pump-2", "pipe", "bob-aluminium-pipe")
   bobmods.lib.tech.add_prerequisite("bob-fluid-handling-2", "bob-aluminium-processing")
-end
 
-if data.raw.item["bob-bronze-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-pump-2", "bob-copper-pipe", "bob-bronze-pipe")
-end
-
-if data.raw.item["bob-titanium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-pump-3", "steel-plate", "bob-titanium-plate")
-  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-3", "bob-titanium-processing")
-end
-
-if data.raw.item["bob-brass-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-pump-3", "bob-copper-pipe", "bob-brass-pipe")
-  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-3", "bob-zinc-processing")
-end
-
-if data.raw.item["bob-nitinol-alloy"] then
-  bobmods.lib.recipe.replace_ingredient("bob-pump-4", "steel-plate", "bob-nitinol-alloy")
-  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-4", "bob-nitinol-processing")
-end
+  bobmods.lib.recipe.replace_ingredient("bob-pump-3", "steel-plate", "bob-brass-alloy")
+  bobmods.lib.recipe.replace_ingredient("bob-pump-3", "pipe", "bob-brass-pipe")
+  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-3", "bob-brass-processing")
 
-if data.raw.item["bob-copper-tungsten-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-pump-4", "bob-copper-pipe", "bob-copper-tungsten-pipe")
-  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-4", "bob-tungsten-alloy-processing")
+  bobmods.lib.recipe.replace_ingredient("bob-pump-4", "steel-plate", "bob-copper-tungsten-alloy")
+  bobmods.lib.recipe.replace_ingredient("bob-pump-4", "pipe", "bob-copper-tungsten-pipe")
+  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-4", "bob-tungsten-processing")
 end
diff --git a/boblogistics/prototypes/recipe/pump-recipe.lua b/boblogistics/prototypes/recipe/pump-recipe.lua
index 0afe1fcb6..d66579c4e 100644
--- a/boblogistics/prototypes/recipe/pump-recipe.lua
+++ b/boblogistics/prototypes/recipe/pump-recipe.lua
@@ -7,7 +7,7 @@ data:extend({
     ingredients = {
       { type = "item", name = "pump", amount = 1 },
       { type = "item", name = "steel-plate", amount = 1 },
-      { type = "item", name = "bob-copper-pipe", amount = 1 },
+      { type = "item", name = "pipe", amount = 1 },
     },
     results = { { type = "item", name = "bob-pump-2", amount = 1 } },
   },
@@ -19,7 +19,7 @@ data:extend({
     ingredients = {
       { type = "item", name = "bob-pump-2", amount = 1 },
       { type = "item", name = "steel-plate", amount = 1 },
-      { type = "item", name = "bob-copper-pipe", amount = 1 },
+      { type = "item", name = "pipe", amount = 1 },
     },
     results = { { type = "item", name = "bob-pump-3", amount = 1 } },
   },
@@ -31,7 +31,7 @@ data:extend({
     ingredients = {
       { type = "item", name = "bob-pump-3", amount = 1 },
       { type = "item", name = "steel-plate", amount = 1 },
-      { type = "item", name = "bob-copper-pipe", amount = 1 },
+      { type = "item", name = "pipe", amount = 1 },
     },
     results = { { type = "item", name = "bob-pump-4", amount = 1 } },
   },
diff --git a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
index 75ab1c50e..c3d9294bd 100644
--- a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
@@ -5,8 +5,43 @@ bobmods.lib.recipe.set_ingredients("roboport", {
   { type = "item", name = "bob-roboport-door-1", amount = 1 },
 })
 
+if mods["bobplates"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-1", "iron-gear-wheel", "bob-steel-gear-wheel")
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-1", { type = "item", name = "bob-steel-bearing", amount = 20 })
+  
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-2", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-2", { type = "item", name = "bob-cobalt-steel-bearing", amount = 20 })
+  bobmods.lib.tech.add_prerequisite("bob-robo-modular-2", "bob-cobalt-processing")
+  if mods["bobequipment"] then
+    bobmods.lib.tech.add_prerequisite("personal-roboport-mk2-equipment", "bob-cobalt-processing")
+  end
+  if mods["bobvehicleequipment"] then
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-equipment-2", "bob-cobalt-processing")
+  end
+
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-3", "steel-plate", "bob-titanium-plate")
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-3", { type = "item", name = "bob-titanium-bearing", amount = 20 })
+
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-4", "steel-plate", "bob-nitinol-alloy")
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-4", "iron-gear-wheel", "bob-nitinol-gear-wheel")
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-4", { type = "item", name = "bob-nitinol-bearing", amount = 20 })
+else
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-1", { type = "item", name = "iron-gear-wheel", amount = 20 })
+
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-2", { type = "item", name = "iron-gear-wheel", amount = 20 })
+ 
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-3", { type = "item", name = "iron-gear-wheel", amount = 20 })
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-3", { type = "fluid", name = "lubricant", amount = 10 })
+  bobmods.lib.recipe.set_category("bob-roboport-door-3", "crafting-with-fluid")
+
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-4", { type = "item", name = "iron-gear-wheel", amount = 30 })
+  bobmods.lib.recipe.add_ingredient("bob-roboport-door-4", { type = "fluid", name = "lubricant", amount = 15 })
+  bobmods.lib.recipe.set_category("bob-roboport-door-4", "crafting-with-fluid")
+end
+
 if data.raw.item["bob-aluminium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-2", "steel-plate", "bob-aluminium-plate")
   if data.raw.recipe["bob-roboport-2"] then
     bobmods.lib.recipe.replace_ingredient("bob-roboport-2", "steel-plate", "bob-aluminium-plate")
   end
@@ -17,34 +52,16 @@ if data.raw.item["bob-aluminium-plate"] then
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-2", "bob-aluminium-processing")
 end
 
-if data.raw.item["bob-invar-alloy"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-2", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-2", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.tech.add_prerequisite("bob-robo-modular-2", "bob-invar-processing")
+if data.raw.item["bob-nickel-plate"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-2", "steel-plate", "bob-nickel-plate")
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-2", "steel-plate", "bob-nickel-plate")
+  bobmods.lib.tech.add_prerequisite("bob-robo-modular-2", "bob-nickel-processing")
 end
 
 if data.raw.item["bob-tinned-copper-cable"] then
   bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-2", "copper-cable", "bob-tinned-copper-cable")
 end
 
-if data.raw.item["bob-steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("bob-roboport-door-2", { type = "item", name = "bob-steel-bearing", amount = 20 })
-else
-  bobmods.lib.recipe.add_ingredient("bob-roboport-door-2", { type = "item", name = "iron-gear-wheel", amount = 20 })
-end
-
-if data.raw.item["bob-brass-gear-wheel"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-2", "iron-gear-wheel", "bob-brass-gear-wheel")
-  bobmods.lib.tech.add_prerequisite("bob-robo-modular-2", "bob-zinc-processing")
-elseif data.raw.item["bob-steel-gear-wheel"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-2", "iron-gear-wheel", "bob-steel-gear-wheel")
-end
-
-if data.raw.item["bob-nickel-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-3", "steel-plate", "bob-nickel-plate")
-  bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "bob-nickel-processing")
-end
-
 if data.raw.item["bob-insulated-cable"] then
   bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-3", "copper-cable", "bob-insulated-cable")
 end
@@ -54,9 +71,13 @@ if data.raw.item["bob-battery-2"] then
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "bob-battery-2")
 end
 
+if data.raw.item["bob-brass-alloy"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-3", "steel-plate", "bob-brass-alloy")
+  bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "bob-brass-processing")
+end
+
 if data.raw.item["bob-titanium-plate"] then
   bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-3", "steel-plate", "bob-titanium-plate")
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-3", "steel-plate", "bob-titanium-plate")
   if data.raw.recipe["bob-roboport-3"] then
     bobmods.lib.recipe.replace_ingredient("bob-roboport-3", "steel-plate", "bob-titanium-plate")
   end
@@ -67,28 +88,15 @@ if data.raw.item["bob-titanium-plate"] then
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "bob-titanium-processing")
 end
 
-if data.raw.item["bob-titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient(
-    "bob-roboport-door-3",
-    { type = "item", name = "bob-titanium-bearing", amount = 20 }
-  )
-else
-  bobmods.lib.recipe.add_ingredient("bob-roboport-door-3", { type = "item", name = "iron-gear-wheel", amount = 20 })
-  bobmods.lib.recipe.add_ingredient("bob-roboport-door-3", { type = "fluid", name = "lubricant", amount = 10 })
-  data.raw.recipe["bob-roboport-door-3"].category = "crafting-with-fluid"
-end
-
-if data.raw.item["bob-titanium-gear-wheel"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
-end
-
-if data.raw.item["bob-nickel-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-4", "steel-plate", "bob-nickel-plate")
-end
-
 if data.raw.item["bob-gold-plate"] then
   bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-4", "copper-plate", "bob-gold-plate")
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "bob-gold-processing")
+  if mods["bobequipment"] then
+    bobmods.lib.tech.add_prerequisite("bob-personal-roboport-mk4-equipment", "bob-gold-processing")
+  end
+  if mods["bobvehicleequipment"] then
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-equipment-4", "bob-gold-processing")
+  end
 end
 
 if data.raw.item["bob-gilded-copper-cable"] then
@@ -107,8 +115,8 @@ if data.raw.item["bob-battery-3"] then
 end
 
 if data.raw.item["bob-nitinol-alloy"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-4", "steel-plate", "bob-nitinol-alloy")
   bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "steel-plate", "bob-nitinol-alloy")
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-4", "steel-plate", "bob-nitinol-alloy")
   if data.raw.recipe["bob-roboport-4"] then
     bobmods.lib.recipe.replace_ingredient("bob-roboport-4", "steel-plate", "bob-nitinol-alloy")
   end
@@ -118,15 +126,3 @@ if data.raw.item["bob-nitinol-alloy"] then
   bobmods.lib.recipe.replace_ingredient("bob-robo-charge-port-large-4", "steel-plate", "bob-nitinol-alloy")
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "bob-nitinol-processing")
 end
-
-if data.raw.item["bob-nitinol-bearing"] then
-  bobmods.lib.recipe.add_ingredient("bob-roboport-door-4", { type = "item", name = "bob-nitinol-bearing", amount = 20 })
-else
-  bobmods.lib.recipe.add_ingredient("bob-roboport-door-4", { type = "item", name = "iron-gear-wheel", amount = 30 })
-  bobmods.lib.recipe.add_ingredient("bob-roboport-door-4", { type = "fluid", name = "lubricant", amount = 15 })
-  data.raw.recipe["bob-roboport-door-4"].category = "crafting-with-fluid"
-end
-
-if data.raw.item["bob-nitinol-gear-wheel"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-door-4", "iron-gear-wheel", "bob-nitinol-gear-wheel")
-end
diff --git a/boblogistics/prototypes/recipe/robots-recipe-updates.lua b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
index 4ea1b890e..69fbd5081 100644
--- a/boblogistics/prototypes/recipe/robots-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
@@ -134,16 +134,21 @@ if data.raw.recipe["bob-robot-tool-construction"] then
       { type = "item", name = "copper-cable", amount = 8 }
     )
   end
-  if data.raw.item["bob-brass-gear-wheel"] then
+  if data.raw.item["bob-cobalt-steel-gear-wheel"] then
     bobmods.lib.recipe.add_ingredient(
       "bob-robot-tool-construction-2",
-      { type = "item", name = "bob-brass-gear-wheel", amount = 1 }
+      { type = "item", name = "bob-cobalt-steel-gear-wheel", amount = 1 }
     )
     bobmods.lib.recipe.add_ingredient(
       "bob-robot-tool-logistic-2",
-      { type = "item", name = "bob-brass-gear-wheel", amount = 2 }
+      { type = "item", name = "bob-cobalt-steel-gear-wheel", amount = 2 }
     )
-    bobmods.lib.tech.add_prerequisite("bob-robots-1", "bob-zinc-processing")
+    bobmods.lib.recipe.add_ingredient(
+      "bob-robot-tool-logistic-2",
+      { type = "item", name = "bob-cobalt-steel-bearing", amount = 2 }
+    )
+    bobmods.lib.tech.add_prerequisite("bob-robots-1", "bob-cobalt-processing")
+    bobmods.lib.tech.add_prerequisite("bob-robots-1", "bob-cobalt-processing")
   else
     bobmods.lib.recipe.add_ingredient(
       "bob-robot-tool-construction-2",
@@ -154,14 +159,6 @@ if data.raw.recipe["bob-robot-tool-construction"] then
       { type = "item", name = "iron-gear-wheel", amount = 3 }
     )
   end
-  if data.raw.item["bob-cobalt-steel-bearing"] then
-    bobmods.lib.recipe.add_ingredient(
-      "bob-robot-tool-logistic-2",
-      { type = "item", name = "bob-cobalt-steel-bearing", amount = 2 }
-    )
-    bobmods.lib.tech.add_prerequisite("bob-robots-1", "bob-cobalt-processing")
-  end
-
   if data.raw.item["bob-titanium-plate"] then
     bobmods.lib.recipe.add_ingredient(
       "bob-robot-tool-construction-3",
@@ -208,12 +205,11 @@ if data.raw.recipe["bob-robot-tool-construction"] then
       { type = "item", name = "iron-gear-wheel", amount = 4 }
     )
   end
-  if data.raw.item["bob-ceramic-bearing"] then
+  if data.raw.item["bob-titanium-bearing"] then
     bobmods.lib.recipe.add_ingredient(
       "bob-robot-tool-logistic-3",
-      { type = "item", name = "bob-ceramic-bearing", amount = 2 }
+      { type = "item", name = "bob-titanium-bearing", amount = 2 }
     )
-    bobmods.lib.tech.add_prerequisite("bob-robots-2", "bob-ceramics")
   end
 
   if data.raw.item["bob-nitinol-alloy"] then
@@ -274,7 +270,7 @@ if data.raw.recipe["bob-robot-tool-construction"] then
       "bob-robot-tool-logistic-4",
       { type = "item", name = "tungsten-carbide", amount = 1 }
     )
-    bobmods.lib.tech.add_prerequisite("bob-robots-3", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-robots-3", "bob-tungsten-processing")
   end
 end
 
diff --git a/boblogistics/prototypes/recipe/storage-tank-recipe-updates.lua b/boblogistics/prototypes/recipe/storage-tank-recipe-updates.lua
index 815531a38..fbf68ea70 100644
--- a/boblogistics/prototypes/recipe/storage-tank-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/storage-tank-recipe-updates.lua
@@ -1,29 +1,34 @@
-if data.raw.item["bob-invar-alloy"] then
-  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-2", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-2", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-2", "bob-invar-processing")
-end
+if mods["bobplates"] then
+  bobmods.lib.recipe.remove_ingredient("storage-tank", "steel-plate")
+  bobmods.lib.recipe.replace_ingredient("storage-tank", "iron-plate", "bob-bronze-alloy")
+  bobmods.lib.recipe.remove_ingredient("bob-storage-tank-all-corners", "steel-plate")
+  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners", "iron-plate", "bob-bronze-alloy")
+  bobmods.lib.tech.add_prerequisite("fluid-handling", "bob-alloy-processing")
 
-if data.raw.item["bob-steel-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-2", "pipe", "bob-steel-pipe")
-end
+  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-2", "steel-plate", "bob-aluminium-plate")
+  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-2", "steel-plate", "bob-aluminium-plate")
+  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-2", "bob-aluminium-processing")
 
-if data.raw.item["bob-titanium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-3", "steel-plate", "bob-titanium-plate")
-  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-3", "steel-plate", "bob-titanium-plate")
-  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-3", "bob-titanium-processing")
-end
-
-if data.raw.item["bob-titanium-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-3", "pipe", "bob-titanium-pipe")
-end
+  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-3", "steel-plate", "bob-invar-alloy")
+  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-3", "steel-plate", "bob-invar-alloy")
+  bobmods.lib.tech.add_prerequisite("bob-fluid-handling-3", "bob-invar-processing")
 
-if data.raw.item["bob-nitinol-alloy"] then
   bobmods.lib.recipe.replace_ingredient("bob-storage-tank-4", "steel-plate", "bob-nitinol-alloy")
   bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-4", "steel-plate", "bob-nitinol-alloy")
   bobmods.lib.tech.add_prerequisite("bob-fluid-handling-4", "bob-nitinol-processing")
-end
 
-if data.raw.item["bob-nitinol-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-4", "pipe", "bob-nitinol-pipe")
+  if mods["boblogistics"] then
+    bobmods.lib.recipe.add_ingredient("storage-tank", { type = "item", name = "bob-bronze-pipe", amount = 2 })
+    bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners", "pipe", "bob-bronze-pipe")
+
+    bobmods.lib.recipe.add_ingredient("bob-storage-tank-2", { type = "item", name = "bob-aluminium-pipe", amount = 2 })
+    bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-2", "pipe", "bob-aluminium-pipe")
+
+    bobmods.lib.recipe.add_ingredient("bob-storage-tank-3", { type = "item", name = "bob-titanium-pipe", amount = 2 })
+    bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-3", "pipe", "bob-titanium-pipe")
+    bobmods.lib.tech.add_prerequisite("bob-fluid-handling-3", "bob-titanium-processing")
+
+    bobmods.lib.recipe.add_ingredient("bob-storage-tank-4", { type = "item", name = "bob-nitinol-pipe", amount = 2 })
+    bobmods.lib.recipe.replace_ingredient("bob-storage-tank-all-corners-4", "pipe", "bob-nitinol-pipe")
+  end
 end
diff --git a/boblogistics/prototypes/recipe/train-recipe-updates.lua b/boblogistics/prototypes/recipe/train-recipe-updates.lua
index 7b8b77e45..1bd5dac0a 100644
--- a/boblogistics/prototypes/recipe/train-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/train-recipe-updates.lua
@@ -1,136 +1,71 @@
 if settings.startup["bobmods-logistics-trains"].value == true then
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-locomotive-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.recipe.replace_ingredient("bob-cargo-wagon-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-railway-2", "bob-invar-processing")
-    bobmods.lib.tech.add_prerequisite("bob-fluid-wagon-2", "bob-invar-processing")
-  end
+  if mods["bobplates"] then
+    bobmods.lib.recipe.remove_ingredient("cargo-wagon", "iron-plate")
+    bobmods.lib.recipe.replace_ingredient("locomotive", "iron-gear-wheel", "bob-steel-gear-wheel")
+    bobmods.lib.recipe.replace_ingredient("cargo-wagon", "iron-gear-wheel", "bob-steel-gear-wheel")
+    bobmods.lib.recipe.replace_ingredient("fluid-wagon", "pipe", "bob-bronze-pipe")
+    bobmods.lib.recipe.add_ingredient("locomotive", { type = "item", name = "bob-steel-bearing", amount = 16 })
+    bobmods.lib.recipe.add_ingredient("cargo-wagon", { type = "item", name = "bob-steel-bearing", amount = 8 })
+    bobmods.lib.recipe.replace_ingredient("fluid-wagon", "iron-gear-wheel", "bob-steel-bearing")
 
-  if data.raw.item["bob-steel-bearing"] then
-    bobmods.lib.recipe.add_ingredient("bob-locomotive-2", { type = "item", name = "bob-steel-bearing", amount = 16 })
-    bobmods.lib.recipe.add_ingredient("bob-cargo-wagon-2", { type = "item", name = "bob-steel-bearing", amount = 8 })
-    bobmods.lib.recipe.add_ingredient("bob-fluid-wagon-2", { type = "item", name = "bob-steel-bearing", amount = 8 })
-  else
-    bobmods.lib.recipe.add_ingredient("bob-locomotive-2", { type = "item", name = "iron-gear-wheel", amount = 10 })
-    bobmods.lib.recipe.add_ingredient("bob-cargo-wagon-2", { type = "item", name = "iron-gear-wheel", amount = 8 })
-    bobmods.lib.recipe.add_ingredient("bob-fluid-wagon-2", { type = "item", name = "iron-gear-wheel", amount = 8 })
-  end
+    bobmods.lib.recipe.replace_ingredient("bob-locomotive-2", "steel-plate", "bob-cobalt-steel-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-cargo-wagon-2", "steel-plate", "bob-cobalt-steel-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-2", "steel-plate", "bob-cobalt-steel-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-locomotive-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.recipe.replace_ingredient("bob-cargo-wagon-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-2", "pipe", "bob-aluminium-pipe")
+    bobmods.lib.recipe.add_ingredient("bob-locomotive-2", { type = "item", name = "bob-cobalt-steel-bearing", amount = 16 })
+    bobmods.lib.recipe.add_ingredient("bob-cargo-wagon-2", { type = "item", name = "bob-cobalt-steel-bearing", amount = 8 })
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-2", "iron-gear-wheel", "bob-cobalt-steel-bearing")
+    bobmods.lib.tech.add_prerequisite("bob-railway-2", "bob-cobalt-processing")
+    bobmods.lib.tech.add_prerequisite("bob-fluid-wagon-2", "bob-cobalt-processing")
 
-  if data.raw.item["bob-steel-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-locomotive-2", "iron-gear-wheel", "bob-steel-gear-wheel")
-    bobmods.lib.recipe.replace_ingredient("bob-cargo-wagon-2", "iron-gear-wheel", "bob-steel-gear-wheel")
-    bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-2", "iron-gear-wheel", "bob-steel-gear-wheel")
-  end
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive", "steel-plate", "bob-cobalt-steel-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon", "steel-plate", "bob-cobalt-steel-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon", "steel-plate", "bob-cobalt-steel-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon", "pipe", "bob-aluminium-pipe")
+    bobmods.lib.recipe.add_ingredient("bob-armoured-locomotive", { type = "item", name = "bob-cobalt-steel-bearing", amount = 16 })
+    bobmods.lib.recipe.add_ingredient("bob-armoured-cargo-wagon", { type = "item", name = "bob-cobalt-steel-bearing", amount = 8 })
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon", "iron-gear-wheel", "bob-cobalt-steel-bearing")
+    bobmods.lib.tech.add_prerequisite("bob-armoured-railway", "bob-cobalt-processing")
+    bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon", "bob-cobalt-processing")  
+
+    bobmods.lib.recipe.add_ingredient("bob-armoured-locomotive", { type = "item", name = "bob-gunmetal-alloy", amount = 15 })
+    bobmods.lib.recipe.add_ingredient("bob-armoured-cargo-wagon", { type = "item", name = "bob-gunmetal-alloy", amount = 15 })
+    bobmods.lib.recipe.add_ingredient("bob-armoured-fluid-wagon", { type = "item", name = "bob-gunmetal-alloy", amount = 15 })
+    bobmods.lib.tech.add_prerequisite("bob-armoured-railway", "bob-zinc-processing")
+    bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon", "bob-zinc-processing")
 
-  if data.raw.item["bob-titanium-plate"] then
     bobmods.lib.recipe.replace_ingredient("bob-locomotive-3", "steel-plate", "bob-titanium-plate")
     bobmods.lib.recipe.replace_ingredient("bob-cargo-wagon-3", "steel-plate", "bob-titanium-plate")
     bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-3", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-railway-3", "bob-titanium-processing")
-    bobmods.lib.tech.add_prerequisite("bob-fluid-wagon-3", "bob-titanium-processing")
-
-    bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-armoured-railway", "bob-titanium-processing")
-    bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon", "bob-titanium-processing")
-  end
-
-  if data.raw.item["bob-titanium-bearing"] then
-    bobmods.lib.recipe.add_ingredient("bob-locomotive-3", { type = "item", name = "bob-titanium-bearing", amount = 16 })
-    bobmods.lib.recipe.add_ingredient("bob-cargo-wagon-3", { type = "item", name = "bob-titanium-bearing", amount = 8 })
-    bobmods.lib.recipe.add_ingredient("bob-fluid-wagon-3", { type = "item", name = "bob-titanium-bearing", amount = 8 })
-
-    bobmods.lib.recipe.add_ingredient(
-      "bob-armoured-locomotive-2",
-      { type = "item", name = "bob-titanium-bearing", amount = 16 }
-    )
-    bobmods.lib.recipe.add_ingredient(
-      "bob-armoured-cargo-wagon-2",
-      { type = "item", name = "bob-titanium-bearing", amount = 8 }
-    )
-    bobmods.lib.recipe.add_ingredient(
-      "bob-armoured-fluid-wagon-2",
-      { type = "item", name = "bob-titanium-bearing", amount = 8 }
-    )
-  else
-    bobmods.lib.recipe.add_ingredient("bob-locomotive-3", { type = "item", name = "iron-gear-wheel", amount = 10 })
-    bobmods.lib.recipe.add_ingredient("bob-cargo-wagon-3", { type = "item", name = "iron-gear-wheel", amount = 8 })
-    bobmods.lib.recipe.add_ingredient("bob-fluid-wagon-3", { type = "item", name = "iron-gear-wheel", amount = 8 })
-
-    bobmods.lib.recipe.add_ingredient(
-      "bob-armoured-locomotive-2",
-      { type = "item", name = "iron-gear-wheel", amount = 10 }
-    )
-    bobmods.lib.recipe.add_ingredient(
-      "bob-armoured-cargo-wagon-2",
-      { type = "item", name = "iron-gear-wheel", amount = 8 }
-    )
-    bobmods.lib.recipe.add_ingredient(
-      "bob-armoured-fluid-wagon-2",
-      { type = "item", name = "iron-gear-wheel", amount = 8 }
-    )
-  end
-
-  if data.raw.item["bob-titanium-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-locomotive-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
     bobmods.lib.recipe.replace_ingredient("bob-cargo-wagon-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
-    bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-3", "pipe", "bob-titanium-pipe")
+    bobmods.lib.recipe.add_ingredient("bob-locomotive-3", { type = "item", name = "bob-titanium-bearing", amount = 16 })
+    bobmods.lib.recipe.add_ingredient("bob-cargo-wagon-3", { type = "item", name = "bob-titanium-bearing", amount = 8 })
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-wagon-3", "iron-gear-wheel", "bob-titanium-bearing")
+    bobmods.lib.tech.add_prerequisite("bob-railway-3", "bob-titanium-processing")
+    bobmods.lib.tech.add_prerequisite("bob-fluid-wagon-3", "bob-titanium-processing")
 
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive-2", "steel-plate", "bob-titanium-plate")
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon-2", "steel-plate", "bob-titanium-plate")
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "steel-plate", "bob-titanium-plate")
     bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive-2", "iron-gear-wheel", "bob-titanium-gear-wheel")
     bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon-2", "iron-gear-wheel", "bob-titanium-gear-wheel")
-    bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "iron-gear-wheel", "bob-titanium-gear-wheel")
-  end
-
-  if data.raw.item["tungsten-carbide"] then
-    bobmods.lib.tech.add_prerequisite("bob-armoured-railway-2", "bob-tungsten-alloy-processing")
-    bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon-2", "bob-tungsten-alloy-processing")
-    if data.raw.item["bob-silicon-nitride"] then
-      bobmods.lib.recipe.remove_ingredient("bob-armoured-locomotive-2", "steel-plate")
-      bobmods.lib.recipe.add_ingredient(
-        "bob-armoured-locomotive-2",
-        { type = "item", name = "tungsten-carbide", amount = 15 }
-      )
-      bobmods.lib.recipe.add_ingredient(
-        "bob-armoured-locomotive-2",
-        { type = "item", name = "bob-silicon-nitride", amount = 15 }
-      )
-
-      bobmods.lib.recipe.remove_ingredient("bob-armoured-cargo-wagon-2", "steel-plate")
-      bobmods.lib.recipe.add_ingredient(
-        "bob-armoured-cargo-wagon-2",
-        { type = "item", name = "tungsten-carbide", amount = 15 }
-      )
-      bobmods.lib.recipe.add_ingredient(
-        "bob-armoured-cargo-wagon-2",
-        { type = "item", name = "bob-silicon-nitride", amount = 15 }
-      )
-
-      bobmods.lib.recipe.remove_ingredient("bob-armoured-fluid-wagon-2", "steel-plate")
-      bobmods.lib.recipe.add_ingredient(
-        "bob-armoured-fluid-wagon-2",
-        { type = "item", name = "tungsten-carbide", amount = 15 }
-      )
-      bobmods.lib.recipe.add_ingredient(
-        "bob-armoured-fluid-wagon-2",
-        { type = "item", name = "bob-silicon-nitride", amount = 15 }
-      )
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "pipe", "bob-titanium-pipe")
+    bobmods.lib.recipe.add_ingredient("bob-armoured-locomotive-2", { type = "item", name = "bob-titanium-bearing", amount = 16 })
+    bobmods.lib.recipe.add_ingredient("bob-armoured-cargo-wagon-2", { type = "item", name = "bob-titanium-bearing", amount = 8 })
+    bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "iron-gear-wheel", "bob-titanium-bearing")
+    bobmods.lib.tech.add_prerequisite("bob-armoured-railway-2", "bob-titanium-processing")
+    bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon-2", "bob-titanium-processing")
 
-      bobmods.lib.tech.add_prerequisite("bob-armoured-railway-2", "bob-ceramics")
-      bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon-2", "bob-ceramics")
-    else
-      bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive-2", "steel-plate", "tungsten-carbide")
-      bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon-2", "steel-plate", "tungsten-carbide")
-      bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "steel-plate", "tungsten-carbide")
-    end
-  else
-    if data.raw.item["bob-silicon-nitride"] then
-      bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive-2", "steel-plate", "bob-silicon-nitride")
-      bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon-2", "steel-plate", "bob-silicon-nitride")
-      bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "steel-plate", "bob-silicon-nitride")
-      bobmods.lib.tech.add_prerequisite("bob-armoured-railway-2", "bob-ceramics")
-      bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon-2", "bob-ceramics")
-    end
+    bobmods.lib.recipe.add_ingredient("bob-armoured-locomotive-2", { type = "item", name = "bob-silicon-nitride", amount = 15 })
+    bobmods.lib.recipe.add_ingredient("bob-armoured-cargo-wagon-2", { type = "item", name = "bob-silicon-nitride", amount = 15 })
+    bobmods.lib.recipe.add_ingredient("bob-armoured-fluid-wagon-2", { type = "item", name = "bob-silicon-nitride", amount = 15 })
+    bobmods.lib.tech.add_prerequisite("bob-armoured-railway-2", "bob-ceramics")
+    bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon-2", "bob-ceramics")
   end
 end
diff --git a/boblogistics/prototypes/recipe/train-recipe.lua b/boblogistics/prototypes/recipe/train-recipe.lua
index f3c066b6c..efd6ea7be 100644
--- a/boblogistics/prototypes/recipe/train-recipe.lua
+++ b/boblogistics/prototypes/recipe/train-recipe.lua
@@ -32,7 +32,9 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       enabled = false,
       ingredients = {
         { type = "item", name = "locomotive", amount = 1 },
+        { type = "item", name = "advanced-circuit", amount = 5 },
         { type = "item", name = "steel-plate", amount = 25 },
+        { type = "item", name = "iron-gear-wheel", amount = 20 },
       },
       results = { { type = "item", name = "bob-armoured-locomotive", amount = 1 } },
     },
@@ -43,8 +45,8 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       enabled = false,
       ingredients = {
         { type = "item", name = "bob-armoured-locomotive", amount = 1 },
-        { type = "item", name = "steel-plate", amount = 25 },
         { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "steel-plate", amount = 25 },
         { type = "item", name = "iron-gear-wheel", amount = 20 },
       },
       results = { { type = "item", name = "bob-armoured-locomotive-2", amount = 1 } },
@@ -81,6 +83,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       ingredients = {
         { type = "item", name = "cargo-wagon", amount = 1 },
         { type = "item", name = "steel-plate", amount = 25 },
+        { type = "item", name = "iron-gear-wheel", amount = 12 },
       },
       results = { { type = "item", name = "bob-armoured-cargo-wagon", amount = 1 } },
     },
@@ -107,6 +110,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then
         { type = "item", name = "iron-gear-wheel", amount = 12 },
         { type = "item", name = "steel-plate", amount = 16 },
         { type = "item", name = "bob-storage-tank-2", amount = 1 },
+        { type = "item", name = "pipe", amount = 8 },
       },
       results = { { type = "item", name = "bob-fluid-wagon-2", amount = 1 } },
     },
@@ -121,6 +125,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then
         { type = "item", name = "iron-gear-wheel", amount = 12 },
         { type = "item", name = "steel-plate", amount = 16 },
         { type = "item", name = "bob-storage-tank-3", amount = 1 },
+        { type = "item", name = "pipe", amount = 8 },
       },
       results = { { type = "item", name = "bob-fluid-wagon-3", amount = 1 } },
     },
@@ -132,7 +137,10 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       energy_required = 1.5,
       ingredients = {
         { type = "item", name = "fluid-wagon", amount = 1 },
+        { type = "item", name = "iron-gear-wheel", amount = 12 },
         { type = "item", name = "steel-plate", amount = 25 },
+        { type = "item", name = "bob-storage-tank-2", amount = 1 },
+        { type = "item", name = "pipe", amount = 8 },
       },
       results = { { type = "item", name = "bob-armoured-fluid-wagon", amount = 1 } },
     },
@@ -147,6 +155,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then
         { type = "item", name = "iron-gear-wheel", amount = 12 },
         { type = "item", name = "steel-plate", amount = 25 },
         { type = "item", name = "bob-storage-tank-3", amount = 1 },
+        { type = "item", name = "pipe", amount = 8 },
       },
       results = { { type = "item", name = "bob-armoured-fluid-wagon-2", amount = 1 } },
     },
diff --git a/boblogistics/prototypes/repair-pack-updates.lua b/boblogistics/prototypes/repair-pack-updates.lua
index 3818d315f..e1eb8e8ac 100644
--- a/boblogistics/prototypes/repair-pack-updates.lua
+++ b/boblogistics/prototypes/repair-pack-updates.lua
@@ -44,5 +44,5 @@ end
 
 if data.raw.item["tungsten-carbide"] then
   bobmods.lib.recipe.replace_ingredient("bob-repair-pack-5", "steel-plate", "tungsten-carbide")
-  bobmods.lib.tech.add_prerequisite("bob-repair-pack-5", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.add_prerequisite("bob-repair-pack-5", "bob-tungsten-processing")
 end
diff --git a/boblogistics/prototypes/technology-updates.lua b/boblogistics/prototypes/technology-updates.lua
index d761507cd..3f204b80e 100644
--- a/boblogistics/prototypes/technology-updates.lua
+++ b/boblogistics/prototypes/technology-updates.lua
@@ -328,10 +328,15 @@ if data.raw.technology["bob-alloy-processing"] then
   bobmods.lib.tech.add_recipe_unlock("bob-alloy-processing", "bob-bronze-pipe-to-ground")
 end
 
-if data.raw.technology["bob-zinc-processing"] then
-  bobmods.lib.tech.add_recipe_unlock("bob-zinc-processing", "bob-brass-pipe")
-  bobmods.lib.tech.add_recipe_unlock("bob-zinc-processing", "bob-brass-pipe-to-ground")
-  bobmods.lib.tech.add_recipe_unlock("bob-zinc-processing", "bob-brass-chest")
+if data.raw.technology["bob-aluminium-processing"] then
+  bobmods.lib.tech.add_recipe_unlock("bob-aluminium-processing", "bob-aluminium-pipe")
+  bobmods.lib.tech.add_recipe_unlock("bob-aluminium-processing", "bob-aluminium-pipe-to-ground")
+end
+
+if data.raw.technology["bob-brass-processing"] then
+  bobmods.lib.tech.add_recipe_unlock("bob-brass-processing", "bob-brass-pipe")
+  bobmods.lib.tech.add_recipe_unlock("bob-brass-processing", "bob-brass-pipe-to-ground")
+  bobmods.lib.tech.add_recipe_unlock("bob-brass-processing", "bob-brass-chest")
 end
 
 if data.raw.technology["bob-titanium-processing"] then
@@ -344,6 +349,8 @@ end
 if data.raw.technology["bob-tungsten-processing"] then
   bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-tungsten-pipe")
   bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-tungsten-pipe-to-ground")
+  bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-copper-tungsten-pipe")
+  bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-copper-tungsten-pipe-to-ground")
 end
 
 if data.raw.technology["bob-ceramics"] then
@@ -351,11 +358,6 @@ if data.raw.technology["bob-ceramics"] then
   bobmods.lib.tech.add_recipe_unlock("bob-ceramics", "bob-ceramic-pipe-to-ground")
 end
 
-if data.raw.technology["bob-tungsten-alloy-processing"] then
-  bobmods.lib.tech.add_recipe_unlock("bob-tungsten-alloy-processing", "bob-copper-tungsten-pipe")
-  bobmods.lib.tech.add_recipe_unlock("bob-tungsten-alloy-processing", "bob-copper-tungsten-pipe-to-ground")
-end
-
 if data.raw.technology["bob-nitinol-processing"] then
   bobmods.lib.tech.add_recipe_unlock("bob-nitinol-processing", "bob-nitinol-pipe")
   bobmods.lib.tech.add_recipe_unlock("bob-nitinol-processing", "bob-nitinol-pipe-to-ground")
diff --git a/boblogistics/prototypes/technology.lua b/boblogistics/prototypes/technology.lua
index 55baf347c..b40cfc02a 100644
--- a/boblogistics/prototypes/technology.lua
+++ b/boblogistics/prototypes/technology.lua
@@ -312,7 +312,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       prerequisites = {
         "fluid-wagon",
         "automated-rail-transportation",
-        "chemical-science-pack",
+        "bob-fluid-handling-2",
       },
       unit = {
         count = 100,
diff --git a/bobmining/changelog.txt b/bobmining/changelog.txt
index cc6c227c1..bf1c2d71a 100644
--- a/bobmining/changelog.txt
+++ b/bobmining/changelog.txt
@@ -1,10 +1,11 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.5
+Version: 2.1.0
 Date: ???
   Changes:
     - Disallowed certain entities in space #551
     - Set item weights #553
     - Adjust ingredients for some T4 and T5 recipes #583
+    - Reworked machine recipe ingredients #585
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.4
 Date: 15. 01. 2026
diff --git a/bobmining/info.json b/bobmining/info.json
index 296374f3a..59fd2fad6 100644
--- a/bobmining/info.json
+++ b/bobmining/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobmining",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Mining mod",
   "author": "Bobingabout",
@@ -8,9 +8,9 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.4",
-    "? bobores >= 2.0.0",
-    "? bobplates >= 2.0.6"
+    "boblibrary >= 2.1.0",
+    "? bobores >= 2.1.0",
+    "? bobplates >= 2.1.0"
   ],
   "description": "Requires Bob's functions library mod.\n\nAdds higher tiers of electric mining drill that increase mining speed.\nAdds an additional branch of electric mining drills that increase the mining area.\nAdds higher tiers of Pumpjacks\nAdds a full set of water mining drills, for use with the water patches added by Bob's Ores mod.\nAdds several tiers of steel-axe technology to further increase personal mining speed.\n\nAlthough it can function as a stand alone mod, it is intended to be used with the full Bob's Mods set."
 }
diff --git a/bobmining/locale/de/bobmining.cfg b/bobmining/locale/de/bobmining.cfg
index 9c0c3f7cc..99034c5dd 100644
--- a/bobmining/locale/de/bobmining.cfg
+++ b/bobmining/locale/de/bobmining.cfg
@@ -58,8 +58,6 @@ bob-water-miner=Wasser-Förderpumpen
 bob-bronze-axe=Bronzeaxt
 bob-cobalt-steel-axe=Kobaltstahlaxt
 bob-tungsten-axe=Wolframaxt
-bob-nitinol-axe=Nitinolaxt
-bob-diamond-axe=Diamantaxt
 
 
 
diff --git a/bobmining/locale/en/bobmining.cfg b/bobmining/locale/en/bobmining.cfg
index c3334a359..9722a8f58 100644
--- a/bobmining/locale/en/bobmining.cfg
+++ b/bobmining/locale/en/bobmining.cfg
@@ -57,9 +57,8 @@ bob-pumpjacks=Pumpjacks research
 bob-water-miner=Water pumpjacks research
 bob-bronze-axe=Bronze axe
 bob-cobalt-steel-axe=Cobalt steel axe
-bob-tungsten-axe=Tungsten axe
-bob-nitinol-axe=Nitinol axe
-bob-diamond-axe=Diamond axe
+bob-titanium-axe=Titanium axe
+bob-tungsten-axe=Tungsten carbide axe
 
 
 [technology-description]
diff --git a/bobmining/locale/ko/bobmining.cfg b/bobmining/locale/ko/bobmining.cfg
index 5afff6086..3242a2b21 100644
--- a/bobmining/locale/ko/bobmining.cfg
+++ b/bobmining/locale/ko/bobmining.cfg
@@ -35,8 +35,6 @@ bob-pumpjacks=시추기
 bob-water-miner=물 시추기
 bob-bronze-axe=청동 도끼
 bob-cobalt-steel-axe=코발트강 도끼
-bob-diamond-axe=다이아몬드 도끼
-bob-nitinol-axe=니티놀 도끼
 bob-tungsten-axe=텅스텐 도끼
 
 [mod-setting-name]
diff --git a/bobmining/locale/uk/bobmining.cfg b/bobmining/locale/uk/bobmining.cfg
index 5b031af6b..858d31497 100644
--- a/bobmining/locale/uk/bobmining.cfg
+++ b/bobmining/locale/uk/bobmining.cfg
@@ -58,8 +58,6 @@ bob-water-miner=Дослідження водяних насосів
 bob-bronze-axe=Бронзовий інструмент
 bob-cobalt-steel-axe=Інструмент з кобальтової сталі
 bob-tungsten-axe=Вольфрамовий інструмент
-bob-nitinol-axe=Нітіноловий інструмент
-bob-diamond-axe=Діамантовий інструмент
 
 
 
diff --git a/bobmining/locale/zh-TW/bobmining.cfg b/bobmining/locale/zh-TW/bobmining.cfg
index d89e9b3bd..1ba5b98e1 100644
--- a/bobmining/locale/zh-TW/bobmining.cfg
+++ b/bobmining/locale/zh-TW/bobmining.cfg
@@ -58,8 +58,6 @@ bob-water-miner=抽水機研究
 bob-bronze-axe=青銅斧
 bob-cobalt-steel-axe=鈷鋼斧
 bob-tungsten-axe=鎢斧
-bob-nitinol-axe=鈦鎳斧
-bob-diamond-axe=鑽石斧
 
 
 
diff --git a/bobmining/prototypes/areadrill-updates.lua b/bobmining/prototypes/areadrill-updates.lua
index 137248dc4..6711332c5 100644
--- a/bobmining/prototypes/areadrill-updates.lua
+++ b/bobmining/prototypes/areadrill-updates.lua
@@ -8,9 +8,9 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-area-drills-2", "bob-cobalt-processing")
   end
 
-  if data.raw.item["bob-brass-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-2", "iron-gear-wheel", "bob-brass-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-2", "bob-zinc-processing")
+  if data.raw.item["bob-cobalt-steel-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-2", "bob-cobalt-processing")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -18,9 +18,9 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "bob-titanium-processing")
   end
 
-  if data.raw.item["bob-titanium-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "bob-titanium-processing")
+  if data.raw.item["bob-brass-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "iron-gear-wheel", "bob-brass-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "bob-brass-processing")
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
@@ -30,7 +30,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
 
   if data.raw.item["tungsten-carbide"] then
     bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "steel-plate", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-tungsten-gear-wheel"] then
diff --git a/bobmining/prototypes/axes.lua b/bobmining/prototypes/axes.lua
index a5b78fdc2..196aa866c 100644
--- a/bobmining/prototypes/axes.lua
+++ b/bobmining/prototypes/axes.lua
@@ -43,7 +43,7 @@ if settings.startup["bobmods-mining-miningaxes"].value == true then
       {
         type = "technology",
         name = "bob-steel-axe-4",
-        localised_name = { "technology-name.bob-tungsten-axe" },
+        localised_name = { "technology-name.bob-titanium-axe" },
         icon_size = 256,
         icon = "__base__/graphics/technology/steel-axe.png",
         effects = {
@@ -52,30 +52,14 @@ if settings.startup["bobmods-mining-miningaxes"].value == true then
             modifier = 0.5,
           },
         },
-        prerequisites = { "bob-steel-axe-3", "bob-tungsten-processing" },
-        research_trigger = { type = "craft-item", item = "tungsten-plate", count = 50 },
+        prerequisites = { "bob-steel-axe-3", "bob-titanium-processing" },
+        research_trigger = { type = "craft-item", item = "bob-titanium-plate", count = 50 },
         upgrade = true,
       },
       {
         type = "technology",
         name = "bob-steel-axe-5",
-        localised_name = { "technology-name.bob-nitinol-axe" },
-        icon_size = 256,
-        icon = "__base__/graphics/technology/steel-axe.png",
-        effects = {
-          {
-            type = "character-mining-speed",
-            modifier = 1,
-          },
-        },
-        prerequisites = { "bob-steel-axe-4", "bob-nitinol-processing" },
-        research_trigger = { type = "craft-item", item = "bob-nitinol-alloy", count = 50 },
-        upgrade = true,
-      },
-      {
-        type = "technology",
-        name = "bob-steel-axe-6",
-        localised_name = { "technology-name.bob-diamond-axe" },
+        localised_name = { "technology-name.bob-tungsten-axe" },
         icon_size = 256,
         icon = "__base__/graphics/technology/steel-axe.png",
         effects = {
@@ -84,8 +68,8 @@ if settings.startup["bobmods-mining-miningaxes"].value == true then
             modifier = 1,
           },
         },
-        prerequisites = { "bob-steel-axe-5", "bob-gem-processing-3" },
-        research_trigger = { type = "craft-item", item = "bob-diamond-5", count = 50 },
+        prerequisites = { "bob-steel-axe-4", "bob-tungsten-processing" },
+        research_trigger = { type = "craft-item", item = "tungsten-carbide", count = 50 },
         upgrade = true,
       },
     })
@@ -186,32 +170,6 @@ if settings.startup["bobmods-mining-miningaxes"].value == true then
         },
         upgrade = true,
       },
-      {
-        type = "technology",
-        name = "bob-steel-axe-6",
-        localised_name = { "", { "technology-name.steel-axe" }, " 6" },
-        icon_size = 256,
-        icon = "__base__/graphics/technology/steel-axe.png",
-        effects = {
-          {
-            type = "character-mining-speed",
-            modifier = 1,
-          },
-        },
-        prerequisites = { "bob-steel-axe-5" },
-        unit = {
-          count = 250,
-          ingredients = {
-            { "automation-science-pack", 1 },
-            { "logistic-science-pack", 1 },
-            { "chemical-science-pack", 1 },
-            { "production-science-pack", 1 },
-            { "utility-science-pack", 1 },
-          },
-          time = 60,
-        },
-        upgrade = true,
-      },
     })
   end
 end
diff --git a/bobmining/prototypes/drill-updates.lua b/bobmining/prototypes/drill-updates.lua
index 574c39a85..17be0343c 100644
--- a/bobmining/prototypes/drill-updates.lua
+++ b/bobmining/prototypes/drill-updates.lua
@@ -11,9 +11,8 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-drills-3", "bob-cobalt-processing")
   end
 
-  if data.raw.item["bob-brass-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-mining-drill-2", "iron-gear-wheel", "bob-brass-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-drills-3", "bob-zinc-processing")
+  if data.raw.item["bob-cobalt-steel-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-mining-drill-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -21,9 +20,9 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-drills-4", "bob-titanium-processing")
   end
 
-  if data.raw.item["bob-titanium-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-mining-drill-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-drills-4", "bob-titanium-processing")
+  if data.raw.item["bob-brass-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-mining-drill-3", "iron-gear-wheel", "bob-brass-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-drills-4", "bob-brass-processing")
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
@@ -33,7 +32,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then
 
   if data.raw.item["tungsten-carbide"] then
     bobmods.lib.recipe.replace_ingredient("bob-mining-drill-4", "steel-plate", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-drills-5", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-drills-5", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-tungsten-gear-wheel"] then
diff --git a/bobmining/prototypes/pumpjack-updates.lua b/bobmining/prototypes/pumpjack-updates.lua
index f1138ace6..28eb7cd41 100644
--- a/bobmining/prototypes/pumpjack-updates.lua
+++ b/bobmining/prototypes/pumpjack-updates.lua
@@ -12,14 +12,13 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-pumpjacks-2", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-brass-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-pumpjack-1", "iron-gear-wheel", "bob-brass-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-pumpjacks-2", "bob-zinc-processing")
+  if data.raw.item["bob-cobalt-steel-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-pumpjack-1", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-pumpjacks-2", "bob-cobalt-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-pumpjack-1", "pipe", "bob-brass-pipe")
-    bobmods.lib.tech.add_prerequisite("bob-pumpjacks-2", "bob-zinc-processing")
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-pumpjack-1", "pipe", "bob-aluminium-pipe")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -29,12 +28,10 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then
 
   if data.raw.item["bob-titanium-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-pumpjack-2", "iron-gear-wheel", "bob-titanium-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-pumpjacks-3", "bob-titanium-processing")
   end
 
   if data.raw.item["bob-titanium-pipe"] then
     bobmods.lib.recipe.replace_ingredient("bob-pumpjack-2", "pipe", "bob-titanium-pipe")
-    bobmods.lib.tech.add_prerequisite("bob-pumpjacks-3", "bob-titanium-processing")
   end
 
   if data.raw.item["bob-nitinol-alloy"] then
diff --git a/bobmining/prototypes/water-miner-updates.lua b/bobmining/prototypes/water-miner-updates.lua
index 87315b01b..4dd789885 100644
--- a/bobmining/prototypes/water-miner-updates.lua
+++ b/bobmining/prototypes/water-miner-updates.lua
@@ -21,28 +21,25 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
     bobmods.lib.tech.add_prerequisite("bob-water-miner-3", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-brass-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-water-miner-3", "iron-gear-wheel", "bob-brass-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-water-miner-3", "bob-zinc-processing")
+  if data.raw.item["bob-cobalt-steel-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-water-miner-3", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-water-miner-3", "bob-cobalt-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-water-miner-3", "pipe", "bob-brass-pipe")
-    bobmods.lib.tech.add_prerequisite("bob-water-miner-3", "bob-zinc-processing")
+  if data.raw.item["bob-plastic-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-water-miner-3", "pipe", "bob-plastic-pipe")
   end
 
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-water-miner-4", "bob-titanium-processing")
+  if data.raw.item["bob-brass-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "steel-plate", "bob-brass-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-water-miner-4", "bob-brass-processing")
   end
 
-  if data.raw.item["bob-titanium-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "iron-gear-wheel", "bob-titanium-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-water-miner-4", "bob-titanium-processing")
+  if data.raw.item["bob-brass-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "iron-gear-wheel", "bob-brass-gear-wheel")
   end
 
-  if data.raw.item["bob-titanium-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "pipe", "bob-titanium-pipe")
-    bobmods.lib.tech.add_prerequisite("bob-water-miner-4", "bob-titanium-processing")
+  if data.raw.item["bob-brass-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "pipe", "bob-brass-pipe")
   end
 end
diff --git a/bobmodules/changelog.txt b/bobmodules/changelog.txt
index 2fc884fd9..aa6561b39 100644
--- a/bobmodules/changelog.txt
+++ b/bobmodules/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.7
+Version: 2.1.0
 Date: ???
   Bugfixes:
     - Fixed crash with Classic Beacons mod #527
@@ -7,6 +7,7 @@ Date: ???
     - Set minimum values for module settings #540
     - Adjusted modules tech costs #545
     - Set item weights #553
+    - Reworked beacon recipe ingredients #585
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.6
 Date: 18. 01. 2026
diff --git a/bobmodules/data-updates.lua b/bobmodules/data-updates.lua
index 3e3a69590..58235bcd0 100644
--- a/bobmodules/data-updates.lua
+++ b/bobmodules/data-updates.lua
@@ -6,43 +6,44 @@ require("prototypes.technology.module-updates")
 
 if mods["quality"] then
   bobmods.lib.recipe.update_recycling_recipe({
-    "bob-module-contact",
+    "beacon",
+    "bob-beacon-2",
+    "bob-beacon-3",
+    "bob-efficiency-module-4",
+    "bob-efficiency-module-5",
+    "bob-efficiency-processor",
+    "bob-efficiency-processor-2",
+    "bob-efficiency-processor-3",
     "bob-module-circuit-board",
+    "bob-module-contact",
     "bob-module-processor-board",
     "bob-module-processor-board-2",
     "bob-module-processor-board-3",
-    "bob-speed-processor",
-    "bob-speed-processor-2",
-    "bob-speed-processor-3",
-    "bob-efficiency-processor",
-    "bob-efficiency-processor-2",
-    "bob-efficiency-processor-3",
-    "bob-productivity-processor",
-    "bob-productivity-processor-2",
-    "bob-productivity-processor-3",
+    "bob-pollution-clean-module-4",
+    "bob-pollution-clean-module-5",
     "bob-pollution-clean-processor",
     "bob-pollution-clean-processor-2",
     "bob-pollution-clean-processor-3",
+    "bob-pollution-create-module-4",
+    "bob-pollution-create-module-5",
     "bob-pollution-create-processor",
     "bob-pollution-create-processor-2",
     "bob-pollution-create-processor-3",
+    "bob-productivity-module-4",
+    "bob-productivity-module-5",
+    "bob-productivity-processor",
+    "bob-productivity-processor-2",
+    "bob-productivity-processor-3",
+    "bob-quality-module-4",
+    "bob-quality-module-5",
     "bob-quality-processor",
     "bob-quality-processor-2",
     "bob-quality-processor-3",
     "bob-speed-module-4",
     "bob-speed-module-5",
-    "bob-efficiency-module-4",
-    "bob-efficiency-module-5",
-    "bob-productivity-module-4",
-    "bob-productivity-module-5",
-    "bob-pollution-clean-module-4",
-    "bob-pollution-clean-module-5",
-    "bob-pollution-create-module-4",
-    "bob-pollution-create-module-5",
-    "bob-quality-module-4",
-    "bob-quality-module-5",
-    "bob-beacon-2",
-    "bob-beacon-3",
+    "bob-speed-processor",
+    "bob-speed-processor-2",
+    "bob-speed-processor-3",
   })
   if data.raw.recipe["bob-god-module"] then
     bobmods.lib.recipe.update_recycling_recipe({
diff --git a/bobmodules/info.json b/bobmodules/info.json
index 110c99f19..e652e37d6 100644
--- a/bobmodules/info.json
+++ b/bobmodules/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobmodules",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Modules mod",
   "author": "Bobingabout",
@@ -8,9 +8,9 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.49",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6",
-    "? bobelectronics >= 2.0.0",
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0",
+    "? bobelectronics >= 2.1.0",
     "? DiscoScience"
   ],
   "description": "Requires Bob's functions library mod.\n\nExpansion to the Modules system.\nExpands the 3 types of base game module to be 5 tiers, not just 3\nAdjusts the bonuses each module gives, and allows you to customise them in mod settings.\nAdds Pollution creating and Pollution cleaning modules, 5 tiers.\nGod modules provide efficiency + speed + cleaning, with two variants that add either productivity or quality.\nAll recipes are completely reworked, making use of electronic components from Bob's Electronics mod.\n\nAlthough it can function as a stand alone mod, it is intended to be used with the full Bob's Mods set."
diff --git a/bobmodules/prototypes/recipe/beacon-updates.lua b/bobmodules/prototypes/recipe/beacon-updates.lua
index 762f08c04..4d4aa29f6 100644
--- a/bobmodules/prototypes/recipe/beacon-updates.lua
+++ b/bobmodules/prototypes/recipe/beacon-updates.lua
@@ -6,30 +6,33 @@ bobmods.lib.tech.remove_prerequisite("effect-transmission", "production-science-
 bobmods.lib.tech.add_prerequisite("effect-transmission", "modules")
 bobmods.lib.tech.add_prerequisite("effect-transmission", "chemical-science-pack")
 
-if data.raw.item["bob-aluminium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-beacon-2", "steel-plate", "bob-aluminium-plate")
-  bobmods.lib.tech.add_prerequisite("effect-transmission-2", "bob-aluminium-processing")
-end
+if mods["bobplates"] then
+  bobmods.lib.recipe.replace_ingredient("beacon", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.tech.add_prerequisite("effect-transmission", "bob-cobalt-processing")
 
-if data.raw.item["bob-tinned-copper-cable"] then
-  bobmods.lib.recipe.replace_ingredient("bob-beacon-2", "copper-cable", "bob-tinned-copper-cable")
-end
+  bobmods.lib.recipe.replace_ingredient("bob-beacon-2", "steel-plate", "bob-titanium-plate")
+  bobmods.lib.tech.add_prerequisite("effect-transmission-2", "bob-titanium-processing")
 
-if data.raw.item["bob-titanium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-beacon-3", "steel-plate", "bob-titanium-plate")
-  bobmods.lib.tech.add_prerequisite("effect-transmission-3", "bob-titanium-processing")
-end
+  bobmods.lib.recipe.replace_ingredient("bob-beacon-3", "steel-plate", "tungsten-plate")
+  bobmods.lib.tech.add_prerequisite("effect-transmission-3", "bob-tungsten-processing")
 
-if data.raw.item["bob-gold-plate"] then
   bobmods.lib.recipe.replace_ingredient("bob-beacon-3", "copper-plate", "bob-gold-plate")
   bobmods.lib.tech.add_prerequisite("effect-transmission-3", "bob-gold-processing")
 end
 
+if data.raw.item["bob-tinned-copper-cable"] then
+  bobmods.lib.recipe.replace_ingredient("beacon", "copper-cable", "bob-tinned-copper-cable")
+end
+
+if data.raw.item["bob-insulated-cable"] then
+  bobmods.lib.recipe.replace_ingredient("bob-beacon-2", "copper-cable", "bob-insulated-cable")
+end
+
 if data.raw.item["bob-insulated-cable"] then
-  bobmods.lib.recipe.replace_ingredient("bob-beacon-3", "copper-cable", "bob-insulated-cable")
+  bobmods.lib.recipe.replace_ingredient("bob-beacon-3", "copper-cable", "bob-gilded-copper-cable")
 end
 
 if data.raw.item["bob-advanced-processing-unit"] then
-  bobmods.lib.recipe.replace_ingredient("bob-beacon-3", "electronic-circuit", "bob-advanced-processing-unit")
+  bobmods.lib.recipe.add_ingredient("bob-beacon-3", { type = "item", name = "bob-advanced-processing-unit", amount = 20 })
   bobmods.lib.tech.add_prerequisite("effect-transmission-3", "bob-advanced-processing-unit")
 end
diff --git a/bobmodules/prototypes/recipe/electronics-updates.lua b/bobmodules/prototypes/recipe/electronics-updates.lua
index d5c28afab..6f4416ce7 100644
--- a/bobmodules/prototypes/recipe/electronics-updates.lua
+++ b/bobmodules/prototypes/recipe/electronics-updates.lua
@@ -8,6 +8,7 @@ if data.raw.item["bob-silver-plate"] then
     "bob-module-processor-board-2",
     { type = "item", name = "bob-silver-plate", amount = 4 }
   )
+  bobmods.lib.tech.add_prerequisite("bob-modules-3", "bob-lead-processing")
 end
 
 if data.raw.item["bob-gold-plate"] then
@@ -15,6 +16,7 @@ if data.raw.item["bob-gold-plate"] then
     "bob-module-processor-board-3",
     { type = "item", name = "bob-gold-plate", amount = 8 }
   )
+  bobmods.lib.tech.add_prerequisite("bob-modules-4", "bob-gold-processing")
 end
 
 if data.raw.item["bob-tinned-copper-cable"] then
diff --git a/bobores/changelog.txt b/bobores/changelog.txt
index 486ff2722..5ab4cd05c 100644
--- a/bobores/changelog.txt
+++ b/bobores/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.4
+Version: 2.1.0
 Date: ???
   Changes:
     - Set item weights #553
diff --git a/bobores/info.json b/bobores/info.json
index 26b23a93c..0a6d23b75 100644
--- a/bobores/info.json
+++ b/bobores/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobores",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Ores mod",
   "author": "Bobingabout",
@@ -8,7 +8,7 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.0",
-    "boblibrary >= 2.0.4"
+    "boblibrary >= 2.1.0"
   ],
   "description": "Requires Bob's functions library mod.\n\nAdds some useful ores, designed for use by Bob's Metals, Chemicals and Intermediates mod (MCI).\nAll ores are disabled by default, MCI will turn on the minimum required ores.\nOther mods may make use of these ores.\n\nOres include, Bauxite(Aluminium), Cobalt, Gems, Gold, Galena(Lead), Nickel, Quartz(Glass, Silicon), Rutile(Titanium), Silver, Sulfur, Thorium, Tin, Tungsten and Zinc.\nAlso includes Ground water and Lithia water mining fluid nodes, which function similar to Oil."
 }
diff --git a/bobores/migrations/bobores_2.0.4.json b/bobores/migrations/bobores_2.1.0.json
similarity index 100%
rename from bobores/migrations/bobores_2.0.4.json
rename to bobores/migrations/bobores_2.1.0.json
diff --git a/bobores/migrations/bobores_2.0.4.lua b/bobores/migrations/bobores_2.1.0.lua
similarity index 100%
rename from bobores/migrations/bobores_2.0.4.lua
rename to bobores/migrations/bobores_2.1.0.lua
diff --git a/bobplates/changelog.txt b/bobplates/changelog.txt
index e46691c69..72a9f1799 100644
--- a/bobplates/changelog.txt
+++ b/bobplates/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.6
+Version: 2.1.0
 Date: ???
   Bugfixes:
     - Fixed some fluids / recipes not combining in Factoriopedia #565
@@ -22,6 +22,11 @@ Date: ???
     - Adjust ingredients for some T4 and T5 recipes #583
     - Increased the tech tier of Gold processing and Tungsten processing #583
     - Reduced the amount of Hydrogen chloride required for Tungstic acid #589
+    - Reworked plate tiers #585
+      - Reworked machine recipe ingredients
+      - Increased the tech tier of Nickel, Brass, Invar
+      - Added new tech Brass processing
+      - Combined techs Tungsten processing and Tungsten alloy processing
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.5
 Date: 15. 01. 2026
diff --git a/bobplates/info.json b/bobplates/info.json
index 7d62f50bd..adead2e24 100644
--- a/bobplates/info.json
+++ b/bobplates/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobplates",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Metals, Chemicals and Intermediates mod",
   "author": "Bobingabout",
@@ -8,9 +8,9 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.4",
-    "bobores >= 2.0.0",
-    "? bobenemies >= 2.0.0",
+    "boblibrary >= 2.1.0",
+    "bobores >= 2.1.0",
+    "? bobenemies >= 2.1.0",
     "? space-age >= 2.0.0"
   ],
   "description": "Requires Bob's functions library mod.\nDesigned to make use of resources provided by Bob's Ores mod to function as intended\nOther mods may provide an alternate method to obtain the required resources.\n\nThis mod is designed as a base to be used with the full Bob's Mods set.\n\nThis mod adds new production processes including:\n  Electrolysis: Seperation of a liquid using electricity.\n  Chemical furnace: Heat and a Fluid.\n  Mixing furnace: Heat with more than 1 ingredient.\n  Liquid pump: Mostly used for Barrelling.\n  Gas pump: Used for Bottling, a Barrelling alternative, but also produces the resource Compressed air.\n  Gas vent: Disposes of unwanted gasses into the void.\n\nThis mod adds a method to produce a metals from resource of the following:\nAluminium, Cobalt, Gold, Lead, Nickel, Glass, Silicon, Titanium, Silver, Tin, Tungsten, Lithium and Zinc.\nAlloys of the following:\nBronze, Brass, Gunmetal, Copper-tungsten, Tungsten carbide, Invar, Nitinol and Cobalt-steel.\nAlso adds a wide array of other materials including Ceramics, Gem processing, and a large array of Liquid and Gas chemicals.\nThis mod also provides intermediate products including Gear wheels and bearings of multiple materials, Advanced processing units, and 2 tiers of batteries."
diff --git a/bobplates/locale/cs/bobplates.cfg b/bobplates/locale/cs/bobplates.cfg
index 2ebc402c8..053ff8761 100644
--- a/bobplates/locale/cs/bobplates.cfg
+++ b/bobplates/locale/cs/bobplates.cfg
@@ -265,7 +265,6 @@ bob-cobalt-processing=Zpracování kobaltu
 bob-brass-processing=Zpracování mosazu
 bob-nitinol-processing=Zpracování nitinolu
 bob-invar-processing=Zpracování invaru
-bob-tungsten-alloy-processing=Zpracování wolframových slitin
 
 bob-nitrogen-processing=Zpracování dusíku
 bob-heavy-water-processing=Zpracování těžké vody
@@ -327,7 +326,6 @@ bob-tungsten-processing=Wolfram má hodně vysoký bod tavení, zkusme vyzkoumat
 
 bob-nitinol-processing=Nitinol je slitina titanu a niklu, pojďme se podívat na co ji použijeme.
 bob-invar-processing=Invar je slitina železa a niklu, možno to na něco můžeme použít.
-bob-tungsten-alloy-processing=Výzkum, jak vyrobit wolframové slitiny, toto vám to může udělat ještě více užitečné.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/de/bobplates.cfg b/bobplates/locale/de/bobplates.cfg
index d923022ba..baf24d04d 100644
--- a/bobplates/locale/de/bobplates.cfg
+++ b/bobplates/locale/de/bobplates.cfg
@@ -287,7 +287,6 @@ bob-cobalt-processing=Kobaltverarbeitung
 bob-brass-processing=Messingverarbeitung
 bob-nitinol-processing=Nitinolverarbeitung
 bob-invar-processing=Invarverarbeitung
-bob-tungsten-alloy-processing=Verarbeitung von Wolframlegierungen
 
 bob-nitrogen-processing=Stickstoffverarbeitung
 bob-heavy-water-processing=Verarbeitung von schwerem Wasser
@@ -351,7 +350,6 @@ bob-tungsten-processing=Alternative Wolframverarbeitung, da eine Schmelze sehr i
 
 bob-nitinol-processing=Nitinol ist eine Nickel-Titan-Legierung mit fortschrittlichen Einsatzmöglichkeiten.
 bob-invar-processing=Invar ist eine Eisen-Nickel-Legierung mit besonderen thermischen Eigenschaften.
-bob-tungsten-alloy-processing=Schaltet Wolframlegierungen frei welche weitere Anwendungen ermöglichen.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/en/bobplates.cfg b/bobplates/locale/en/bobplates.cfg
index 5dcf65c33..9780c05c1 100644
--- a/bobplates/locale/en/bobplates.cfg
+++ b/bobplates/locale/en/bobplates.cfg
@@ -287,7 +287,6 @@ bob-cobalt-processing=Cobalt processing
 bob-brass-processing=Brass processing
 bob-nitinol-processing=Nitinol processing
 bob-invar-processing=Invar processing
-bob-tungsten-alloy-processing=Tungsten alloy processing
 
 bob-nitrogen-processing=Nitrogen processing
 bob-heavy-water-processing=Heavy water processing
@@ -351,7 +350,6 @@ bob-tungsten-processing=Tungsten has a very high melting point, let's research h
 
 bob-nitinol-processing=Nitinol is a nickel titanium alloy, let's see what we can use it for.
 bob-invar-processing=Invar is an iron nickel alloy, maybe we can use this for something.
-bob-tungsten-alloy-processing=Research how to make tungsten based alloys, this might make it even more useful.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/es-ES/bobplates.cfg b/bobplates/locale/es-ES/bobplates.cfg
index 4865307e0..4f0946d45 100644
--- a/bobplates/locale/es-ES/bobplates.cfg
+++ b/bobplates/locale/es-ES/bobplates.cfg
@@ -260,7 +260,6 @@ bob-cobalt-processing=Procesamiento de cobalto
 bob-brass-processing=Procesamiento de latón
 bob-nitinol-processing=Procesamiento de nitinol
 bob-invar-processing=Procesamiento de invar
-bob-tungsten-alloy-processing=Procesamiento de aleación de tungsteno
 
 bob-nitrogen-processing=procesamiento de nitrógeno
 bob-heavy-water-processing=Procesamiento de agua pesada
@@ -311,7 +310,6 @@ bob-tungsten-processing=El tungsteno tiene un punto de fusión muy alto, vamos a
 
 bob-nitinol-processing=Nitinol es una aleación de níquel y titanio, vamos a ver en que podemos utilizarlo.
 bob-invar-processing=Invar es una aleación de hierro y níquel, tal vez podemos utilizar esto para algo.
-bob-tungsten-alloy-processing=Investigación cómo hacer aleaciones a base de tungsteno, esto puede hacer que sea aún más útil.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/fr/bobplates.cfg b/bobplates/locale/fr/bobplates.cfg
index d730ad962..6061ad12b 100644
--- a/bobplates/locale/fr/bobplates.cfg
+++ b/bobplates/locale/fr/bobplates.cfg
@@ -265,7 +265,6 @@ bob-cobalt-processing=Traitement du cobalt
 bob-brass-processing=Traitement du laiton
 bob-nitinol-processing=Traitement du nitinol
 bob-invar-processing=Traitement de l'invar
-bob-tungsten-alloy-processing=Traitement des alliages au tungstène
 
 bob-nitrogen-processing=Traitement de l'azote
 bob-heavy-water-processing=Traitement de l'eau lourde
@@ -327,7 +326,6 @@ bob-tungsten-processing=Le tungstène ne fond qu'a très haute température, rec
 
 bob-nitinol-processing=Le nitinol est un alliage de nickel et de titane, voyons ce que nous pouvons faire avec.
 bob-invar-processing=L'invar est un alliage de nickel et de fer, nous pouvons surement l'utiliser pour quelque chose.
-bob-tungsten-alloy-processing=Rechercher comment produire des alliages à base de tungstène, cela le rendra encore plus utile.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/id/bobplates.cfg b/bobplates/locale/id/bobplates.cfg
index 8310ca9bf..180d7591b 100644
--- a/bobplates/locale/id/bobplates.cfg
+++ b/bobplates/locale/id/bobplates.cfg
@@ -262,7 +262,6 @@ bob-cobalt-processing=Pengolahan kobalt
 bob-brass-processing=Pengolahan kuningan
 bob-nitinol-processing=Pengolahan nitinol
 bob-invar-processing=Pengolahan invar
-bob-tungsten-alloy-processing=Pengolahan logam paduan wolfram
 
 bob-nitrogen-processing=Pengolahan nitrogen
 bob-heavy-water-processing=Pengolahan air berat
@@ -321,7 +320,6 @@ bob-tungsten-processing=Wolfram memiliki titik leleh yang sangat tinggi, mari ri
 
 bob-nitinol-processing=Nitinol adalah sebuah logam paduan Nikel Titanium, mari kita lihat benda tersebut digunakan untuk apa.
 bob-invar-processing=Invar adalah sebuah logam paduan Besi Nikel, mungkin kita bisa menggunakannya untuk sesuatu.
-bob-tungsten-alloy-processing=Riset cara membuat logam paduan berdasar Wolfram, hal ini mungkin membuatnya makin berguna.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/it/bobplates.cfg b/bobplates/locale/it/bobplates.cfg
index abc1278ba..6a975b854 100644
--- a/bobplates/locale/it/bobplates.cfg
+++ b/bobplates/locale/it/bobplates.cfg
@@ -235,7 +235,6 @@ bob-cobalt-processing=Lavorazione del cobalto
 bob-brass-processing=Lavorazione dell'ottone
 bob-nitinol-processing=Lavorazione del nitinol
 bob-invar-processing=Lavorazione dell'invar
-bob-tungsten-alloy-processing=Lavorazione delle leghe di tungsteno
 
 bob-nitrogen-processing=Lavorazione dell'azoto
 bob-ceramics=Ceramica
@@ -280,7 +279,6 @@ bob-tungsten-processing=Ricerca come raffinare il tungsteno.
 
 bob-nitinol-processing=Ricerca come raffinare il nitinol. E' una lega di nichel e titanio
 bob-invar-processing=Ricerca come raffinare l'invar. L'invar è una lega di nichel e ferro
-bob-tungsten-alloy-processing=Ricerca come produrre leghe a base di tungsteno.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/ja/bobplates.cfg b/bobplates/locale/ja/bobplates.cfg
index 1f7deb4f1..5ca83b8fa 100644
--- a/bobplates/locale/ja/bobplates.cfg
+++ b/bobplates/locale/ja/bobplates.cfg
@@ -265,7 +265,6 @@ bob-cobalt-processing=コバルト処理
 bob-brass-processing=真ちゅう処理
 bob-nitinol-processing=ニチノール処理
 bob-invar-processing=インバー処理
-bob-tungsten-alloy-processing=タングステン合金処理
 
 bob-nitrogen-processing=窒素処理
 bob-heavy-water-processing=重水処理
@@ -327,7 +326,6 @@ bob-tungsten-processing=タングステンを精錬する方法を研究しま
 
 bob-nitinol-processing=ニチノールを精錬する方法を研究します。ニチノールとはニッケルとチタニウムの合金です。
 bob-invar-processing=インバーを精錬する方法を研究します。インバーは鉄とニッケルの合金です。
-bob-tungsten-alloy-processing=タングステンを使用した合金の精錬する方法を研究します。
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/ko/bobplates.cfg b/bobplates/locale/ko/bobplates.cfg
index 78af3e63c..06b33fcaa 100644
--- a/bobplates/locale/ko/bobplates.cfg
+++ b/bobplates/locale/ko/bobplates.cfg
@@ -238,7 +238,6 @@ bob-cobalt-processing=코발트 처리
 bob-brass-processing=황동 처리
 bob-nitinol-processing=니티놀 처리
 bob-invar-processing=인바 처리
-bob-tungsten-alloy-processing=텅스텐 합금 처리
 bob-nitrogen-processing=질소 처리
 bob-heavy-water-processing=중수 처리
 bob-ceramics=세라믹
@@ -291,7 +290,6 @@ bob-titanium-processing=티타늄은 매우 튼튼하고 가벼운 금속이지
 bob-tungsten-processing=텅스텐은 매우 높은 녹는점을 가지고 있기 때문에, 별도의 정제 공정이 필요합니다.
 bob-nitinol-processing=니켈-티타늄 합금인 니티놀을 어디에 사용할 수 있는지 연구해보세요.
 bob-invar-processing=인바는 철-니켈 합금으로, 무언가를 제작하는 데 유용할지도 모릅니다.
-bob-tungsten-alloy-processing=텅스텐 기반 합금을 만드는 방법을 연구하여, 훨씬 더 유용하게 사용해볼 수 있습니다.
 
 [fuel-category-name]
 uranium=우라늄
diff --git a/bobplates/locale/nl/bobplates.cfg b/bobplates/locale/nl/bobplates.cfg
index fd4a99fb4..1a396fd14 100644
--- a/bobplates/locale/nl/bobplates.cfg
+++ b/bobplates/locale/nl/bobplates.cfg
@@ -265,7 +265,6 @@ bob-cobalt-processing=Kobaltverwerking
 bob-brass-processing=Messingverwerking
 bob-nitinol-processing=Nitinolverwerking
 bob-invar-processing=Invarverwerking
-bob-tungsten-alloy-processing=Wolfraamlegeringverwerking
 
 bob-nitrogen-processing=Stikstofverwerking
 bob-heavy-water-processing=Zwaar waterverwerking
@@ -327,7 +326,6 @@ bob-tungsten-processing=Wolfraam heeft een heel hoog smeltpunt, laten we onderzo
 
 bob-nitinol-processing=Nitinol is een nikkel-titaniumlegering, laten we zien waar het voor kunnen gebruiken.
 bob-invar-processing=Invar is een ijzer-nikkellegering, misschien kunnen we het voor iets gebruiken.
-bob-tungsten-alloy-processing="Onderzoek naar wolfraam-gebaseerde legeringen; dit maakt het misschien nog nuttiger."
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/pl/bobplates.cfg b/bobplates/locale/pl/bobplates.cfg
index a83467c1a..8a356bb91 100644
--- a/bobplates/locale/pl/bobplates.cfg
+++ b/bobplates/locale/pl/bobplates.cfg
@@ -265,7 +265,6 @@ bob-cobalt-processing=Przetwarzanie kobaltu
 bob-brass-processing=Przetwarzanie mosiądzu
 bob-nitinol-processing=Przetwarzanie nitinolu
 bob-invar-processing=Przetwarzanie inwaru
-bob-tungsten-alloy-processing=Przetwarzanie stopów wolframu
 
 bob-nitrogen-processing=Przetwarzanie azotu
 bob-heavy-water-processing=Przetwarzanie ciężkiej wody
@@ -327,7 +326,6 @@ bob-tungsten-processing=Wolfram jest metalem o bardzo wysokiej temperaturze topn
 
 bob-nitinol-processing=Nitinol jest stopem niklu tytanu, zobaczmy, do czego możemy go użyć.
 bob-invar-processing=Inwar jest stopem niklu i żelaza, może możemy go do czegoś użyć.
-bob-tungsten-alloy-processing=Zbadaj jak możesz uzyskać stopy wolframu, może to uczynić je jeszcze bardziej przydatnymi.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/pt-BR/bobplates.cfg b/bobplates/locale/pt-BR/bobplates.cfg
index 83b289d47..e3dc345fc 100644
--- a/bobplates/locale/pt-BR/bobplates.cfg
+++ b/bobplates/locale/pt-BR/bobplates.cfg
@@ -265,7 +265,6 @@ bob-cobalt-processing=Processamento de cobalto
 bob-brass-processing=Processamento de latão
 bob-nitinol-processing=Processamento de nitinol
 bob-invar-processing=Processamento de invar
-bob-tungsten-alloy-processing=Processamento de liga de tungstênio
 
 bob-nitrogen-processing=Processamento de nitrogênio
 bob-heavy-water-processing=Processamento de água pesada
@@ -327,7 +326,6 @@ bob-tungsten-processing=O tungstênio tem um ponto de derretimento muito alto, v
 
 bob-nitinol-processing=Nitinol é uma liga de níquel e titânio, vamos ver em que podemos usá-la.
 bob-invar-processing=Invar é uma liga de ferro e níquel, talvez nós possamos usá-la para alguma coisa.
-bob-tungsten-alloy-processing=Pesquisa como fazer ligas de tungstênio, isso pode fazê-lo ainda mais útil.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/ru/bobplates.cfg b/bobplates/locale/ru/bobplates.cfg
index 5b5296b89..a909dfd92 100644
--- a/bobplates/locale/ru/bobplates.cfg
+++ b/bobplates/locale/ru/bobplates.cfg
@@ -277,7 +277,6 @@ bob-cobalt-processing=Производство кобальта
 bob-brass-processing=Производство латуни
 bob-nitinol-processing=Производство нитинола
 bob-invar-processing=Производство инвара
-bob-tungsten-alloy-processing=Производство вольфрамовых сплавов
 
 bob-nitrogen-processing=Переработка азота
 bob-heavy-water-processing=Производство тяжёлой воды
@@ -341,7 +340,6 @@ bob-tungsten-processing=Вольфрам чрезвычайно тугоплав
 
 bob-nitinol-processing=Нитинол это сплав никеля и титана, посмотрим что из него можно сделать.
 bob-invar-processing=Инвар это сплав никеля и железа, возможно пригодится для чего-нибудь.
-bob-tungsten-alloy-processing=Исследование вольфрамовых сплавов с ещё более интересными применениями.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/tr/bobplates.cfg b/bobplates/locale/tr/bobplates.cfg
index 3051afbbc..1127191db 100644
--- a/bobplates/locale/tr/bobplates.cfg
+++ b/bobplates/locale/tr/bobplates.cfg
@@ -265,7 +265,6 @@ bob-cobalt-processing=Kobalt işleme
 bob-brass-processing=Pirinç işleme
 bob-nitinol-processing=Nitinol işleme
 bob-invar-processing=Invar işleme
-bob-tungsten-alloy-processing=Volfram alaşımı işleme
 
 bob-nitrogen-processing=Nitrojen işleme
 bob-heavy-water-processing=Ağır su işleme
@@ -327,7 +326,6 @@ bob-tungsten-processing=Volfram yüksek bir erime noktasına sahiptir, başka bi
 
 bob-nitinol-processing=Nitinol bir Nikel Titanyum alaşımıdır, hadi onu ne için kullanabileceğimize bakalım.
 bob-invar-processing=Invar bir Demir Nikel alaşımıdır, belki bunu bir şey için kullanabiliriz.
-bob-tungsten-alloy-processing=Volfram temelli alaşımların nasıl yapıldığını araştırın, hatta bu onu daha kullanışlı yapabilir.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/uk/bobplates.cfg b/bobplates/locale/uk/bobplates.cfg
index 7aa283cba..b151e675d 100644
--- a/bobplates/locale/uk/bobplates.cfg
+++ b/bobplates/locale/uk/bobplates.cfg
@@ -265,7 +265,6 @@ bob-cobalt-processing=Виробництво кобальтину
 bob-brass-processing=Виробництво латуні
 bob-nitinol-processing=Виробництво нітінолу
 bob-invar-processing=Виробництво інвару
-bob-tungsten-alloy-processing=Виробництво вольфрамових сплавів
 
 bob-nitrogen-processing=Виробництво азоту
 bob-heavy-water-processing=Виробництво тяжкої води
@@ -327,7 +326,6 @@ bob-tungsten-processing=Вольфрам має дуже високу темпе
 
 bob-nitinol-processing=Нітинол є сплавом нікелю та титану, подивимось, як це використати.
 bob-invar-processing=Інвар являє собою сплав заліза та нікелю, можливо ми зможемо його використати для чогось.
-bob-tungsten-alloy-processing=Дослідити, як зробити сплав на основі вольфраму, це може бути більш корисним у застосуванні.
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/zh-CN/bobplates.cfg b/bobplates/locale/zh-CN/bobplates.cfg
index 6161ca81e..518763a5a 100644
--- a/bobplates/locale/zh-CN/bobplates.cfg
+++ b/bobplates/locale/zh-CN/bobplates.cfg
@@ -264,7 +264,6 @@ bob-cobalt-processing=钴处理
 bob-brass-processing=黄铜处理
 bob-nitinol-processing=镍钛合金处理
 bob-invar-processing=殷钢处理
-bob-tungsten-alloy-processing=钨合金处理
 
 bob-nitrogen-processing=氮处理
 bob-heavy-water-processing=重水处理
@@ -325,7 +324,6 @@ bob-tungsten-processing=钨是一种有极高熔点的金属，让我们研究
 
 bob-nitinol-processing=让我们看看镍钛合金有什么地方可以使用的。
 bob-invar-processing=殷钢是镍和铁的合金，没准哪里能用上。
-bob-tungsten-alloy-processing=研究怎样使用钨合金，这玩意可能更有用。
 
 
 [mod-setting-name]
diff --git a/bobplates/locale/zh-TW/bobplates.cfg b/bobplates/locale/zh-TW/bobplates.cfg
index 0b8a5c8e1..ed8f36929 100644
--- a/bobplates/locale/zh-TW/bobplates.cfg
+++ b/bobplates/locale/zh-TW/bobplates.cfg
@@ -287,7 +287,6 @@ bob-cobalt-processing=鈷加工
 bob-brass-processing=黃銅加工
 bob-nitinol-processing=記憶合金加工
 bob-invar-processing=因瓦合金加工
-bob-tungsten-alloy-processing=鎢合金加工
 
 bob-nitrogen-processing=氮氣加工
 bob-heavy-water-processing=重水加工
@@ -351,7 +350,6 @@ bob-tungsten-processing=鎢具有極高的熔點，我們來研究另一種精
 
 bob-nitinol-processing=記憶合金是一種鎳鈦合金，讓我們看看能怎麼應用它。
 bob-invar-processing=因瓦合金是一種鐵鎳合金，也許能派上用場。
-bob-tungsten-alloy-processing=研究如何製作鎢合金，也許能讓它更有用。
 
 
 [mod-setting-name]
diff --git a/bobplates/migrations/bobplates_2.0.0.json b/bobplates/migrations/bobplates_2.0.0.json
index 92ff1dd39..2a7bb113b 100644
--- a/bobplates/migrations/bobplates_2.0.0.json
+++ b/bobplates/migrations/bobplates_2.0.0.json
@@ -449,7 +449,6 @@
     ["thorium-plutonium-fuel-cell", "bob-thorium-plutonium-fuel-cell"],
     ["thorium-processing", "bob-thorium-processing"],
     ["titanium-processing", "bob-titanium-processing"],
-    ["tungsten-alloy-processing", "bob-tungsten-alloy-processing"],
     ["tungsten-processing", "bob-tungsten-processing"],
     ["void-fluid", "bob-void-fluid"],
     ["water-bore-1", "bob-water-bore-1"],
diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.1.0.json
similarity index 100%
rename from bobplates/migrations/bobplates_2.0.6.json
rename to bobplates/migrations/bobplates_2.1.0.json
diff --git a/bobplates/prototypes/item/parts.lua b/bobplates/prototypes/item/parts.lua
index a57ee7c00..d11060350 100644
--- a/bobplates/prototypes/item/parts.lua
+++ b/bobplates/prototypes/item/parts.lua
@@ -73,27 +73,13 @@ data:extend({
     weight = 5000,
   },
 
-  {
-    type = "item",
-    name = "bob-brass-gear-wheel",
-    icon = "__bobplates__/graphics/icons/brass-gear-wheel.png",
-    icon_size = 32,
-    subgroup = "bob-gears",
-    order = "bb[bob-brass-gear-wheel]",
-    stack_size = 100,
-    drop_sound = plate_drop_move,
-    inventory_move_sound = plate_drop_move,
-    pick_sound = plate_pick,
-    weight = 2000,
-  },
-
   {
     type = "item",
     name = "bob-cobalt-steel-gear-wheel",
     icon = "__bobplates__/graphics/icons/cobalt-steel-gear-wheel.png",
     icon_size = 32,
     subgroup = "bob-gears",
-    order = "bc[bob-cobalt-steel-gear-wheel]",
+    order = "bb[bob-cobalt-steel-gear-wheel]",
     stack_size = 100,
     drop_sound = plate_drop_move,
     inventory_move_sound = plate_drop_move,
@@ -107,7 +93,7 @@ data:extend({
     icon = "__bobplates__/graphics/icons/cobalt-steel-bearing-ball.png",
     icon_size = 32,
     subgroup = "bob-bearings",
-    order = "bac[bob-ball-bearing-cobalt-steel]",
+    order = "bab[bob-ball-bearing-cobalt-steel]",
     stack_size = 500,
     drop_sound = ball_drop_move,
     inventory_move_sound = ball_drop_move,
@@ -121,7 +107,7 @@ data:extend({
     icon = "__bobplates__/graphics/icons/cobalt-steel-bearing.png",
     icon_size = 32,
     subgroup = "bob-bearings",
-    order = "bbc[bob-bearing-cobalt-steel]",
+    order = "bbb[bob-bearing-cobalt-steel]",
     stack_size = 100,
     drop_sound = bearing_drop_move,
     inventory_move_sound = bearing_drop_move,
@@ -129,6 +115,20 @@ data:extend({
     weight = 5000,
   },
 
+  {
+    type = "item",
+    name = "bob-brass-gear-wheel",
+    icon = "__bobplates__/graphics/icons/brass-gear-wheel.png",
+    icon_size = 32,
+    subgroup = "bob-gears",
+    order = "bc[bob-brass-gear-wheel]",
+    stack_size = 100,
+    drop_sound = plate_drop_move,
+    inventory_move_sound = plate_drop_move,
+    pick_sound = plate_pick,
+    weight = 2000,
+  },
+
   {
     type = "item",
     name = "bob-titanium-gear-wheel",
diff --git a/bobplates/prototypes/recipe/entity-recipe-updates.lua b/bobplates/prototypes/recipe/entity-recipe-updates.lua
index e0e03bbed..0a489c30e 100644
--- a/bobplates/prototypes/recipe/entity-recipe-updates.lua
+++ b/bobplates/prototypes/recipe/entity-recipe-updates.lua
@@ -2,8 +2,8 @@ if data.raw.item["bob-basic-circuit-board"] then
   bobmods.lib.recipe.replace_ingredient("bob-electrolyser", "electronic-circuit", "bob-basic-circuit-board")
 end
 
-if data.raw.item["bob-stone-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-electrolyser", "pipe", "bob-stone-pipe")
+if data.raw.item["bob-copper-pipe"] then
+  bobmods.lib.recipe.replace_ingredient("bob-electrolyser", "pipe", "bob-copper-pipe")
 end
 
 if data.raw.item["bob-copper-pipe"] then
@@ -25,9 +25,10 @@ if data.raw.item["bob-bronze-pipe"] then
   bobmods.lib.recipe.replace_ingredient("bob-water-pump-2", "pipe", "bob-bronze-pipe")
 end
 
-if data.raw.item["bob-brass-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-air-pump-3", "pipe", "bob-brass-pipe")
-  bobmods.lib.recipe.replace_ingredient("bob-water-pump-3", "pipe", "bob-brass-pipe")
+if data.raw.item["bob-aluminium-pipe"] then
+  bobmods.lib.recipe.replace_ingredient("bob-air-pump-3", "pipe", "bob-aluminium-pipe")
+  bobmods.lib.recipe.replace_ingredient("bob-water-pump-3", "pipe", "bob-aluminium-pipe")
+  bobmods.lib.tech.add_prerequisite("bob-water-bore-3", "bob-aluminium-processing")
 end
 
 if settings.startup["bobmods-plates-convert-recipes"].value == true then
diff --git a/bobplates/prototypes/recipe/entity-recipe.lua b/bobplates/prototypes/recipe/entity-recipe.lua
index e460e0dd5..b0b25f8c0 100644
--- a/bobplates/prototypes/recipe/entity-recipe.lua
+++ b/bobplates/prototypes/recipe/entity-recipe.lua
@@ -124,8 +124,8 @@ data:extend({
     enabled = false,
     ingredients = {
       { type = "item", name = "bob-air-pump-2", amount = 1 },
-      { type = "item", name = "bob-brass-alloy", amount = 2 },
-      { type = "item", name = "bob-brass-gear-wheel", amount = 4 },
+      { type = "item", name = "bob-aluminium-plate", amount = 2 },
+      { type = "item", name = "bob-cobalt-steel-gear-wheel", amount = 4 },
       { type = "item", name = "bob-cobalt-steel-bearing", amount = 4 },
       { type = "item", name = "processing-unit", amount = 3 },
       { type = "item", name = "pipe", amount = 2 },
@@ -140,8 +140,8 @@ data:extend({
     enabled = false,
     ingredients = {
       { type = "item", name = "bob-air-pump-3", amount = 1 },
-      { type = "item", name = "bob-titanium-plate", amount = 2 },
-      { type = "item", name = "bob-titanium-gear-wheel", amount = 4 },
+      { type = "item", name = "bob-brass-alloy", amount = 2 },
+      { type = "item", name = "bob-brass-gear-wheel", amount = 4 },
       { type = "item", name = "bob-titanium-bearing", amount = 4 },
       { type = "item", name = "electric-engine-unit", amount = 1 },
       { type = "item", name = "bob-advanced-processing-unit", amount = 3 },
@@ -185,8 +185,8 @@ data:extend({
     enabled = false,
     ingredients = {
       { type = "item", name = "bob-water-pump-2", amount = 1 },
-      { type = "item", name = "bob-brass-alloy", amount = 2 },
-      { type = "item", name = "bob-brass-gear-wheel", amount = 4 },
+      { type = "item", name = "bob-zinc-plate", amount = 2 },
+      { type = "item", name = "bob-cobalt-steel-gear-wheel", amount = 4 },
       { type = "item", name = "bob-cobalt-steel-bearing", amount = 4 },
       { type = "item", name = "processing-unit", amount = 3 },
       { type = "item", name = "pipe", amount = 2 },
diff --git a/bobplates/prototypes/technology-metal.lua b/bobplates/prototypes/technology-metal.lua
index 958dae391..67b8dfbf5 100644
--- a/bobplates/prototypes/technology-metal.lua
+++ b/bobplates/prototypes/technology-metal.lua
@@ -5,6 +5,7 @@ if not data.raw.technology["bob-nickel-processing"] then
       name = "bob-nickel-processing",
       prerequisites = {
         "bob-electrolysis-1",
+        "logistic-science-pack",
       },
       effects = {},
     },
@@ -19,6 +20,7 @@ data.raw.technology["bob-nickel-processing"].unit = {
   time = 30,
   ingredients = {
     { "automation-science-pack", 1 },
+    { "logistic-science-pack", 1 },
   },
 }
 
@@ -154,6 +156,33 @@ data.raw.technology["bob-silicon-processing"].unit = {
   },
 }
 
+if not data.raw.technology["bob-brass-processing"] then
+  data:extend({
+    {
+      type = "technology",
+      name = "bob-brass-processing",
+      prerequisites = {
+        "bob-zinc-processing",
+        "chemical-science-pack",
+      },
+      effects = {},
+    },
+  })
+end
+
+data.raw.technology["bob-brass-processing"].icon = "__bobplates__/graphics/icons/technology/zinc-processing.png"
+data.raw.technology["bob-brass-processing"].icon_size = 128
+data.raw.technology["bob-brass-processing"].order = "c-b-e0"
+data.raw.technology["bob-brass-processing"].unit = {
+  count = 40,
+  time = 30,
+  ingredients = {
+    { "automation-science-pack", 1 },
+    { "logistic-science-pack", 1 },
+    { "chemical-science-pack", 1 },
+  },
+}
+
 if not data.raw.technology["bob-titanium-processing"] then
   data:extend({
     {
@@ -219,7 +248,7 @@ if not data.raw.technology["bob-invar-processing"] then
       prerequisites = {
         "bob-alloy-processing",
         "bob-nickel-processing",
-        "logistic-science-pack",
+        "chemical-science-pack",
       },
       effects = {},
     },
@@ -235,6 +264,7 @@ data.raw.technology["bob-invar-processing"].unit = {
   ingredients = {
     { "automation-science-pack", 1 },
     { "logistic-science-pack", 1 },
+    { "chemical-science-pack", 1 },
   },
 }
 
@@ -268,36 +298,6 @@ data.raw.technology["bob-nitinol-processing"].unit = {
   },
 }
 
-if not data.raw.technology["bob-tungsten-alloy-processing"] then
-  data:extend({
-    {
-      type = "technology",
-      name = "bob-tungsten-alloy-processing",
-      prerequisites = {
-        "bob-alloy-processing",
-        "bob-tungsten-processing",
-        "production-science-pack",
-      },
-      effects = {},
-    },
-  })
-end
-
-data.raw.technology["bob-tungsten-alloy-processing"].icon =
-  "__bobplates__/graphics/icons/plate/copper-tungsten-plate.png"
-data.raw.technology["bob-tungsten-alloy-processing"].icon_size = 32
-data.raw.technology["bob-tungsten-alloy-processing"].order = "c-b-e3"
-data.raw.technology["bob-tungsten-alloy-processing"].unit = {
-  count = 75,
-  time = 30,
-  ingredients = {
-    { "automation-science-pack", 1 },
-    { "logistic-science-pack", 1 },
-    { "chemical-science-pack", 1 },
-    { "production-science-pack", 1 },
-  },
-}
-
 if not data.raw.technology["bob-cobalt-processing"] then
   data:extend({
     {
diff --git a/bobplates/prototypes/technology-updates.lua b/bobplates/prototypes/technology-updates.lua
index f52e18a5a..0f69c31eb 100644
--- a/bobplates/prototypes/technology-updates.lua
+++ b/bobplates/prototypes/technology-updates.lua
@@ -52,9 +52,7 @@ bobmods.lib.tech.add_recipe_unlock("steel-processing", "bob-steel-bearing")
 bobmods.lib.tech.add_recipe_unlock("bob-nickel-processing", "bob-nickel-plate")
 
 bobmods.lib.tech.add_recipe_unlock("bob-zinc-processing", "bob-zinc-plate")
-bobmods.lib.tech.add_recipe_unlock("bob-zinc-processing", "bob-brass-alloy")
 bobmods.lib.tech.add_recipe_unlock("bob-zinc-processing", "bob-gunmetal-alloy")
-bobmods.lib.tech.add_recipe_unlock("bob-zinc-processing", "bob-brass-gear-wheel")
 
 bobmods.lib.tech.add_recipe_unlock("bob-lead-processing", "bob-lead-oxide")
 bobmods.lib.tech.add_recipe_unlock("bob-lead-processing", "bob-lead-oxide-2")
@@ -72,6 +70,9 @@ bobmods.lib.tech.add_recipe_unlock("bob-silicon-processing", "bob-silicon-plate"
 bobmods.lib.tech.add_recipe_unlock("bob-silicon-processing", "bob-silicon-wafer")
 bobmods.lib.tech.add_recipe_unlock("bob-silicon-processing", "bob-silicon-powder")
 
+bobmods.lib.tech.add_recipe_unlock("bob-brass-processing", "bob-brass-alloy")
+bobmods.lib.tech.add_recipe_unlock("bob-brass-processing", "bob-brass-gear-wheel")
+
 bobmods.lib.tech.add_recipe_unlock("bob-titanium-processing", "bob-titanium-plate")
 
 bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-tungstic-acid")
@@ -83,8 +84,8 @@ bobmods.lib.tech.add_recipe_unlock("bob-invar-processing", "bob-invar-alloy")
 
 bobmods.lib.tech.add_recipe_unlock("bob-nitinol-processing", "bob-nitinol-alloy")
 
-bobmods.lib.tech.add_recipe_unlock("bob-tungsten-alloy-processing", "bob-copper-tungsten-alloy")
-bobmods.lib.tech.add_recipe_unlock("bob-tungsten-alloy-processing", "tungsten-carbide")
+bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-copper-tungsten-alloy")
+bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "tungsten-carbide")
 
 bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-oxide")
 bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-oxide-from-copper")
@@ -209,9 +210,5 @@ if mods["space-age"] then
   bobmods.lib.tech.add_recipe_unlock("tungsten-carbide", "bob-tungsten-oxide")
   bobmods.lib.tech.add_recipe_unlock("tungsten-carbide", "bob-powdered-tungsten")
 
-  bobmods.lib.tech.add_science_pack("bob-tungsten-alloy-processing", "space-science-pack", 1)
-  bobmods.lib.tech.add_science_pack("bob-tungsten-alloy-processing", "metallurgic-science-pack", 1)
-  bobmods.lib.tech.add_prerequisite("bob-tungsten-alloy-processing", "metallurgic-science-pack")
-
-  bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-alloy-processing", "tungsten-carbide")
+  bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-processing", "tungsten-carbide")
 end
diff --git a/bobplates/prototypes/technology.lua b/bobplates/prototypes/technology.lua
index b606a2539..1dae21800 100644
--- a/bobplates/prototypes/technology.lua
+++ b/bobplates/prototypes/technology.lua
@@ -447,7 +447,7 @@ data:extend({
     icon_size = 32,
     prerequisites = {
       "bob-air-compressor-2",
-      "bob-zinc-processing",
+      "bob-aluminium-processing",
       "bob-cobalt-processing",
       "processing-unit",
     },
@@ -476,6 +476,7 @@ data:extend({
     icon_size = 32,
     prerequisites = {
       "bob-air-compressor-3",
+      "bob-brass-processing",
       "bob-titanium-processing",
       "electric-engine",
       "bob-advanced-processing-unit",
diff --git a/bobpower/changelog.txt b/bobpower/changelog.txt
index 08f9cd6e5..727b19e35 100644
--- a/bobpower/changelog.txt
+++ b/bobpower/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.5
+Version: 2.1.0
 Date: ???
   Bugfixes:
     - Fixed solar panel recipes missing Silicon wafers (with Bob's MCI mod) #591
@@ -8,6 +8,7 @@ Date: ???
     - Disallowed certain entities in space #551
     - Set item weights #553
     - Adjust ingredients for some T4 and T5 recipes #583
+    - Reworked machine recipe ingredients #585
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.4
 Date: 18. 01. 2026
diff --git a/bobpower/info.json b/bobpower/info.json
index 56699ca47..0eaecbcd9 100644
--- a/bobpower/info.json
+++ b/bobpower/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobpower",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Power mod",
   "author": "Bobingabout",
@@ -8,8 +8,8 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6"
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0"
   ],
   "description": "Requires Bob's functions library mod.\n\nAdds a wide range of power objects, including, but not limited to:\n3 sizes and 3 tiers of solar panel.\nA full steam power rework so tier 1 of nuclear steam matches tier 3 of regular steam.\n5 tiers of steam power.\nOil (burning) boilers added which start at tier 2, and will power 3 steam engines.\nnuclear steam power starts at tier 3.\nAll boiler:steam engine ratios are 2:1 (1 boiler will power 2 steam engines, 1 heat exchanger will power 2 steam turbines)\nNuclear:regular ratios are 2:1. (1 heat exchanger will power 4 steam engines, or 1 boiler will power 1 steam turbine)\n4 tiers of medium and large power poles, and substations.\n3 tiers, and different types (fast, high capacity, and slow) of Accumulator.\nNew fluid burning generators that turn oils directly into Electricity.\n\nAlthough it can function as a stand alone mod, it is intended to be used with the full Bob's Mods set."
 }
diff --git a/bobpower/prototypes/burner-reactor-updates.lua b/bobpower/prototypes/burner-reactor-updates.lua
index fe2329327..d3b89249c 100644
--- a/bobpower/prototypes/burner-reactor-updates.lua
+++ b/bobpower/prototypes/burner-reactor-updates.lua
@@ -11,16 +11,14 @@ if settings.startup["bobmods-power-heatsources"].value == true then
     bobmods.lib.recipe.replace_ingredient("bob-fluid-reactor", "pipe", "bob-steel-pipe")
   end
 
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-burner-reactor-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.recipe.replace_ingredient("bob-fluid-reactor-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-burner-reactor-2", "bob-invar-processing")
+  if data.raw.item["bob-nickel-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-burner-reactor-2", "steel-plate", "bob-nickel-plate")
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-reactor-2", "steel-plate", "bob-nickel-plate")
+    bobmods.lib.tech.add_prerequisite("bob-burner-reactor-2", "bob-nickel-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-fluid-reactor-2", "pipe", "bob-brass-pipe")
-    bobmods.lib.tech.add_prerequisite("bob-burner-reactor-2", "bob-zinc-processing")
-  elseif data.raw.item["bob-steel-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-fluid-reactor-2", "pipe", "bob-steel-pipe")
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-reactor-2", "pipe", "bob-aluminium-pipe")
+    bobmods.lib.tech.add_prerequisite("bob-burner-reactor-2", "bob-aluminium-processing")
   end
 end
diff --git a/bobpower/prototypes/heat-pipes-updates.lua b/bobpower/prototypes/heat-pipes-updates.lua
index 4ca9d592a..93c245db8 100644
--- a/bobpower/prototypes/heat-pipes-updates.lua
+++ b/bobpower/prototypes/heat-pipes-updates.lua
@@ -4,15 +4,15 @@ Structure: Steel
 Conductor: Copper
 
 Heat Pipe 2
-Structure: Invar
+Structure: Nickel
 Conductor: Aluminium
 
 Heat Pipe 3
-Structure: Titanium/Tungsten
+Structure: Invar
 Conductor: Silver
 
 Heat Pipe 4
-Structure: Copper Tungsten
+Structure: Tungsten
 Conductor: Gold
 --]]
 
@@ -21,9 +21,9 @@ if
   or settings.startup["bobmods-power-nuclear"].value == true
   or settings.startup["bobmods-power-heatsources"].value == true
 then
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-heat-pipe-2", "bob-invar-processing")
+  if data.raw.item["bob-nickel-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-2", "steel-plate", "bob-nickel-plate")
+    bobmods.lib.tech.add_prerequisite("bob-heat-pipe-2", "bob-nickel-processing")
   end
 
   if data.raw.item["bob-aluminium-plate"] then
@@ -31,9 +31,9 @@ then
     bobmods.lib.tech.add_prerequisite("bob-heat-pipe-2", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-3", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-heat-pipe-3", "bob-titanium-processing")
+  if data.raw.item["bob-invar-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-3", "steel-plate", "bob-invar-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-heat-pipe-3", "bob-invar-processing")
   end
 
   if data.raw.item["bob-silver-plate"] then
@@ -41,9 +41,9 @@ then
     bobmods.lib.tech.add_prerequisite("bob-heat-pipe-3", "bob-lead-processing")
   end
 
-  if data.raw.item["bob-copper-tungsten-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-4", "steel-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-heat-pipe-4", "bob-tungsten-alloy-processing")
+  if data.raw.item["tungsten-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-4", "steel-plate", "tungsten-plate")
+    bobmods.lib.tech.add_prerequisite("bob-heat-pipe-4", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-gold-plate"] then
diff --git a/bobpower/prototypes/recipe/boilers-updates.lua b/bobpower/prototypes/recipe/boilers-updates.lua
index 582346e13..2718ca3bd 100644
--- a/bobpower/prototypes/recipe/boilers-updates.lua
+++ b/bobpower/prototypes/recipe/boilers-updates.lua
@@ -3,29 +3,29 @@ if settings.startup["bobmods-power-steam"].value == true then
     bobmods.lib.recipe.add_ingredient("bob-boiler-2", { type = "item", name = "bob-steel-pipe", amount = 4 })
   end
 
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-boiler-3", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-boiler-3", "bob-invar-processing")
+  if data.raw.item["bob-nickel-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-boiler-3", "steel-plate", "bob-nickel-plate")
+    bobmods.lib.tech.add_prerequisite("bob-boiler-3", "bob-nickel-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.add_ingredient("bob-boiler-3", { type = "item", name = "bob-brass-pipe", amount = 4 })
-    bobmods.lib.tech.add_prerequisite("bob-boiler-3", "bob-zinc-processing")
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.add_ingredient("bob-boiler-3", { type = "item", name = "bob-aluminium-pipe", amount = 4 })
+    bobmods.lib.tech.add_prerequisite("bob-boiler-3", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-boiler-4", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-boiler-4", "bob-titanium-processing")
+  if data.raw.item["bob-invar-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-boiler-4", "steel-plate", "bob-invar-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-boiler-4", "bob-invar-processing")
   end
 
-  if data.raw.item["bob-ceramic-pipe"] then
-    bobmods.lib.recipe.add_ingredient("bob-boiler-4", { type = "item", name = "bob-ceramic-pipe", amount = 4 })
-    bobmods.lib.tech.add_prerequisite("bob-boiler-4", "bob-ceramics")
+  if data.raw.item["bob-titanium-pipe"] then
+    bobmods.lib.recipe.add_ingredient("bob-boiler-4", { type = "item", name = "bob-titanium-pipe", amount = 4 })
+    bobmods.lib.tech.add_prerequisite("bob-boiler-4", "bob-titanium-processing")
   end
 
   if data.raw.item["bob-copper-tungsten-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-boiler-5", "steel-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-boiler-5", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-boiler-5", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-copper-tungsten-pipe"] then
diff --git a/bobpower/prototypes/recipe/fluid-generator-updates.lua b/bobpower/prototypes/recipe/fluid-generator-updates.lua
index 7b9b78baf..1fb4ce6e4 100644
--- a/bobpower/prototypes/recipe/fluid-generator-updates.lua
+++ b/bobpower/prototypes/recipe/fluid-generator-updates.lua
@@ -42,9 +42,9 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-fluid-generator-2", "bob-cobalt-processing")
   end
 
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-fluid-generator-2", "iron-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-fluid-generator-2", "bob-invar-processing")
+  if data.raw.item["bob-nickel-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-generator-2", "iron-plate", "bob-nickel-plate")
+    bobmods.lib.tech.add_prerequisite("bob-fluid-generator-2", "bob-nickel-processing")
   end
 
   if data.raw.item["bob-aluminium-plate"] then
@@ -52,9 +52,8 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-fluid-generator-2", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.add_ingredient("bob-fluid-generator-2", { type = "item", name = "bob-brass-pipe", amount = 5 })
-    bobmods.lib.tech.add_prerequisite("bob-fluid-generator-2", "bob-zinc-processing")
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.add_ingredient("bob-fluid-generator-2", { type = "item", name = "bob-aluminium-pipe", amount = 5 })
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
@@ -75,9 +74,9 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
     bobmods.lib.recipe.replace_ingredient("bob-fluid-generator-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
   end
 
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-fluid-generator-3", "iron-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-fluid-generator-3", "bob-titanium-processing")
+  if data.raw.item["bob-invar-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-fluid-generator-3", "iron-plate", "bob-invar-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-fluid-generator-3", "bob-invar-processing")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -85,9 +84,8 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-fluid-generator-3", "bob-titanium-processing")
   end
 
-  if data.raw.item["bob-ceramic-pipe"] then
-    bobmods.lib.recipe.add_ingredient("bob-fluid-generator-3", { type = "item", name = "bob-ceramic-pipe", amount = 5 })
-    bobmods.lib.tech.add_prerequisite("bob-fluid-generator-3", "bob-ceramics")
+  if data.raw.item["bob-titanium-pipe"] then
+    bobmods.lib.recipe.add_ingredient("bob-fluid-generator-3", { type = "item", name = "bob-titanium-pipe", amount = 5 })
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
@@ -119,7 +117,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
 
     if data.raw.item["bob-copper-tungsten-alloy"] then
       bobmods.lib.recipe.replace_ingredient("bob-hydrazine-generator", "iron-plate", "bob-copper-tungsten-alloy")
-      bobmods.lib.tech.add_prerequisite("bob-hydrazine-generator", "bob-tungsten-alloy-processing")
+      bobmods.lib.tech.add_prerequisite("bob-hydrazine-generator", "bob-tungsten-processing")
     end
 
     if data.raw.item["bob-nitinol-alloy"] then
@@ -132,7 +130,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         "bob-hydrazine-generator",
         { type = "item", name = "bob-copper-tungsten-pipe", amount = 5 }
       )
-      bobmods.lib.tech.add_prerequisite("bob-hydrazine-generator", "bob-tungsten-alloy-processing")
+      bobmods.lib.tech.add_prerequisite("bob-hydrazine-generator", "bob-tungsten-processing")
     end
 
     if data.raw.item["bob-advanced-processing-unit"] then
diff --git a/bobpower/prototypes/recipe/heat-exchangers-updates.lua b/bobpower/prototypes/recipe/heat-exchangers-updates.lua
index a32e97fa2..b5598d605 100644
--- a/bobpower/prototypes/recipe/heat-exchangers-updates.lua
+++ b/bobpower/prototypes/recipe/heat-exchangers-updates.lua
@@ -1,23 +1,23 @@
 if settings.startup["bobmods-power-steam"].value == true then
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-heat-exchanger-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-2", "bob-invar-processing")
+  if data.raw.item["bob-nickel-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-heat-exchanger-2", "steel-plate", "bob-nickel-plate")
+    bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-2", "bob-nickel-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.add_ingredient("bob-heat-exchanger-2", { type = "item", name = "bob-brass-pipe", amount = 4 })
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.add_ingredient("bob-heat-exchanger-2", { type = "item", name = "bob-aluminium-pipe", amount = 4 })
   end
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-heat-exchanger-3", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-3", "bob-titanium-processing")
+  if data.raw.item["bob-invar-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-heat-exchanger-3", "steel-plate", "bob-invar-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-3", "bob-invar-processing")
   end
-  if data.raw.item["bob-ceramic-pipe"] then
-    bobmods.lib.recipe.add_ingredient("bob-heat-exchanger-3", { type = "item", name = "bob-ceramic-pipe", amount = 4 })
-    bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-3", "bob-ceramics")
+  if data.raw.item["bob-titanium-pipe"] then
+    bobmods.lib.recipe.add_ingredient("bob-heat-exchanger-3", { type = "item", name = "bob-titanium-pipe", amount = 4 })
+    bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-3", "bob-titanium-processing")
   end
   if data.raw.item["bob-copper-tungsten-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-heat-exchanger-4", "steel-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-4", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-4", "bob-tungsten-processing")
   end
   if data.raw.item["bob-copper-tungsten-pipe"] then
     bobmods.lib.recipe.add_ingredient(
diff --git a/bobpower/prototypes/recipe/nuclear-updates.lua b/bobpower/prototypes/recipe/nuclear-updates.lua
index 94e9a79d5..c686e02ff 100644
--- a/bobpower/prototypes/recipe/nuclear-updates.lua
+++ b/bobpower/prototypes/recipe/nuclear-updates.lua
@@ -10,7 +10,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-nuclear-power-2", "bob-heat-pipe-3")
   elseif data.raw.item["bob-brass-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-nuclear-reactor-2", "copper-plate", "bob-brass-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-nuclear-power-2", "bob-zinc-processing")
+    bobmods.lib.tech.add_prerequisite("bob-nuclear-power-2", "bob-brass-processing")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -29,12 +29,12 @@ if settings.startup["bobmods-power-nuclear"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "bob-heat-pipe-4")
   elseif data.raw.item["bob-copper-tungsten-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-nuclear-reactor-3", "copper-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "bob-tungsten-processing")
   end
 
   if data.raw.item["tungsten-carbide"] then
     bobmods.lib.recipe.replace_ingredient("bob-nuclear-reactor-3", "steel-plate", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-advanced-processing-unit"] then
diff --git a/bobpower/prototypes/recipe/oil-boilers-updates.lua b/bobpower/prototypes/recipe/oil-boilers-updates.lua
index a3e3e6e9c..1ec1b9a66 100644
--- a/bobpower/prototypes/recipe/oil-boilers-updates.lua
+++ b/bobpower/prototypes/recipe/oil-boilers-updates.lua
@@ -3,29 +3,29 @@ if settings.startup["bobmods-power-steam"].value == true then
     bobmods.lib.recipe.replace_ingredient("bob-oil-boiler", "pipe", "bob-steel-pipe")
   end
 
-  if data.raw.item["bob-invar-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-2", "steel-plate", "bob-invar-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-2", "bob-invar-processing")
+  if data.raw.item["bob-nickel-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-2", "steel-plate", "bob-nickel-plate")
+    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-2", "bob-nickel-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.add_ingredient("bob-oil-boiler-2", { type = "item", name = "bob-brass-pipe", amount = 6 })
-    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-2", "bob-zinc-processing")
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.add_ingredient("bob-oil-boiler-2", { type = "item", name = "bob-aluminium-pipe", amount = 6 })
+    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-2", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-titanium-plate"] then
-    bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-3", "steel-plate", "bob-titanium-plate")
-    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-3", "bob-titanium-processing")
+  if data.raw.item["bob-invar-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-3", "steel-plate", "bob-invar-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-3", "bob-invar-processing")
   end
 
-  if data.raw.item["bob-ceramic-pipe"] then
-    bobmods.lib.recipe.add_ingredient("bob-oil-boiler-3", { type = "item", name = "bob-ceramic-pipe", amount = 6 })
-    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-3", "bob-ceramics")
+  if data.raw.item["bob-titanium-pipe"] then
+    bobmods.lib.recipe.add_ingredient("bob-oil-boiler-3", { type = "item", name = "bob-titanium-pipe", amount = 6 })
+    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-3", "bob-titanium-processing")
   end
 
   if data.raw.item["bob-copper-tungsten-alloy"] then
     bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-4", "steel-plate", "bob-copper-tungsten-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-4", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-oil-boiler-4", "bob-tungsten-processing")
   end
 
   if data.raw.item["bob-copper-tungsten-pipe"] then
@@ -47,23 +47,23 @@ if settings.startup["bobmods-power-steam"].value == true then
       )
     end
 
-    if data.raw.item["bob-brass-pipe"] then
-      bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-2-from-boiler-3", "pipe", "bob-brass-pipe")
+    if data.raw.item["bob-aluminium-pipe"] then
+      bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-2-from-boiler-3", "pipe", "bob-aluminium-pipe")
 
       bobmods.lib.recipe.remove_result("bob-boiler-3-from-oil-boiler-2", "pipe")
       bobmods.lib.recipe.add_result(
         "bob-boiler-3-from-oil-boiler-2",
-        { type = "item", name = "bob-brass-pipe", amount = 2 }
+        { type = "item", name = "bob-aluminium-pipe", amount = 2 }
       )
     end
 
-    if data.raw.item["bob-ceramic-pipe"] then
-      bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-3-from-boiler-4", "pipe", "bob-ceramic-pipe")
+    if data.raw.item["bob-titanium-pipe"] then
+      bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-3-from-boiler-4", "pipe", "bob-titanium-pipe")
 
       bobmods.lib.recipe.remove_result("bob-boiler-4-from-oil-boiler-3", "pipe")
       bobmods.lib.recipe.add_result(
         "bob-boiler-4-from-oil-boiler-3",
-        { type = "item", name = "bob-ceramic-pipe", amount = 2 }
+        { type = "item", name = "bob-titanium-pipe", amount = 2 }
       )
     end
 
diff --git a/bobpower/prototypes/recipe/poles-updates.lua b/bobpower/prototypes/recipe/poles-updates.lua
index 223ef5054..037ac9485 100644
--- a/bobpower/prototypes/recipe/poles-updates.lua
+++ b/bobpower/prototypes/recipe/poles-updates.lua
@@ -1,10 +1,10 @@
 if settings.startup["bobmods-power-poles"].value == true then
-  if data.raw.item["bob-brass-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-medium-electric-pole-2", "steel-plate", "bob-brass-alloy")
-    bobmods.lib.recipe.replace_ingredient("bob-big-electric-pole-2", "steel-plate", "bob-brass-alloy")
-    bobmods.lib.recipe.replace_ingredient("bob-substation-2", "steel-plate", "bob-brass-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-electric-pole-2", "bob-zinc-processing")
-    bobmods.lib.tech.add_prerequisite("bob-electric-substation-2", "bob-zinc-processing")
+  if data.raw.item["bob-aluminium-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-medium-electric-pole-2", "steel-plate", "bob-aluminium-plate")
+    bobmods.lib.recipe.replace_ingredient("bob-big-electric-pole-2", "steel-plate", "bob-aluminium-plate")
+    bobmods.lib.recipe.replace_ingredient("bob-substation-2", "steel-plate", "bob-aluminium-plate")
+    bobmods.lib.tech.add_prerequisite("bob-electric-pole-2", "bob-aluminium-processing")
+    bobmods.lib.tech.add_prerequisite("bob-electric-substation-2", "bob-aluminium-processing")
   end
 
   if data.raw.item["bob-tinned-copper-cable"] then
diff --git a/bobpower/prototypes/recipe/steam-engines-updates.lua b/bobpower/prototypes/recipe/steam-engines-updates.lua
index 78a682b85..1574a8aa0 100644
--- a/bobpower/prototypes/recipe/steam-engines-updates.lua
+++ b/bobpower/prototypes/recipe/steam-engines-updates.lua
@@ -28,13 +28,13 @@ if settings.startup["bobmods-power-steam"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-steam-engine-3", "bob-cobalt-processing")
   end
 
-  if data.raw.item["bob-brass-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-steam-engine-3", "steel-plate", "bob-brass-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-steam-engine-3", "bob-zinc-processing")
+  if data.raw.item["bob-aluminium-plate"] then
+    bobmods.lib.recipe.replace_ingredient("bob-steam-engine-3", "steel-plate", "bob-aluminium-plate")
+    bobmods.lib.tech.add_prerequisite("bob-steam-engine-3", "bob-aluminium-processing")
   end
 
-  if data.raw.item["bob-brass-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-steam-engine-3", "pipe", "bob-brass-pipe")
+  if data.raw.item["bob-aluminium-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-steam-engine-3", "pipe", "bob-aluminium-pipe")
   end
 
   if data.raw.item["bob-titanium-bearing"] then
@@ -46,9 +46,9 @@ if settings.startup["bobmods-power-steam"].value == true then
     bobmods.lib.recipe.add_ingredient("bob-steam-engine-4", { type = "item", name = "iron-gear-wheel", amount = 5 })
   end
 
-  if data.raw.item["bob-titanium-gear-wheel"] then
-    bobmods.lib.recipe.replace_ingredient("bob-steam-engine-4", "iron-gear-wheel", "bob-titanium-gear-wheel")
-    bobmods.lib.tech.add_prerequisite("bob-steam-engine-4", "bob-titanium-processing")
+  if data.raw.item["bob-brass-gear-wheel"] then
+    bobmods.lib.recipe.replace_ingredient("bob-steam-engine-4", "iron-gear-wheel", "bob-brass-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-steam-engine-4", "bob-brass-processing")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -56,8 +56,8 @@ if settings.startup["bobmods-power-steam"].value == true then
     bobmods.lib.tech.add_prerequisite("bob-steam-engine-4", "bob-titanium-processing")
   end
 
-  if data.raw.item["bob-titanium-pipe"] then
-    bobmods.lib.recipe.replace_ingredient("bob-steam-engine-4", "pipe", "bob-titanium-pipe")
+  if data.raw.item["bob-brass-pipe"] then
+    bobmods.lib.recipe.replace_ingredient("bob-steam-engine-4", "pipe", "bob-brass-pipe")
   end
 
   if data.raw.item["bob-nitinol-bearing"] then
diff --git a/bobrevamp/changelog.txt b/bobrevamp/changelog.txt
index 2368469ad..b7cc1b0f2 100644
--- a/bobrevamp/changelog.txt
+++ b/bobrevamp/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.6
+Version: 2.1.0
 Date: ???
   Changes:
     - Set item weights #553
diff --git a/bobrevamp/info.json b/bobrevamp/info.json
index a28fc2cb5..7da2177a4 100644
--- a/bobrevamp/info.json
+++ b/bobrevamp/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobrevamp",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Revamp mod",
   "author": "Bobingabout",
@@ -8,8 +8,8 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.0",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6"
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0"
   ],
   "description": "Requires Bob's functions library mod.\n\nThis mod changes some base game areas to better fit with Bob's Mods.\nRocket fuel has been changed to be based on Hydrazine.\nReworked all the rocket based recipes\nA rework to how you get Sulfur and Sulfuric acid.\nSplits up the oil chain a little, Pumpjack, Chemical plant and Oil refinery are on their own technologies, instead of all in one go.\n\nIntended to be used with the full Bob's Mods set."
 }
diff --git a/bobrevamp/migrations/bobrevamp_2.0.6.json b/bobrevamp/migrations/bobrevamp_2.1.0.json
similarity index 95%
rename from bobrevamp/migrations/bobrevamp_2.0.6.json
rename to bobrevamp/migrations/bobrevamp_2.1.0.json
index e4d945728..0535c2d81 100644
--- a/bobrevamp/migrations/bobrevamp_2.0.6.json
+++ b/bobrevamp/migrations/bobrevamp_2.1.0.json
@@ -1,17 +1,17 @@
-{
-  "fluid":
-  [
-    ["bob-ammonia", "ammonia"]
-  ],
-  "item":
-  [
-    ["bob-ammonia-barrel", "ammonia-barrel"]
-  ],
-  "recipe":
-  [
-    ["bob-ammonia", "ammonia"],
-    ["empty-bob-ammonia-barrel", "empty-ammonia-barrel"],
-    ["bob-ammonia-barrel", "ammonia-barrel"],
-    ["void-bob-ammonia", "void-ammonia"]
-  ]
+{
+  "fluid":
+  [
+    ["bob-ammonia", "ammonia"]
+  ],
+  "item":
+  [
+    ["bob-ammonia-barrel", "ammonia-barrel"]
+  ],
+  "recipe":
+  [
+    ["bob-ammonia", "ammonia"],
+    ["empty-bob-ammonia-barrel", "empty-ammonia-barrel"],
+    ["bob-ammonia-barrel", "ammonia-barrel"],
+    ["void-bob-ammonia", "void-ammonia"]
+  ]
 }
\ No newline at end of file
diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua
index 3eb61ee1c..d1fe55ba9 100644
--- a/bobrevamp/prototypes/rocket-parts-updates.lua
+++ b/bobrevamp/prototypes/rocket-parts-updates.lua
@@ -46,7 +46,7 @@ if mods["space-age"] then
   end
 elseif data.raw.item["tungsten-carbide"] then
   bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "plastic-bar", "tungsten-carbide")
-  bobmods.lib.tech.replace_prerequisite("bob-heat-shield", "plastics", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.replace_prerequisite("bob-heat-shield", "plastics", "bob-tungsten-processing")
 end
 
 if data.raw.item["bob-titanium-plate"] then
diff --git a/bobtech/changelog.txt b/bobtech/changelog.txt
index 088aaa6c5..7f88eb7a2 100644
--- a/bobtech/changelog.txt
+++ b/bobtech/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.6
+Version: 2.1.0
 Date: ???
   Changes:
     - Set item weights #553
diff --git a/bobtech/info.json b/bobtech/info.json
index 7d388ea66..a3de02bcc 100644
--- a/bobtech/info.json
+++ b/bobtech/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobtech",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Technology mod",
   "author": "Bobingabout",
@@ -8,9 +8,9 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.4",
-    "? bobenemies >= 2.0.0",
-    "? bobplates >= 2.0.6",
+    "boblibrary >= 2.1.0",
+    "? bobenemies >= 2.1.0",
+    "? bobplates >= 2.1.0",
     "? space-age >= 2.0.0",
     "? DiscoScience"
   ],
diff --git a/bobtech/prototypes/recipe/recipe-updates.lua b/bobtech/prototypes/recipe/recipe-updates.lua
index 4ae03650b..1629bc198 100644
--- a/bobtech/prototypes/recipe/recipe-updates.lua
+++ b/bobtech/prototypes/recipe/recipe-updates.lua
@@ -46,7 +46,7 @@ end
 if bobmods.tech.advanced_logistic_science then
   if data.raw.item["bob-brass-chest"] then
     bobmods.lib.recipe.replace_ingredient("bob-advanced-logistic-science-pack", "steel-chest", "bob-brass-chest")
-    bobmods.lib.tech.add_prerequisite("bob-advanced-logistic-science-pack", "bob-zinc-processing")
+    bobmods.lib.tech.add_prerequisite("bob-advanced-logistic-science-pack", "bob-brass-processing")
   end
   if
     settings.startup["bobmods-logistics-inserteroverhaul"]
@@ -92,6 +92,7 @@ data.raw.recipe["utility-science-pack"].energy_required = 35
 bobmods.lib.recipe.set_result("utility-science-pack", { type = "item", name = "utility-science-pack", amount = 5 })
 
 if settings.startup["bobmods-burnerphase"].value == true then
+  bobmods.lib.recipe.add_ingredient("bob-burner-lab", { type = "item", name = "bob-glass", amount = 5 })
   bobmods.lib.recipe.add_new_ingredient("lab", { type = "item", name = "bob-burner-lab", amount = 1 })
 end
 
diff --git a/bobtech/prototypes/technology/technology-updates.lua b/bobtech/prototypes/technology/technology-updates.lua
index 4b0890d23..700dee32e 100644
--- a/bobtech/prototypes/technology/technology-updates.lua
+++ b/bobtech/prototypes/technology/technology-updates.lua
@@ -292,10 +292,10 @@ if settings.startup["bobmods-burnerphase"].value == true then
     if mods["bobpower"] then
       bobmods.lib.tech.remove_prerequisite("bob-fluid-generator-1", "electronics")
     end
-    if mods["bobmining"] then
+    if data.raw.technology["bob-water-miner-2"] then
       bobmods.lib.tech.remove_prerequisite("bob-water-miner-2", "electronics")
     end
-    if mods["bobassembly"] then
+    if data.raw.technology["bob-electrolyser-2"] then
       bobmods.lib.tech.remove_prerequisite("bob-electrolyser-2", "electronics")
     end
     if data.raw.technology["bob-chemical-plant"] then
@@ -335,7 +335,6 @@ if settings.startup["bobmods-burnerphase"].value == true then
   if mods["bobplates"] then
     data.raw.recipe["bob-burner-lab"].enabled = false
     bobmods.lib.tech.add_prerequisite("automation-science-pack", "bob-burner-lab")
-    bobmods.lib.recipe.add_ingredient("bob-burner-lab", { type = "item", name = "bob-glass", amount = 5 })
     bobmods.lib.tech.remove_prerequisite("bob-gas-canisters", "logistic-science-pack")
     bobmods.lib.tech.remove_prerequisite("bob-fluid-barrel-processing", "logistic-science-pack")
   end
diff --git a/bobvehicleequipment/changelog.txt b/bobvehicleequipment/changelog.txt
index 74dddfc0c..3ab8e34fa 100644
--- a/bobvehicleequipment/changelog.txt
+++ b/bobvehicleequipment/changelog.txt
@@ -1,9 +1,10 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.5
+Version: 2.1.0
 Date: ???
   Changes:
     - Set item weights #553
     - Adjust ingredients for some T4 and T5 recipes #583
+    - Reworked equipment recipe ingredients #585
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.4
 Date: 15. 01. 2026
diff --git a/bobvehicleequipment/info.json b/bobvehicleequipment/info.json
index 39dca4d6a..c1797b887 100644
--- a/bobvehicleequipment/info.json
+++ b/bobvehicleequipment/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobvehicleequipment",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Vehicle Equipment mod",
   "author": "Bobingabout",
@@ -8,11 +8,11 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.4",
-    "? boblogistics >= 2.0.0",
-    "? bobwarfare >= 2.0.0",
-    "? bobenemies >= 2.0.0",
-    "? bobplates >= 2.0.6"
+    "boblibrary >= 2.1.0",
+    "? boblogistics >= 2.1.0",
+    "? bobwarfare >= 2.1.0",
+    "? bobenemies >= 2.1.0",
+    "? bobplates >= 2.1.0"
   ],
   "description": "Requires Bob's functions library mod.\n\nA range of equipment based on all the modular armor equipment available in base mod.\nUp to 6 tiers on most items.\nEquipment can be used on the Tank, Locomotive, Cargo and Fluid wagons, and the Artillery wagon.\nIf Bob's Logistics mod is installed, the equipment can be used on all train vehicles added by it.\nIf Bob's Warfare mod is installed, the equipment can be used on all tanks and Artillery wagons added by it.\n\nAlthough it can function as a stand alone mod, it is intended to be used with the full Bob's Mods set."
 }
diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua
index 110fa789d..1dfa3f86d 100644
--- a/bobvehicleequipment/prototypes/recipe-updates.lua
+++ b/bobvehicleequipment/prototypes/recipe-updates.lua
@@ -63,15 +63,6 @@ then
     { type = "item", name = "steel-plate", amount = 4 },
   }
 
-  if mods["bobplates"] then
-    if combined_roboports == true then
-      bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-equipment-2", "bob-zinc-processing")
-      bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-equipment-2", "bob-invar-processing")
-    else
-      bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-modular-equipment-2", "bob-zinc-processing")
-      bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-modular-equipment-2", "bob-invar-processing")
-    end
-  end
 else
   data.raw.recipe["bob-vehicle-roboport-equipment-2"].ingredients = {
     { type = "item", name = "bob-vehicle-roboport-equipment-1", amount = 1 },
@@ -96,14 +87,14 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-antenna-equipment-2",
       "steel-plate",
-      "bob-aluminium-plate"
+      "bob-nickel-plate"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-chargepad-equipment-2",
       "steel-plate",
-      "bob-invar-alloy"
+      "bob-nickel-plate"
     )
-    bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-modular-equipment-2", "bob-invar-processing")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-modular-equipment-2", "bob-nickel-processing")
     bobmods.lib.recipe.add_ingredient(
       "bob-vehicle-roboport-antenna-equipment-2",
       { type = "item", name = "bob-steel-bearing", amount = 10 }
@@ -120,8 +111,10 @@ if mods["bobplates"] then
   if combined_roboports == true then
     bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-2", "steel-plate", "bob-aluminium-plate")
     bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-equipment-2", "bob-aluminium-processing")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-equipment-2", "bob-nickel-processing")
   else
     bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-modular-equipment-2", "bob-aluminium-processing")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-roboport-modular-equipment-2", "bob-nickel-processing")
   end
   bobmods.lib.recipe.replace_ingredient(
     "bob-vehicle-roboport-antenna-equipment-2",
@@ -405,13 +398,13 @@ if data.raw.item["bob-silver-plate"] then
   bobmods.lib.tech.add_prerequisite("bob-vehicle-solar-panel-equipment-2", "bob-lead-processing")
 end
 
-if data.raw.item["bob-invar-alloy"] then
+if data.raw.item["bob-aluminium-plate"] then
   bobmods.lib.recipe.remove_ingredient("bob-vehicle-laser-defense-equipment-3", "steel-plate")
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-laser-defense-equipment-3",
-    { type = "item", name = "bob-invar-alloy", amount = 10 }
+    { type = "item", name = "bob-aluminium-plate", amount = 10 }
   )
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-laser-defense-equipment-3", "bob-invar-processing")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-laser-defense-equipment-3", "bob-aluminium-processing")
 
   if data.raw.item["bob-cobalt-steel-alloy"] then
     bobmods.lib.recipe.remove_ingredient("bob-vehicle-big-turret-equipment-1", "steel-plate")
@@ -422,12 +415,12 @@ if data.raw.item["bob-invar-alloy"] then
     bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-1", "bob-cobalt-processing")
     bobmods.lib.recipe.add_ingredient(
       "bob-vehicle-big-turret-equipment-1",
-      { type = "item", name = "bob-invar-alloy", amount = 50 }
+      { type = "item", name = "bob-nickel-plate", amount = 50 }
     )
   else
-    bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-1", "steel-plate", "bob-invar-alloy")
+    bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-1", "steel-plate", "bob-nickel-plate")
   end
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-1", "bob-invar-processing")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-1", "bob-nickel-processing")
 end
 
 if mods["bobplates"] then
@@ -450,11 +443,6 @@ if mods["bobplates"] then
   bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-3", "bob-nuclear-power-3")
 end
 
-if data.raw.item["bob-aluminium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-solar-panel-equipment-3", "steel-plate", "bob-aluminium-plate")
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-solar-panel-equipment-3", "bob-aluminium-processing")
-end
-
 if data.raw.item["bob-gold-plate"] then
   bobmods.lib.recipe.remove_ingredient("bob-vehicle-solar-panel-equipment-3", "copper-plate")
   bobmods.lib.recipe.add_ingredient(
@@ -695,7 +683,7 @@ if data.raw.item["bob-nitinol-bearing"] then
 end
 
 if data.raw.item["bob-copper-tungsten-alloy"] then
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-3", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-3", "bob-tungsten-processing")
   bobmods.lib.recipe.remove_ingredient("bob-vehicle-big-turret-equipment-3", "steel-plate")
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-big-turret-equipment-3",
@@ -770,12 +758,12 @@ if data.raw.item["bob-titanium-plate"] then
   bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-3", "bob-titanium-processing")
 end
 
-if data.raw.item["bob-silicon-nitride"] then
+if data.raw.item["bob-invar-alloy"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-big-turret-equipment-2",
-    { type = "item", name = "bob-silicon-nitride", amount = 50 }
+    { type = "item", name = "bob-invar-alloy", amount = 50 }
   )
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-2", "bob-ceramics")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-2", "bob-invar-processing")
 end
 
 if data.raw.item["tungsten-carbide"] then
@@ -783,12 +771,12 @@ if data.raw.item["tungsten-carbide"] then
     "bob-vehicle-fission-reactor-equipment-4",
     { type = "item", name = "tungsten-carbide", amount = 80 }
   )
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-tungsten-processing")
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-fission-cell-equipment-4",
     { type = "item", name = "tungsten-carbide", amount = 40 }
   )
-  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-tungsten-processing")
 end
 
 if data.raw.item["bob-heat-shield-tile"] then
diff --git a/bobwarfare/changelog.txt b/bobwarfare/changelog.txt
index 7c05ad979..b12bcec90 100644
--- a/bobwarfare/changelog.txt
+++ b/bobwarfare/changelog.txt
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.6
+Version: 2.1.0
 Date: ???
   Bugfixes:
     - Fixed Scatter cannnon shells missing rock, trees, etc. #561
@@ -10,6 +10,7 @@ Date: ???
     - Set item weights #553
     - Renamed Laser robot to Devestator robot #578
     - Adjust ingredients for some T4 and T5 recipes #583
+    - Reworked recipe ingredients #585
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.5
 Date: 15. 01. 2026
diff --git a/bobwarfare/data-updates.lua b/bobwarfare/data-updates.lua
index 4c9bd33a1..348bfab02 100644
--- a/bobwarfare/data-updates.lua
+++ b/bobwarfare/data-updates.lua
@@ -70,114 +70,121 @@ end
 
 if mods["quality"] then
   bobmods.lib.recipe.update_recycling_recipe({
-    "modular-armor",
-    "power-armor",
-    "power-armor-mk2",
-    "bob-power-armor-mk3",
-    "bob-power-armor-mk4",
-    "bob-power-armor-mk5",
-    "bob-rifle",
-    "bob-sniper-rifle",
-    "bob-laser-rifle",
-    "tank",
-    "bob-tank-2",
-    "bob-tank-3",
+    "artillery-shell",
+    "artillery-turret",
     "artillery-wagon",
+    "bob-acid-bullet-projectile",
+    "bob-acid-rocket-warhead",
+    "bob-antron",
+    "bob-ap-bullet-projectile",
+    "bob-artillery-turret-2",
+    "bob-artillery-turret-3",
     "bob-artillery-wagon-2",
     "bob-artillery-wagon-3",
-    "bob-robot-drone-frame",
-    "bob-robot-drone-frame-large",
-    "bob-robot-gun-drone",
-    "bob-robot-laser-drone",
-    "bob-robot-flamethrower-drone",
-    "bob-robot-plasma-drone",
     "bob-bullet-casing",
     "bob-bullet-projectile",
-    "bob-ap-bullet-projectile",
-    "bob-he-bullet-projectile",
-    "bob-flame-bullet-projectile",
-    "bob-acid-bullet-projectile",
-    "bob-poison-bullet-projectile",
+    "bob-defender-robot",
+    "bob-destroyer-robot",
+    "bob-distractor-artillery-shell",
+    "bob-distractor-robot",
     "bob-electric-bullet-projectile",
-    "bob-uranium-bullet-projectile",
-    "bob-plasma-bullet-projectile",
-    "bob-shotgun-shell-casing",
-    "bob-shot",
-    "bob-rocket-engine",
-    "bob-rocket-body",
-    "bob-piercing-rocket-warhead",
     "bob-electric-rocket-warhead",
+    "bob-explosive-artillery-shell",
     "bob-explosive-rocket-warhead",
-    "bob-acid-rocket-warhead",
-    "bob-flame-rocket-warhead",
-    "bob-poison-rocket-warhead",
-    "bob-plasma-rocket-warhead",
-    "bob-shotgun-ap-shell",
-    "bob-shotgun-electric-shell",
-    "bob-shotgun-explosive-shell",
-    "bob-shotgun-flame-shell",
-    "bob-shotgun-acid-shell",
-    "bob-shotgun-poison-shell",
-    "bob-shotgun-plasma-shell",
-    "bob-laser-rifle-battery",
-    "bob-laser-rifle-battery-ruby",
-    "bob-laser-rifle-battery-sapphire",
-    "bob-laser-rifle-battery-emerald",
-    "bob-laser-rifle-battery-amethyst",
-    "bob-laser-rifle-battery-topaz",
-    "bob-laser-rifle-battery-diamond",
-    "artillery-shell",
-    "bob-poison-artillery-shell",
     "bob-fire-artillery-shell",
-    "bob-explosive-artillery-shell",
-    "bob-distractor-artillery-shell",
-    "radar",
-    "bob-radar-2",
-    "bob-radar-3",
-    "bob-radar-4",
-    "bob-radar-5",
+    "bob-flame-bullet-projectile",
+    "bob-flame-rocket-warhead",
     "bob-gun-turret-2",
     "bob-gun-turret-3",
     "bob-gun-turret-4",
     "bob-gun-turret-5",
-    "bob-sniper-turret-2",
-    "bob-sniper-turret-3",
+    "bob-heavy-spidertron",
+    "bob-he-bullet-projectile",
+    "bob-laser-rifle",
+    "bob-laser-rifle-battery",
+    "bob-laser-rifle-battery-amethyst",
+    "bob-laser-rifle-battery-diamond",
+    "bob-laser-rifle-battery-emerald",
+    "bob-laser-rifle-battery-ruby",
+    "bob-laser-rifle-battery-sapphire",
+    "bob-laser-rifle-battery-topaz",
+    "bob-laser-robot",
     "bob-laser-turret-2",
     "bob-laser-turret-3",
     "bob-laser-turret-4",
     "bob-laser-turret-5",
+    "bob-logistic-spidertron",
+    "bob-mech-armor-plate",
+    "bob-mech-brain",
+    "bob-mech-foot",
+    "bob-mech-hip",
+    "bob-mech-knee",
+    "bob-mech-leg",
+    "bob-mech-leg-segment",
+    "bob-piercing-rocket-warhead",
+    "bob-plasma-bullet-projectile",
+    "bob-plasma-rocket-warhead",
     "bob-plasma-turret-1",
     "bob-plasma-turret-2",
     "bob-plasma-turret-3",
     "bob-plasma-turret-4",
-    "bob-artillery-turret-2",
-    "bob-artillery-turret-3",
+    "bob-poison-artillery-shell",
+    "bob-poison-bullet-projectile",
+    "bob-poison-rocket-warhead",
+    "bob-power-armor-mk3",
+    "bob-power-armor-mk4",
+    "bob-power-armor-mk5",
+    "bob-radar-2",
+    "bob-radar-3",
+    "bob-radar-4",
+    "bob-radar-5",
+    "bob-rifle",
     "bob-robot-brain-combat",
     "bob-robot-brain-combat-2",
     "bob-robot-brain-combat-3",
     "bob-robot-brain-combat-4",
+    "bob-robot-drone-frame",
+    "bob-robot-drone-frame-large",
+    "bob-robot-flamethrower-drone",
+    "bob-robot-gun-drone",
+    "bob-robot-laser-drone",
+    "bob-robot-plasma-drone",
     "bob-robot-tool-combat",
     "bob-robot-tool-combat-2",
     "bob-robot-tool-combat-3",
     "bob-robot-tool-combat-4",
-    "bob-defender-robot",
-    "bob-distractor-robot",
-    "bob-destroyer-robot",
-    "bob-laser-robot",
+    "bob-rocket-body",
+    "bob-rocket-engine",
+    "bob-shot",
+    "bob-shotgun-acid-shell",
+    "bob-shotgun-ap-shell",
+    "bob-shotgun-electric-shell",
+    "bob-shotgun-explosive-shell",
+    "bob-shotgun-flame-shell",
+    "bob-shotgun-plasma-shell",
+    "bob-shotgun-poison-shell",
+    "bob-shotgun-shell-casing",
+    "bob-sniper-rifle",
+    "bob-sniper-turret-1",
+    "bob-sniper-turret-2",
+    "bob-sniper-turret-3",
+    "bob-spidertron-cannon",
+    "bob-tank-2",
+    "bob-tank-3",
+    "bob-tankotron",
+    "bob-uranium-bullet-projectile",
+    "combat-shotgun",
     "defender-capsule",
-    "distractor-capsule",
     "destroyer-capsule",
-    "bob-mech-leg-segment",
-    "bob-mech-foot",
-    "bob-mech-hip",
-    "bob-mech-knee",
-    "bob-mech-leg",
-    "bob-mech-brain",
-    "bob-mech-armor-plate",
-    "bob-antron",
-    "bob-tankotron",
+    "distractor-capsule",
+    "flamethrower",
+    "flamethrower-turret",
+    "modular-armor",
+    "power-armor",
+    "power-armor-mk2",
+    "radar",
+    "rocket-launcher",
     "spidertron",
-    "bob-logistic-spidertron",
-    "bob-heavy-spidertron",
+    "tank",
   })
 end
diff --git a/bobwarfare/info.json b/bobwarfare/info.json
index 1ddae5789..52987fa65 100644
--- a/bobwarfare/info.json
+++ b/bobwarfare/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobwarfare",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "factorio_version": "2.0",
   "title": "Bob's Warfare mod",
   "author": "Bobingabout",
@@ -8,9 +8,9 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.4",
-    "? bobplates >= 2.0.6",
-    "? bobenemies >= 2.0.0",
+    "boblibrary >= 2.1.0",
+    "? bobplates >= 2.1.0",
+    "? bobenemies >= 2.1.0",
     "(?) aai-programmable-vehicles"
   ],
   "description": "Requires Bob's functions library mod.\n\nThis mod adds a lot of things for warfare.\nAdds Nitroglycerine production chain, which is used to make intermediates for new ammo.\nAdds 7 new gun ammos, shotgun ammos, and rockets based on an improved normal, and 6 elemental ammos.\nAdds a laser rifle and 7 tiers of laser ammo using glass and the 6 gems.\nAdds Tanks to tier 3, and artillery wagons to tier 3.\nChanges the way you make combat robots, and adds a 4th combat robot capsule.\nAdds a Robot laser drone.\nAdds a higher tier wall and gate\nAdds a couple new mines.\nAdds Scatter tank ammo\nAdds a few new types of artillery ammo.\nAdds more tiers of Radar.\n\nAlthough it can function as a stand alone mod, it is intended to be used with the full Bob's Mods set."}
diff --git a/bobwarfare/prototypes/armor-updates.lua b/bobwarfare/prototypes/armor-updates.lua
index 112d4481f..93293a14b 100644
--- a/bobwarfare/prototypes/armor-updates.lua
+++ b/bobwarfare/prototypes/armor-updates.lua
@@ -56,7 +56,7 @@ if data.raw.item["tungsten-carbide"] then
     bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "bob-tankotron")
   else
     bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk5", "steel-plate", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "bob-tungsten-processing")
   end
 end
 
diff --git a/bobwarfare/prototypes/recipe/recipe-updates.lua b/bobwarfare/prototypes/recipe/recipe-updates.lua
index deb095590..c53414a16 100644
--- a/bobwarfare/prototypes/recipe/recipe-updates.lua
+++ b/bobwarfare/prototypes/recipe/recipe-updates.lua
@@ -27,9 +27,13 @@ if data.raw.item["bob-gunmetal-alloy"] then
   bobmods.lib.recipe.replace_ingredient("bob-bullet-casing", "copper-plate", "bob-gunmetal-alloy")
   bobmods.lib.recipe.replace_ingredient("bob-shotgun-shell-casing", "copper-plate", "bob-gunmetal-alloy")
   bobmods.lib.recipe.replace_ingredient("bob-rocket-engine", "steel-plate", "bob-gunmetal-alloy")
+  bobmods.lib.recipe.replace_ingredient("combat-shotgun", "steel-plate", "bob-gunmetal-alloy")
+  bobmods.lib.recipe.replace_ingredient("bob-rifle", "steel-plate", "bob-gunmetal-alloy")
+  bobmods.lib.recipe.replace_ingredient("bob-sniper-rifle", "steel-plate", "bob-gunmetal-alloy")
   bobmods.lib.tech.add_prerequisite("bob-bullets", "bob-zinc-processing")
   bobmods.lib.tech.add_prerequisite("bob-shotgun-shells", "bob-zinc-processing")
   bobmods.lib.tech.add_prerequisite("bob-rocket", "bob-zinc-processing")
+  bobmods.lib.tech.add_prerequisite("military-3", "bob-zinc-processing")
 end
 
 if data.raw.item["bob-lead-plate"] then
@@ -50,15 +54,27 @@ end
 
 if data.raw.item["bob-steel-gear-wheel"] then
   bobmods.lib.recipe.replace_ingredient("bob-radar-2", "iron-gear-wheel", "bob-steel-gear-wheel")
-  bobmods.lib.recipe.replace_ingredient("bob-rifle", "iron-gear-wheel", "bob-steel-gear-wheel")
-  bobmods.lib.recipe.replace_ingredient("bob-sniper-rifle", "iron-gear-wheel", "bob-steel-gear-wheel")
   bobmods.lib.recipe.replace_ingredient("bob-laser-rifle", "iron-gear-wheel", "bob-steel-gear-wheel")
   bobmods.lib.recipe.replace_ingredient("bob-gun-turret-2", "iron-gear-wheel", "bob-steel-gear-wheel")
+  bobmods.lib.recipe.replace_ingredient("flamethrower-turret", "iron-gear-wheel", "bob-steel-gear-wheel")
+  bobmods.lib.recipe.replace_ingredient("rocket-launcher", "iron-gear-wheel", "bob-steel-gear-wheel")
+  bobmods.lib.recipe.replace_ingredient("flamethrower", "iron-gear-wheel", "bob-steel-gear-wheel")
+  bobmods.lib.recipe.replace_ingredient("bob-sniper-turret-1", "iron-gear-wheel", "bob-steel-gear-wheel")
+end
+
+if data.raw.item["bob-steel-pipe"] then
+  bobmods.lib.recipe.replace_ingredient("flamethrower-turret", "pipe", "bob-steel-pipe")
 end
 
 if data.raw.item["bob-cobalt-steel-gear-wheel"] then
+  bobmods.lib.recipe.replace_ingredient("artillery-turret", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
   bobmods.lib.recipe.replace_ingredient("bob-sniper-turret-2", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
-  bobmods.lib.tech.add_prerequisite("bob-sniper-turrets-2", "bob-cobalt-processing")
+  bobmods.lib.recipe.replace_ingredient("tank", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+  bobmods.lib.recipe.replace_ingredient("bob-gun-turret-3", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+  bobmods.lib.recipe.replace_ingredient("bob-rifle", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+  bobmods.lib.recipe.replace_ingredient("bob-sniper-rifle", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+  bobmods.lib.recipe.replace_ingredient("combat-shotgun", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+  bobmods.lib.tech.add_prerequisite("military-3", "bob-cobalt-processing")
 end
 
 if data.raw.item["bob-steel-bearing"] then
@@ -73,39 +89,45 @@ if data.raw.item["bob-cobalt-steel-bearing"] then
   )
 end
 
+if data.raw.item["bob-cobalt-steel-alloy"] then
+  bobmods.lib.recipe.replace_ingredient("artillery-turret", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.recipe.replace_ingredient("bob-gun-turret-3", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.tech.add_prerequisite("bob-turrets-3", "bob-cobalt-processing")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-3", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.tech.add_prerequisite("bob-laser-turrets-3", "bob-cobalt-processing")
+  bobmods.lib.recipe.replace_ingredient("bob-sniper-turret-2", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.recipe.replace_ingredient("tank", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.tech.add_prerequisite("tank", "bob-cobalt-processing")
+  bobmods.lib.recipe.remove_ingredient("bob-plasma-turret-1", "steel-plate")
+  bobmods.lib.recipe.add_ingredient(
+    "bob-plasma-turret-1",
+    { type = "item", name = "bob-cobalt-steel-alloy", amount = 75 }
+  )
+  bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-1", "bob-cobalt-processing")
+  bobmods.lib.recipe.replace_ingredient("bob-radar-3", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+  bobmods.lib.tech.add_prerequisite("bob-radar-3", "bob-cobalt-processing")
+end
+
+if data.raw.item["bob-nickel-plate"] then
+  bobmods.lib.recipe.add_ingredient("bob-plasma-turret-1", { type = "item", name = "bob-nickel-plate", amount = 75 })
+  bobmods.lib.recipe.replace_ingredient("combat-shotgun", "copper-plate", "bob-nickel-plate")
+  bobmods.lib.tech.add_prerequisite("military-3", "bob-nickel-processing")
+end
+
 if data.raw.item["bob-invar-alloy"] then
-  bobmods.lib.recipe.replace_ingredient("bob-gun-turret-3", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.tech.add_prerequisite("bob-turrets-3", "bob-invar-processing")
-  bobmods.lib.recipe.replace_ingredient("bob-sniper-turret-2", "iron-plate", "bob-invar-alloy")
-  bobmods.lib.tech.add_prerequisite("bob-sniper-turrets-2", "bob-invar-processing")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-3", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.tech.add_prerequisite("bob-laser-turrets-3", "bob-invar-processing")
-
-  bobmods.lib.recipe.replace_ingredient("tank", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.tech.add_prerequisite("tank", "bob-invar-processing")
-
-  if data.raw.item["bob-cobalt-steel-alloy"] then
-    bobmods.lib.recipe.remove_ingredient("bob-plasma-turret-1", "steel-plate")
-    bobmods.lib.recipe.add_ingredient(
-      "bob-plasma-turret-1",
-      { type = "item", name = "bob-cobalt-steel-alloy", amount = 75 }
-    )
-    bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-1", "bob-cobalt-processing")
-    bobmods.lib.recipe.add_ingredient("bob-plasma-turret-1", { type = "item", name = "bob-invar-alloy", amount = 75 })
-  end
-  bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-1", "bob-invar-processing")
+  bobmods.lib.recipe.add_ingredient("bob-plasma-turret-2", { type = "item", name = "bob-invar-alloy", amount = 75 })
+  bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "bob-invar-processing")
 end
 
 if data.raw.item["bob-brass-gear-wheel"] then
-  bobmods.lib.recipe.replace_ingredient("bob-radar-3", "iron-gear-wheel", "bob-brass-gear-wheel")
-  bobmods.lib.tech.add_prerequisite("bob-radar-3", "bob-zinc-processing")
-  bobmods.lib.recipe.replace_ingredient("bob-gun-turret-3", "iron-gear-wheel", "bob-brass-gear-wheel")
-  bobmods.lib.tech.add_prerequisite("bob-turrets-3", "bob-zinc-processing")
-  bobmods.lib.recipe.replace_ingredient("tank", "iron-gear-wheel", "bob-brass-gear-wheel")
-  bobmods.lib.tech.add_prerequisite("tank", "bob-zinc-processing")
+  bobmods.lib.recipe.replace_ingredient("bob-sniper-turret-3", "iron-gear-wheel", "bob-brass-gear-wheel")
+  bobmods.lib.tech.add_prerequisite("bob-sniper-turrets-3", "bob-brass-processing")
 end
 
 if data.raw.item["bob-aluminium-plate"] then
+  bobmods.lib.recipe.replace_ingredient("bob-sniper-turret-2", "iron-plate", "bob-aluminium-plate")
+  bobmods.lib.tech.add_prerequisite("bob-sniper-turrets-2", "bob-aluminium-processing")
+
   bobmods.lib.recipe.replace_ingredient("bob-rocket-body", "steel-plate", "bob-aluminium-plate")
   bobmods.lib.tech.add_prerequisite("bob-rocket", "bob-aluminium-processing")
   bobmods.lib.recipe.replace_ingredient("bob-radar-3", "steel-plate", "bob-aluminium-plate")
@@ -161,7 +183,6 @@ end
 if data.raw.item["bob-titanium-gear-wheel"] then
   bobmods.lib.recipe.replace_ingredient("bob-radar-4", "iron-gear-wheel", "bob-titanium-gear-wheel")
   bobmods.lib.recipe.replace_ingredient("bob-gun-turret-4", "iron-gear-wheel", "bob-titanium-gear-wheel")
-  bobmods.lib.recipe.replace_ingredient("bob-sniper-turret-3", "iron-gear-wheel", "bob-titanium-gear-wheel")
   bobmods.lib.recipe.replace_ingredient("bob-tank-2", "iron-gear-wheel", "bob-titanium-gear-wheel")
   bobmods.lib.recipe.replace_ingredient("bob-artillery-turret-2", "iron-gear-wheel", "bob-titanium-gear-wheel")
 end
@@ -177,9 +198,6 @@ if data.raw.item["bob-silicon-nitride"] then
   bobmods.lib.tech.add_prerequisite("bob-tanks-3", "bob-ceramics")
   bobmods.lib.recipe.replace_ingredient("bob-artillery-turret-2", "concrete", "bob-silicon-nitride")
   bobmods.lib.tech.add_prerequisite("bob-artillery-turret-2", "bob-ceramics")
-
-  bobmods.lib.recipe.add_ingredient("bob-plasma-turret-2", { type = "item", name = "bob-silicon-nitride", amount = 50 })
-  bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "bob-ceramics")
 end
 
 if data.raw.item["bob-battery-3"] then
@@ -194,7 +212,7 @@ if data.raw.item["bob-battery-3"] then
 end
 
 if data.raw.item["bob-copper-tungsten-alloy"] then
-  bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-3", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-3", "bob-tungsten-processing")
   bobmods.lib.recipe.remove_ingredient("bob-plasma-turret-3", "steel-plate")
   bobmods.lib.recipe.add_ingredient(
     "bob-plasma-turret-3",
@@ -204,9 +222,9 @@ end
 
 if data.raw.item["tungsten-carbide"] then
   bobmods.lib.recipe.replace_ingredient("bob-tank-3", "steel-plate", "tungsten-carbide")
-  bobmods.lib.tech.add_prerequisite("bob-tanks-3", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.add_prerequisite("bob-tanks-3", "bob-tungsten-processing")
   bobmods.lib.recipe.replace_ingredient("bob-artillery-turret-3", "concrete", "tungsten-carbide")
-  bobmods.lib.tech.add_prerequisite("bob-artillery-turret-3", "bob-tungsten-alloy-processing")
+  bobmods.lib.tech.add_prerequisite("bob-artillery-turret-3", "bob-tungsten-processing")
 end
 
 if data.raw.item["bob-heat-shield-tile"] then
diff --git a/bobwarfare/prototypes/robots-updates.lua b/bobwarfare/prototypes/robots-updates.lua
index bd7e6e79c..677c1a39f 100644
--- a/bobwarfare/prototypes/robots-updates.lua
+++ b/bobwarfare/prototypes/robots-updates.lua
@@ -75,12 +75,12 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
       bobmods.lib.recipe.add_ingredient("bob-distractor-robot", { type = "item", name = "steel-plate", amount = 1 })
     end
     bobmods.lib.recipe.add_ingredient("bob-distractor-robot", { type = "item", name = "advanced-circuit", amount = 1 })
-    if data.raw.item["bob-brass-gear-wheel"] then
+    if data.raw.item["bob-cobalt-steel-gear-wheel"] then
       bobmods.lib.recipe.add_ingredient(
         "bob-distractor-robot",
-        { type = "item", name = "bob-brass-gear-wheel", amount = 3 }
+        { type = "item", name = "bob-obalt-steel-gear-wheel", amount = 3 }
       )
-      bobmods.lib.tech.add_prerequisite("distractor", "bob-zinc-processing")
+      bobmods.lib.tech.add_prerequisite("distractor", "bob-cobalt-processing")
     else
       bobmods.lib.recipe.add_ingredient("bob-distractor-robot", { type = "item", name = "iron-gear-wheel", amount = 3 })
     end
@@ -229,20 +229,20 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
   end
 
   if data.raw.recipe["bob-robot-tool-combat-2"] then
-    if data.raw.item["bob-brass-alloy"] then
+    if data.raw.item["bob-cobalt-steel-alloy"] then
       bobmods.lib.recipe.add_ingredient(
         "bob-robot-tool-combat-2",
-        { type = "item", name = "bob-brass-alloy", amount = 1 }
+        { type = "item", name = "bob-cobalt-steel-alloy", amount = 1 }
       )
-      bobmods.lib.tech.add_prerequisite("distractor", "bob-zinc-processing")
+      bobmods.lib.tech.add_prerequisite("distractor", "bob-cobalt-processing")
     else
       bobmods.lib.recipe.add_ingredient("bob-robot-tool-combat-2", { type = "item", name = "steel-plate", amount = 1 })
     end
 
-    if data.raw.item["bob-brass-gear-wheel"] then
+    if data.raw.item["bob-cobalt-steel-gear-wheel"] then
       bobmods.lib.recipe.add_ingredient(
         "bob-robot-tool-combat-2",
-        { type = "item", name = "bob-brass-gear-wheel", amount = 2 }
+        { type = "item", name = "bob-cobalt-steel-gear-wheel", amount = 2 }
       )
     else
       bobmods.lib.recipe.add_ingredient(
diff --git a/bobwarfare/prototypes/spidertron-updates.lua b/bobwarfare/prototypes/spidertron-updates.lua
index 740eee2fc..ce39eda1e 100644
--- a/bobwarfare/prototypes/spidertron-updates.lua
+++ b/bobwarfare/prototypes/spidertron-updates.lua
@@ -290,6 +290,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
   if data.raw.item["bob-titanium-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-mech-hip", "iron-gear-wheel", "bob-titanium-gear-wheel")
     bobmods.lib.recipe.replace_ingredient("bob-mech-knee", "iron-gear-wheel", "bob-titanium-gear-wheel")
+    bobmods.lib.tech.add_prerequisite("bob-walking-vehicle", "bob-titanium-processing")
   end
 
   if data.raw.item["bob-titanium-bearing"] then
@@ -297,18 +298,24 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
     bobmods.lib.recipe.add_ingredient("bob-mech-knee", { type = "item", name = "bob-titanium-bearing", amount = 2 })
   end
 
-  if data.raw.item["bob-nitinol-alloy"] then
-    bobmods.lib.recipe.replace_ingredient("bob-mech-leg-segment", "steel-plate", "bob-nitinol-alloy")
-    bobmods.lib.tech.add_prerequisite("bob-walking-vehicle", "bob-nitinol-processing")
+  if data.raw.item["bob-brass-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("bob-mech-leg-segment", "steel-plate", "bob-brass-alloy")
+    bobmods.lib.tech.add_prerequisite("bob-walking-vehicle", "bob-brass-processing")
   end
 
   if data.raw.item["bob-insulated-cable"] then
     bobmods.lib.recipe.replace_ingredient("bob-mech-leg", "copper-cable", "bob-insulated-cable")
   end
 
-  if data.raw.item["tungsten-carbide"] then
+  if mods["bobplates"] then
+    bobmods.lib.recipe.replace_ingredient("bob-spidertron-cannon", "steel-plate", "tungsten-plate")
+    bobmods.lib.recipe.replace_ingredient("bob-spidertron-cannon", "iron-gear-wheel", "bob-tungsten-gear-wheel")
     bobmods.lib.recipe.replace_ingredient("bob-mech-armor-plate", "steel-plate", "tungsten-carbide")
-    bobmods.lib.tech.add_prerequisite("bob-tankotron", "bob-tungsten-alloy-processing")
+    bobmods.lib.tech.add_prerequisite("bob-tankotron", "bob-tungsten-processing")
+
+    if mods["boblogistics"] then
+      bobmods.lib.recipe.add_ingredient("bob-spidertron-cannon", { type = "item", name = "bob-tungsten-pipe", amount = 4 })
+    end
   end
 
   if data.raw.item["bob-solder"] then
diff --git a/bobwarfare/prototypes/train-updates.lua b/bobwarfare/prototypes/train-updates.lua
index 98a5a62bf..656c854eb 100644
--- a/bobwarfare/prototypes/train-updates.lua
+++ b/bobwarfare/prototypes/train-updates.lua
@@ -1,11 +1,30 @@
+if data.raw.item["bob-cobalt-steel-alloy"] then
+  bobmods.lib.recipe.replace_ingredient("artillery-wagon", "steel-plate", "bob-cobalt-steel-alloy")
+  bobmods.lib.tech.add_prerequisite("artillery", "bob-cobalt-processing")
+end
+
+if data.raw.item["bob-cobalt-steel-gear-wheel"] then
+  bobmods.lib.recipe.replace_ingredient("artillery-wagon", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel")
+  bobmods.lib.tech.add_prerequisite("artillery", "bob-cobalt-processing")
+end
+
+if data.raw.item["bob-aluminium-pipe"] then
+  bobmods.lib.recipe.replace_ingredient("artillery-wagon", "pipe", "bob-aluminium-pipe")
+  bobmods.lib.tech.add_prerequisite("artillery", "bob-aluminium-processing")
+end
+
 if data.raw.item["bob-invar-alloy"] then
-  bobmods.lib.recipe.replace_ingredient("artillery-wagon", "steel-plate", "bob-invar-alloy")
-  bobmods.lib.tech.add_prerequisite("artillery", "bob-invar-processing")
+  bobmods.lib.recipe.remove_ingredient("bob-artillery-wagon-2", "steel-plate")
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-2", { type = "item", name = "bob-invar-alloy", amount = 20 })
+  bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-2", "bob-invar-processing")
 end
 
-if data.raw.item["bob-titanium-plate"] then
-  bobmods.lib.recipe.replace_ingredient("bob-artillery-wagon-2", "steel-plate", "bob-titanium-plate")
-  bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-2", "bob-titanium-processing")
+if data.raw.item["bob-silicon-nitride"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-artillery-wagon-2",
+    { type = "item", name = "bob-silicon-nitride", amount = 20 }
+  )
+  bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-2", "bob-ceramics")
 end
 
 if data.raw.item["bob-titanium-bearing"] then
@@ -13,6 +32,7 @@ if data.raw.item["bob-titanium-bearing"] then
     "bob-artillery-wagon-2",
     { type = "item", name = "bob-titanium-bearing", amount = 8 }
   )
+  bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-2", "bob-titanium-processing")
 elseif data.raw.item["bob-steel-bearing"] then
   bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-2", { type = "item", name = "bob-steel-bearing", amount = 8 })
 else
@@ -21,31 +41,17 @@ end
 
 if data.raw.item["bob-titanium-gear-wheel"] then
   bobmods.lib.recipe.replace_ingredient("bob-artillery-wagon-2", "iron-gear-wheel", "bob-titanium-gear-wheel")
-elseif data.raw.item["bob-steel-gear-wheel"] then
-  bobmods.lib.recipe.replace_ingredient("bob-artillery-wagon-2", "iron-gear-wheel", "bob-steel-gear-wheel")
 end
 
 if data.raw.item["bob-titanium-pipe"] then
   bobmods.lib.recipe.replace_ingredient("bob-artillery-wagon-2", "pipe", "bob-titanium-pipe")
-elseif data.raw.item["bob-steel-pipe"] then
-  bobmods.lib.recipe.replace_ingredient("bob-artillery-wagon-2", "pipe", "bob-steel-pipe")
 end
 
 if data.raw.item["tungsten-carbide"] then
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "tungsten-carbide", amount = 10 })
-  bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-3", "bob-tungsten-alloy-processing")
-else
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "steel-plate", amount = 10 })
-end
-
-if data.raw.item["bob-silicon-nitride"] then
-  bobmods.lib.recipe.add_ingredient(
-    "bob-artillery-wagon-3",
-    { type = "item", name = "bob-silicon-nitride", amount = 10 }
-  )
-  bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-3", "bob-ceramics")
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "tungsten-carbide", amount = 20 })
+  bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-3", "bob-tungsten-processing")
 else
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "steel-plate", amount = 10 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "steel-plate", amount = 20 })
 end
 
 if data.raw.item["bob-nitinol-alloy"] then