diff --git a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
index 165890c72..360efd9e0 100644
--- a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
@@ -1,8 +1,8 @@
 bobmods.lib.recipe.set_ingredients("roboport", {
-  { "steel-plate", 15 },
-  { "roboport-antenna-1", 5 },
-  { "roboport-chargepad-1", 4 },
-  { "roboport-door-1", 1 },
+  { type = "item", name = "steel-plate", amount = 15 },
+  { type = "item", name = "roboport-antenna-1", amount = 5 },
+  { type = "item", name = "roboport-chargepad-1", amount = 4 },
+  { type = "item", name = "roboport-door-1", amount = 1 },
 })
 
 if data.raw.item["aluminium-plate"] then
@@ -28,9 +28,9 @@ if data.raw.item["tinned-copper-cable"] then
 end
 
 if data.raw.item["steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("roboport-door-2", { "steel-bearing", 20 })
+  bobmods.lib.recipe.add_ingredient("roboport-door-2", { type = "item", name = "steel-bearing", amount = 20 })
 else
-  bobmods.lib.recipe.add_ingredient("roboport-door-2", { "iron-gear-wheel", 20 })
+  bobmods.lib.recipe.add_ingredient("roboport-door-2", { type = "item", name = "iron-gear-wheel", amount = 20 })
 end
 
 if data.raw.item["brass-gear-wheel"] then
@@ -68,9 +68,9 @@ if data.raw.item["titanium-plate"] then
 end
 
 if data.raw.item["titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient("roboport-door-3", { "titanium-bearing", 20 })
+  bobmods.lib.recipe.add_ingredient("roboport-door-3", { type = "item", name = "titanium-bearing", amount = 20 })
 else
-  bobmods.lib.recipe.add_ingredient("roboport-door-3", { "iron-gear-wheel", 20 })
+  bobmods.lib.recipe.add_ingredient("roboport-door-3", { type = "item", name = "iron-gear-wheel", amount = 20 })
   bobmods.lib.recipe.add_ingredient("roboport-door-3", { type = "fluid", name = "lubricant", amount = 10 })
   data.raw.recipe["roboport-door-3"].category = "crafting-with-fluid"
 end
@@ -121,9 +121,9 @@ if data.raw.item["nitinol-alloy"] then
 end
 
 if data.raw.item["nitinol-bearing"] then
-  bobmods.lib.recipe.add_ingredient("roboport-door-4", { "nitinol-bearing", 20 })
+  bobmods.lib.recipe.add_ingredient("roboport-door-4", { type = "item", name = "nitinol-bearing", amount = 20 })
 else
-  bobmods.lib.recipe.add_ingredient("roboport-door-4", { "iron-gear-wheel", 30 })
+  bobmods.lib.recipe.add_ingredient("roboport-door-4", { type = "item", name = "iron-gear-wheel", amount = 30 })
   bobmods.lib.recipe.add_ingredient("roboport-door-4", { type = "fluid", name = "lubricant", amount = 15 })
   data.raw.recipe["roboport-door-4"].category = "crafting-with-fluid"
 end
diff --git a/bobwarfare/prototypes/recipe/ammo-recipe.lua b/bobwarfare/prototypes/recipe/ammo-recipe.lua
index df9fadf10..da8f53198 100644
--- a/bobwarfare/prototypes/recipe/ammo-recipe.lua
+++ b/bobwarfare/prototypes/recipe/ammo-recipe.lua
@@ -6,8 +6,8 @@ data:extend({
     enabled = false,
     energy_required = 2,
     ingredients = {
-      { "bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "bullet-magazine", amount = 1 } },
   },
@@ -19,8 +19,8 @@ data:extend({
     enabled = false,
     energy_required = 3,
     ingredients = {
-      { "ap-bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "ap-bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "ap-bullet-magazine", amount = 1 } },
   },
@@ -32,8 +32,8 @@ data:extend({
     enabled = false,
     energy_required = 3,
     ingredients = {
-      { "he-bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "he-bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "he-bullet-magazine", amount = 1 } },
   },
@@ -45,8 +45,8 @@ data:extend({
     enabled = false,
     energy_required = 3,
     ingredients = {
-      { "flame-bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "flame-bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "flame-bullet-magazine", amount = 1 } },
   },
@@ -58,8 +58,8 @@ data:extend({
     enabled = false,
     energy_required = 3,
     ingredients = {
-      { "acid-bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "acid-bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "acid-bullet-magazine", amount = 1 } },
   },
@@ -71,8 +71,8 @@ data:extend({
     enabled = false,
     energy_required = 3,
     ingredients = {
-      { "poison-bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "poison-bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "poison-bullet-magazine", amount = 1 } },
   },
@@ -84,8 +84,8 @@ data:extend({
     enabled = false,
     energy_required = 3,
     ingredients = {
-      { "electric-bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "electric-bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "electric-bullet-magazine", amount = 1 } },
   },
@@ -96,8 +96,8 @@ data:extend({
     enabled = false,
     energy_required = 3,
     ingredients = {
-      { "uranium-bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "uranium-bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "uranium-rounds-magazine", amount = 1 } },
   },
@@ -109,9 +109,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "shotgun-shell-casing", 1 },
-      { "shot", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "shotgun-shell-casing", amount = 1 },
+      { type = "item", name = "shot", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "better-shotgun-shell", amount = 1 } },
   },
@@ -123,9 +123,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "shotgun-shell-casing", 1 },
-      { "steel-plate", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "shotgun-shell-casing", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "shotgun-ap-shell", amount = 1 } },
   },
@@ -137,9 +137,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "shotgun-shell-casing", 1 },
-      { "copper-plate", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "shotgun-shell-casing", amount = 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "shotgun-electric-shell", amount = 1 } },
   },
@@ -151,9 +151,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "shotgun-shell-casing", 1 },
-      { "explosives", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "shotgun-shell-casing", amount = 1 },
+      { type = "item", name = "explosives", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "shotgun-explosive-shell", amount = 1 } },
   },
@@ -166,10 +166,10 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "shotgun-shell-casing", 1 },
+      { type = "item", name = "shotgun-shell-casing", amount = 1 },
       { type = "fluid", name = "light-oil", amount = 5 },
       { type = "fluid", name = "heavy-oil", amount = 5 },
-      { "cordite", 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "shotgun-flame-shell", amount = 1 } },
   },
@@ -182,9 +182,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "shotgun-shell-casing", 1 },
+      { type = "item", name = "shotgun-shell-casing", amount = 1 },
       { type = "fluid", name = "sulfuric-acid", amount = 10 },
-      { "cordite", 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "shotgun-acid-shell", amount = 1 } },
   },
@@ -196,9 +196,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "shotgun-shell-casing", 1 },
-      { "coal", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "shotgun-shell-casing", amount = 1 },
+      { type = "item", name = "coal", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "shotgun-poison-shell", amount = 1 } },
   },
@@ -210,9 +210,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "shotgun-shell-casing", 1 },
-      { "uranium-238", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "shotgun-shell-casing", amount = 1 },
+      { type = "item", name = "uranium-238", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "shotgun-uranium-shell", amount = 1 } },
   },
@@ -224,8 +224,8 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "laser-rifle-battery-case", 1 },
-      { "battery", 4 },
+      { type = "item", name = "laser-rifle-battery-case", amount = 1 },
+      { type = "item", name = "battery", amount = 4 },
     },
     results = { { type = "item", name = "laser-rifle-battery", amount = 1 } },
   },
@@ -237,8 +237,8 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "laser-rifle-battery", 1 },
-      { "battery", 4 },
+      { type = "item", name = "laser-rifle-battery", amount = 1 },
+      { type = "item", name = "battery", amount = 4 },
     },
     results = { { type = "item", name = "laser-rifle-battery-ruby", amount = 1 } },
   },
@@ -250,8 +250,8 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "laser-rifle-battery-ruby", 1 },
-      { "battery", 4 },
+      { type = "item", name = "laser-rifle-battery-ruby", amount = 1 },
+      { type = "item", name = "battery", amount = 4 },
     },
     results = { { type = "item", name = "laser-rifle-battery-sapphire", amount = 1 } },
   },
@@ -263,8 +263,8 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "laser-rifle-battery-sapphire", 1 },
-      { "battery", 4 },
+      { type = "item", name = "laser-rifle-battery-sapphire", amount = 1 },
+      { type = "item", name = "battery", amount = 4 },
     },
     results = { { type = "item", name = "laser-rifle-battery-emerald", amount = 1 } },
   },
@@ -276,8 +276,8 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "laser-rifle-battery-emerald", 1 },
-      { "battery", 4 },
+      { type = "item", name = "laser-rifle-battery-emerald", amount = 1 },
+      { type = "item", name = "battery", amount = 4 },
     },
     results = { { type = "item", name = "laser-rifle-battery-amethyst", amount = 1 } },
   },
@@ -289,8 +289,8 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "laser-rifle-battery-amethyst", 1 },
-      { "battery", 4 },
+      { type = "item", name = "laser-rifle-battery-amethyst", amount = 1 },
+      { type = "item", name = "battery", amount = 4 },
     },
     results = { { type = "item", name = "laser-rifle-battery-topaz", amount = 1 } },
   },
@@ -302,8 +302,8 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "laser-rifle-battery-topaz", 1 },
-      { "battery", 4 },
+      { type = "item", name = "laser-rifle-battery-topaz", amount = 1 },
+      { type = "item", name = "battery", amount = 4 },
     },
     results = { { type = "item", name = "laser-rifle-battery-diamond", amount = 1 } },
   },
@@ -314,8 +314,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "rocket-body", 1 },
-      { "rocket-warhead", 1 },
+      { type = "item", name = "rocket-body", amount = 1 },
+      { type = "item", name = "rocket-warhead", amount = 1 },
     },
     results = { { type = "item", name = "bob-rocket", amount = 1 } },
   },
@@ -326,8 +326,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "rocket-body", 1 },
-      { "piercing-rocket-warhead", 1 },
+      { type = "item", name = "rocket-body", amount = 1 },
+      { type = "item", name = "piercing-rocket-warhead", amount = 1 },
     },
     results = { { type = "item", name = "bob-piercing-rocket", amount = 1 } },
   },
@@ -338,8 +338,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "rocket-body", 1 },
-      { "electric-rocket-warhead", 1 },
+      { type = "item", name = "rocket-body", amount = 1 },
+      { type = "item", name = "electric-rocket-warhead", amount = 1 },
     },
     results = { { type = "item", name = "bob-electric-rocket", amount = 1 } },
   },
@@ -350,8 +350,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "rocket-body", 1 },
-      { "explosive-rocket-warhead", 1 },
+      { type = "item", name = "rocket-body", amount = 1 },
+      { type = "item", name = "explosive-rocket-warhead", amount = 1 },
     },
     results = { { type = "item", name = "bob-explosive-rocket", amount = 1 } },
   },
@@ -362,8 +362,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "rocket-body", 1 },
-      { "acid-rocket-warhead", 1 },
+      { type = "item", name = "rocket-body", amount = 1 },
+      { type = "item", name = "acid-rocket-warhead", amount = 1 },
     },
     results = { { type = "item", name = "bob-acid-rocket", amount = 1 } },
   },
@@ -374,8 +374,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "rocket-body", 1 },
-      { "flame-rocket-warhead", 1 },
+      { type = "item", name = "rocket-body", amount = 1 },
+      { type = "item", name = "flame-rocket-warhead", amount = 1 },
     },
     results = { { type = "item", name = "bob-flame-rocket", amount = 1 } },
   },
@@ -386,8 +386,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "rocket-body", 1 },
-      { "poison-rocket-warhead", 1 },
+      { type = "item", name = "rocket-body", amount = 1 },
+      { type = "item", name = "poison-rocket-warhead", amount = 1 },
     },
     results = { { type = "item", name = "bob-poison-rocket", amount = 1 } },
   },
@@ -400,10 +400,10 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "steel-plate", 2 },
-      { "plastic-bar", 2 },
-      { "explosives", 1 },
-      { "shot", 5 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "plastic-bar", amount = 2 },
+      { type = "item", name = "explosives", amount = 1 },
+      { type = "item", name = "shot", amount = 5 },
     },
     results = { { type = "item", name = "scatter-cannon-shell", amount = 1 } },
   },
@@ -417,9 +417,9 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "steel-plate", 3 },
-      { "electronic-circuit", 3 },
-      { type = "fluid", name = "light-oil", amount = 100 },
+      { type = "item", name = "steel-plate", amount = 3 },
+      { type = "item", name = "electronic-circuit", amount = 3 },
+      { type = "fluid", name = "light-oil", amount = amount = 100 },
     },
     results = { { type = "item", name = "fire-capsule", amount = 1 } },
   },
@@ -432,10 +432,10 @@ data:extend({
     enabled = false,
     energy_required = 15,
     ingredients = {
-      { "steel-plate", 6 },
-      { "plastic-bar", 6 },
-      { "coal", 15 },
-      { "explosives", 3 },
+      { type = "item", name = "steel-plate", amount = 6 },
+      { type = "item", name = "plastic-bar", amount = 6 },
+      { type = "item", name = "coal", amount = 15 },
+      { type = "item", name = "explosives", amount = 3 },
     },
     results = { { type = "item", name = "poison-artillery-shell", amount = 1 } },
   },
@@ -447,9 +447,9 @@ data:extend({
     enabled = false,
     energy_required = 15,
     ingredients = {
-      { "steel-plate", 6 },
-      { "plastic-bar", 6 },
-      { "explosives", 3 },
+      { type = "item", name = "steel-plate", amount = 6 },
+      { type = "item", name = "plastic-bar", amount = 6 },
+      { type = "item", name = "explosives", amount = 3 },
       { type = "fluid", name = "light-oil", amount = 150 },
     },
     results = { { type = "item", name = "fire-artillery-shell", amount = 1 } },
@@ -461,9 +461,9 @@ data:extend({
     enabled = false,
     energy_required = 15,
     ingredients = {
-      { "steel-plate", 6 },
-      { "plastic-bar", 6 },
-      { "explosives", 18 },
+      { type = "item", name = "steel-plate", amount = 6 },
+      { type = "item", name = "plastic-bar", amount = 6 },
+      { type = "item", name = "explosives", amount = 18 },
     },
     results = { { type = "item", name = "explosive-artillery-shell", amount = 1 } },
   },
@@ -474,10 +474,10 @@ data:extend({
     enabled = false,
     energy_required = 15,
     ingredients = {
-      { "steel-plate", 6 },
-      { "plastic-bar", 6 },
-      { "explosives", 3 },
-      { "distractor-capsule", 5 },
+      { type = "item", name = "steel-plate", amount = 6 },
+      { type = "item", name = "plastic-bar", amount = 6 },
+      { type = "item", name = "explosives", amount = 3 },
+      { type = "item", name = "distractor-capsule", amount = 5 },
     },
     results = { { type = "item", name = "distractor-artillery-shell", amount = 1 } },
   },
@@ -488,10 +488,10 @@ data:extend({
     enabled = false,
     energy_required = 50,
     ingredients = {
-      { "steel-plate", 6 },
-      { "plastic-bar", 6 },
-      { "explosives", 15 },
-      { "uranium-235", 30 },
+      { type = "item", name = "steel-plate", amount = 6 },
+      { type = "item", name = "plastic-bar", amount = 6 },
+      { type = "item", name = "explosives", amount = 15 },
+      { type = "item", name = "uranium-235", amount = 30 },
     },
     results = { { type = "item", name = "atomic-artillery-shell", amount = 1 } },
   },
@@ -505,8 +505,8 @@ data:extend({
     enabled = false,
     energy_required = 3,
     ingredients = {
-      { "plasma-bullet", 5 },
-      { "magazine", 1 },
+      { type = "item", name = "plasma-bullet", amount = 5 },
+      { type = "item", name = "magazine", amount = 1 },
     },
     results = { { type = "item", name = "plasma-bullet-magazine", amount = 1 } },
   },
@@ -526,8 +526,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "rocket-body", 1 },
-      { "plasma-rocket-warhead", 1 },
+      { type = "item", name = "rocket-body", amount = 1 },
+      { type = "item", name = "plasma-rocket-warhead", amount = 1 },
     },
     results = { { type = "item", name = "bob-plasma-rocket", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/recipe/armor-recipe.lua b/bobwarfare/prototypes/recipe/armor-recipe.lua
index f8600e1cd..8cd916a4b 100644
--- a/bobwarfare/prototypes/recipe/armor-recipe.lua
+++ b/bobwarfare/prototypes/recipe/armor-recipe.lua
@@ -5,8 +5,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "iron-plate", 100 },
-      { "steel-plate", 50 },
+      { type = "item", name = "iron-plate", amount = 100 },
+      { type = "item", name = "steel-plate", amount = 50 },
     },
     results = { { type = "item", name = "heavy-armor-2", amount = 1 } },
   },
@@ -17,8 +17,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "steel-plate", 100 },
-      { "plastic-bar", 50 },
+      { type = "item", name = "steel-plate", amount = 100 },
+      { type = "item", name = "plastic-bar", amount = 50 },
     },
     results = { { type = "item", name = "heavy-armor-3", amount = 1 } },
   },
@@ -29,12 +29,12 @@ data:extend({
     enabled = false,
     energy_required = 30,
     ingredients = {
-      { "power-armor-mk2", 1 },
-      { "processing-unit", 50 },
-      { "steel-plate", 25 },
-      { "iron-plate", 25 },
-      { "effectivity-module-2", 5 },
-      { "speed-module-2", 5 },
+      { type = "item", name = "power-armor-mk2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 50 },
+      { type = "item", name = "steel-plate", amount = 25 },
+      { type = "item", name = "iron-plate", amount = 25 },
+      { type = "item", name = "effectivity-module-2",amount =  5 },
+      { type = "item", name = "speed-module-2", amount = 5 },
     },
     results = { { type = "item", name = "bob-power-armor-mk3", amount = 1 } },
   },
@@ -44,13 +44,13 @@ data:extend({
     enabled = false,
     energy_required = 30,
     ingredients = {
-      { "bob-power-armor-mk3", 1 },
-      { "processing-unit", 40 },
-      { "advanced-circuit", 20 },
-      { "steel-plate", 25 },
-      { "plastic-bar", 25 },
-      { "effectivity-module-3", 5 },
-      { "speed-module-3", 5 },
+      { type = "item", name = "bob-power-armor-mk3", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 40 },
+      { type = "item", name = "advanced-circuit", amount = 20 },
+      { type = "item", name = "steel-plate", amount = 25 },
+      { type = "item", name = "plastic-bar", amount = 25 },
+      { type = "item", name = "effectivity-module-3", amount = 5 },
+      { type = "item", name = "speed-module-3", amount = 5 },
     },
     results = { { type = "item", name = "bob-power-armor-mk4", amount = 1 } },
   },
@@ -60,13 +60,13 @@ data:extend({
     enabled = false,
     energy_required = 30,
     ingredients = {
-      { "bob-power-armor-mk4", 1 },
-      { "processing-unit", 50 },
-      { "advanced-circuit", 50 },
-      { "steel-plate", 25 },
-      { "plastic-bar", 25 },
-      { "effectivity-module-3", 5 },
-      { "speed-module-3", 5 },
+      { type = "item", name = "bob-power-armor-mk4", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 50 },
+      { type = "item", name = "advanced-circuit", amount = 50 },
+      { type = "item", name = "steel-plate", amount = 25 },
+      { type = "item", name = "plastic-bar", amount = 25 },
+      { type = "item", name = "effectivity-module-3", amount = 5 },
+      { type = "item", name = "speed-module-3", amount = 5 },
     },
     results = { { type = "item", name = "bob-power-armor-mk5", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/recipe/drone-updates.lua b/bobwarfare/prototypes/recipe/drone-updates.lua
index 5cce485ae..7c787c2f2 100644
--- a/bobwarfare/prototypes/recipe/drone-updates.lua
+++ b/bobwarfare/prototypes/recipe/drone-updates.lua
@@ -2,15 +2,15 @@ bobmods.lib.tech.add_recipe_unlock("robotics", "robot-drone-frame")
 bobmods.lib.tech.add_recipe_unlock("robotics", "robot-drone-frame-large")
 
 if data.raw.item["robot-brain-combat"] then
-  bobmods.lib.recipe.add_ingredient("bob-robot-gun-drone", { "robot-brain-combat", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-robot-laser-drone", { "robot-brain-combat", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-robot-flamethrower-drone", { "robot-brain-combat", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-robot-plasma-drone", { "robot-brain-combat", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-gun-drone", { type = "item", name = "robot-brain-combat", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-laser-drone", { type = "item", name = "robot-brain-combat", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-flamethrower-drone", { type = "item", name = "robot-brain-combat", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-plasma-drone", { type = "item", name = "robot-brain-combat", amount = 1 })
 else
-  bobmods.lib.recipe.add_ingredient("bob-robot-gun-drone", { "electronic-circuit", 3 })
-  bobmods.lib.recipe.add_ingredient("bob-robot-laser-drone", { "electronic-circuit", 3 })
-  bobmods.lib.recipe.add_ingredient("bob-robot-flamethrower-drone", { "electronic-circuit", 3 })
-  bobmods.lib.recipe.add_ingredient("bob-robot-plasma-drone", { "electronic-circuit", 3 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-gun-drone", { type = "item", name = "electronic-circuit", amount = 3 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-laser-drone", { type = "item", name = "electronic-circuit", amount = 3 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-flamethrower-drone", { type = "item", name = "electronic-circuit", amount = 3 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-plasma-drone", { type = "item", name = "electronic-circuit", amount = 3 })
 end
 
 if data.raw.item["steel-gear-wheel"] then
@@ -19,6 +19,6 @@ if data.raw.item["steel-gear-wheel"] then
 end
 
 if data.raw.item["steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("robot-drone-frame", { "steel-bearing", 10 })
-  bobmods.lib.recipe.add_ingredient("robot-drone-frame-large", { "steel-bearing", 10 })
+  bobmods.lib.recipe.add_ingredient("robot-drone-frame", { type = "item", name = "steel-bearing", amount = 10 })
+  bobmods.lib.recipe.add_ingredient("robot-drone-frame-large", { type = "item", name = "steel-bearing", amount = 10 })
 end
diff --git a/bobwarfare/prototypes/recipe/drone.lua b/bobwarfare/prototypes/recipe/drone.lua
index a73f6887c..2d1ec4a72 100644
--- a/bobwarfare/prototypes/recipe/drone.lua
+++ b/bobwarfare/prototypes/recipe/drone.lua
@@ -5,11 +5,11 @@ data:extend({
     enabled = false,
     energy_required = 30,
     ingredients = {
-      { "electric-engine-unit", 2 },
-      { "steel-plate", 10 },
-      { "iron-gear-wheel", 10 },
-      { "battery", 6 },
-      { "electronic-circuit", 10 },
+      { type = "item", name = "electric-engine-unit", amount = 2 },
+      { type = "item", name = "steel-plate", amount = 10 },
+      { type = "item", name = "iron-gear-wheel", amount = 10 },
+      { type = "item", name = "battery", amount = 6 },
+      { type = "item", name = "electronic-circuit", amount = 10 },
     },
     results = { { type = "item", name = "robot-drone-frame", amount = 1 } },
   },
@@ -19,11 +19,11 @@ data:extend({
     enabled = false,
     energy_required = 30,
     ingredients = {
-      { "electric-engine-unit", 2 },
-      { "steel-plate", 20 },
-      { "iron-gear-wheel", 10 },
-      { "battery", 12 },
-      { "electronic-circuit", 10 },
+      { type = "item", name = "electric-engine-unit", amount = 2 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "iron-gear-wheel", amount = 10 },
+      { type = "item", name = "battery", amount = 12 },
+      { type = "item", name = "electronic-circuit", amount = 10 },
     },
     results = { { type = "item", name = "robot-drone-frame-large", amount = 1 } },
   },
@@ -35,8 +35,8 @@ data:extend({
     name = "bob-robot-gun-drone",
     enabled = false,
     ingredients = {
-      { "robot-drone-frame", 1 },
-      { "gun-turret", 1 },
+      { type = "item", name = "robot-drone-frame", amount = 1 },
+      { type = "item", name = "gun-turret", amount = 1 },
     },
     results = { { type = "item", name = "bob-robot-gun-drone", amount = 1 } },
   },
@@ -48,8 +48,8 @@ data:extend({
     name = "bob-robot-laser-drone",
     enabled = false,
     ingredients = {
-      { "robot-drone-frame", 1 },
-      { "laser-turret", 1 },
+      { type = "item", name = "robot-drone-frame", amount = 1 },
+      { type = "item", name = "laser-turret", amount = 1 },
     },
     results = { { type = "item", name = "bob-robot-laser-drone", amount = 1 } },
   },
@@ -61,8 +61,8 @@ data:extend({
     name = "bob-robot-flamethrower-drone",
     enabled = false,
     ingredients = {
-      { "robot-drone-frame", 1 },
-      { "flamethrower-turret", 1 },
+      { type = "item", name = "robot-drone-frame", amount = 1 },
+      { type = "item", name = "flamethrower-turret", amount = 1 },
     },
     results = { { type = "item", name = "bob-robot-flamethrower-drone", amount = 1 } },
   },
@@ -74,8 +74,8 @@ data:extend({
     name = "bob-robot-plasma-drone",
     enabled = false,
     ingredients = {
-      { "robot-drone-frame-large", 1 },
-      { "bob-plasma-turret-1", 1 },
+      { type = "item", name = "robot-drone-frame-large", amount = 1 },
+      { type = "item", name = "bob-plasma-turret-1", amount = 1 },
     },
     results = { { type = "item", name = "bob-robot-plasma-drone", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/recipe/gun-recipe.lua b/bobwarfare/prototypes/recipe/gun-recipe.lua
index 98f5503ae..7501d66fd 100644
--- a/bobwarfare/prototypes/recipe/gun-recipe.lua
+++ b/bobwarfare/prototypes/recipe/gun-recipe.lua
@@ -5,9 +5,9 @@ data:extend({
     enabled = false,
     energy_required = 5,
     ingredients = {
-      { "steel-plate", 10 },
-      { "copper-plate", 5 },
-      { "iron-gear-wheel", 10 },
+      { type = "item", name = "steel-plate", amount = 10 },
+      { type = "item", name = "copper-plate", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 10 },
     },
     results = { { type = "item", name = "rifle", amount = 1 } },
   },
@@ -18,9 +18,9 @@ data:extend({
     enabled = false,
     energy_required = 5,
     ingredients = {
-      { "steel-plate", 10 },
-      { "wood", 10 },
-      { "iron-gear-wheel", 10 },
+      { type = "item", name = "steel-plate", amount = 10 },
+      { type = "item", name = "wood", amount = 10 },
+      { type = "item", name = "iron-gear-wheel", amount = 10 },
     },
     results = { { type = "item", name = "sniper-rifle", amount = 1 } },
   },
@@ -31,10 +31,10 @@ data:extend({
     enabled = false,
     energy_required = 5,
     ingredients = {
-      { "steel-plate", 10 },
-      { "advanced-circuit", 5 },
-      { "iron-gear-wheel", 5 },
-      { "plastic-bar", 3 },
+      { type = "item", name = "steel-plate", amount = 10 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
+      { type = "item", name = "plastic-bar", amount = 3 },
     },
     results = { { type = "item", name = "laser-rifle", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/recipe/mine-recipe.lua b/bobwarfare/prototypes/recipe/mine-recipe.lua
index eec94b341..1aa73555f 100644
--- a/bobwarfare/prototypes/recipe/mine-recipe.lua
+++ b/bobwarfare/prototypes/recipe/mine-recipe.lua
@@ -5,8 +5,8 @@ data:extend({
     enabled = false,
     energy_required = 5,
     ingredients = {
-      { "steel-plate", 1 },
-      { "poison-capsule", 4 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "poison-capsule", amount = 4 },
     },
     results = { { type = "item", name = "poison-mine", amount = 4 } },
   },
@@ -17,8 +17,8 @@ data:extend({
     enabled = false,
     energy_required = 5,
     ingredients = {
-      { "steel-plate", 1 },
-      { "slowdown-capsule", 4 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "slowdown-capsule", amount = 4 },
     },
     results = { { type = "item", name = "slowdown-mine", amount = 4 } },
   },
@@ -29,8 +29,8 @@ data:extend({
     enabled = false,
     energy_required = 3.75,
     ingredients = {
-      { "steel-plate", 1 },
-      { "distractor-capsule", 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "distractor-capsule", amount = 1 },
     },
     results = { { type = "item", name = "distractor-mine", amount = 3 } },
   },
diff --git a/bobwarfare/prototypes/recipe/parts-recipe.lua b/bobwarfare/prototypes/recipe/parts-recipe.lua
index 201aeca30..716ddc78d 100644
--- a/bobwarfare/prototypes/recipe/parts-recipe.lua
+++ b/bobwarfare/prototypes/recipe/parts-recipe.lua
@@ -21,7 +21,7 @@ data:extend({
     enabled = false,
     ingredients = {
       { type = "fluid", name = "sulfuric-acid", amount = 10 },
-      { "wood", 1 },
+      { type = "item", name = "wood", amount = 1 },
     },
     results = { { type = "item", name = "gun-cotton", amount = 1 } },
   },
@@ -35,8 +35,8 @@ data:extend({
     enabled = false,
     ingredients = {
       { type = "fluid", name = "nitroglycerin", amount = 60 },
-      { "gun-cotton", 13 },
-      { "petroleum-jelly", 1 },
+      { type = "item", name = "gun-cotton", amount = 13 },
+      { type = "item", name = "petroleum-jelly", amount = 1 },
     },
     results = { { type = "item", name = "cordite", amount = 5 } },
   },
@@ -48,7 +48,7 @@ data:extend({
     energy_required = 0.5,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
     },
     results = { { type = "item", name = "bullet-casing", amount = 1 } },
   },
@@ -60,7 +60,7 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
     },
     results = { { type = "item", name = "magazine", amount = 2 } },
   },
@@ -72,8 +72,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
-      { "iron-plate", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
+      { type = "item", name = "iron-plate", amount = 1 },
     },
     results = { { type = "item", name = "bullet-projectile", amount = 2 } },
   },
@@ -85,9 +85,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "bullet", amount = 1 } },
   },
@@ -99,8 +99,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
-      { "steel-plate", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
     },
     results = { { type = "item", name = "ap-bullet-projectile", amount = 2 } },
   },
@@ -112,9 +112,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "ap-bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "ap-bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "ap-bullet", amount = 1 } },
   },
@@ -126,8 +126,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
-      { "explosives", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
+      { type = "item", name = "explosives", amount = 1 },
     },
     results = { { type = "item", name = "he-bullet-projectile", amount = 2 } },
   },
@@ -139,9 +139,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "he-bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "he-bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "he-bullet", amount = 1 } },
   },
@@ -154,7 +154,7 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
       { type = "fluid", name = "light-oil", amount = 5 },
       { type = "fluid", name = "heavy-oil", amount = 5 },
     },
@@ -168,9 +168,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "flame-bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "flame-bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "flame-bullet", amount = 1 } },
   },
@@ -183,7 +183,7 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
       { type = "fluid", name = "sulfuric-acid", amount = 10 },
     },
     results = { { type = "item", name = "acid-bullet-projectile", amount = 2 } },
@@ -196,9 +196,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "acid-bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "acid-bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "acid-bullet", amount = 1 } },
   },
@@ -210,8 +210,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
-      { "coal", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
+      { type = "item", name = "coal", amount = 1 },
     },
     results = { { type = "item", name = "poison-bullet-projectile", amount = 2 } },
   },
@@ -223,9 +223,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "poison-bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "poison-bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "poison-bullet", amount = 1 } },
   },
@@ -237,8 +237,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
-      { "steel-plate", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
     },
     results = { { type = "item", name = "electric-bullet-projectile", amount = 2 } },
   },
@@ -250,9 +250,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "electric-bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "electric-bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "electric-bullet", amount = 1 } },
   },
@@ -264,8 +264,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
-      { "uranium-238", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
+      { type = "item", name = "uranium-238", amount = 1 },
     },
     results = { { type = "item", name = "uranium-bullet-projectile", amount = 2 } },
   },
@@ -277,9 +277,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "uranium-bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "uranium-bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "uranium-bullet", amount = 1 } },
   },
@@ -291,7 +291,7 @@ data:extend({
     energy_required = 0.5,
     enabled = false,
     ingredients = {
-      { "copper-plate", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
     },
     results = { { type = "item", name = "shotgun-shell-casing", amount = 1 } },
   },
@@ -303,7 +303,7 @@ data:extend({
     energy_required = 0.5,
     enabled = false,
     ingredients = {
-      { "iron-plate", 1 },
+      { type = "item", name = "iron-plate", amount = 1 },
     },
     results = { { type = "item", name = "shot", amount = 1 } },
   },
@@ -315,7 +315,7 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "plastic-bar", 1 },
+      { type = "item", name = "plastic-bar", amount = 1 },
     },
     results = { { type = "item", name = "laser-rifle-battery-case", amount = 2 } },
   },
@@ -326,7 +326,7 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
     },
     results = { { type = "item", name = "rocket-engine", amount = 1 } },
   },
@@ -337,10 +337,10 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "solid-fuel", 1 },
-      { "rocket-engine", 1 },
-      { "processing-unit", 1 },
-      { "steel-plate", 1 },
+      { type = "item", name = "solid-fuel", amount = 1 },
+      { type = "item", name = "rocket-engine", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
     },
     results = { { type = "item", name = "rocket-body", amount = 1 } },
   },
@@ -351,8 +351,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "explosives", 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "explosives", amount = 1 },
     },
     results = { { type = "item", name = "rocket-warhead", amount = 1 } },
   },
@@ -363,8 +363,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "iron-plate", 2 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "iron-plate", amount = 2 },
     },
     results = { { type = "item", name = "piercing-rocket-warhead", amount = 1 } },
   },
@@ -375,8 +375,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "copper-plate", 2 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "copper-plate", amount = 2 },
     },
     results = { { type = "item", name = "electric-rocket-warhead", amount = 1 } },
   },
@@ -387,8 +387,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "explosives", 2 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "explosives", amount = 2 },
     },
     results = { { type = "item", name = "explosive-rocket-warhead", amount = 1 } },
   },
@@ -400,7 +400,7 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
       { type = "fluid", name = "sulfuric-acid", amount = 20 },
     },
     results = { { type = "item", name = "acid-rocket-warhead", amount = 1 } },
@@ -413,7 +413,7 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
       { type = "fluid", name = "light-oil", amount = 10 },
       { type = "fluid", name = "heavy-oil", amount = 10 },
     },
@@ -427,8 +427,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "coal", 2 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "coal", amount = 2 },
     },
     results = { { type = "item", name = "poison-rocket-warhead", amount = 1 } },
   },
@@ -456,9 +456,9 @@ data:extend({
     energy_required = 0.1,
     enabled = false,
     ingredients = {
-      { "bullet-casing", 1 },
-      { "plasma-bullet-projectile", 1 },
-      { "cordite", 1 },
+      { type = "item", name = "bullet-casing", amount = 1 },
+      { type = "item", name = "plasma-bullet-projectile", amount = 1 },
+      { type = "item", name = "cordite", amount = 1 },
     },
     results = { { type = "item", name = "plasma-bullet", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/recipe/radar-recipe.lua b/bobwarfare/prototypes/recipe/radar-recipe.lua
index a8073654a..21a2b8d59 100644
--- a/bobwarfare/prototypes/recipe/radar-recipe.lua
+++ b/bobwarfare/prototypes/recipe/radar-recipe.lua
@@ -4,10 +4,10 @@ data:extend({
     name = "radar-2",
     enabled = false,
     ingredients = {
-      { "radar", 1 },
-      { "electronic-circuit", 5 },
-      { "iron-gear-wheel", 5 },
-      { "steel-plate", 10 },
+      { type = "item", name = "radar", amount = 1 },
+      { type = "item", name = "electronic-circuit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
+      { type = "item", name = "steel-plate", amount = 10 },
     },
     results = { { type = "item", name = "radar-2", amount = 1 } },
   },
@@ -17,10 +17,10 @@ data:extend({
     name = "radar-3",
     enabled = false,
     ingredients = {
-      { "radar-2", 1 },
-      { "advanced-circuit", 5 },
-      { "iron-gear-wheel", 5 },
-      { "steel-plate", 10 },
+      { type = "item", name = "radar-2", amount = 1 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
+      { type = "item", name = "steel-plate", amount = 10 },
     },
     results = { { type = "item", name = "radar-3", amount = 1 } },
   },
@@ -30,10 +30,10 @@ data:extend({
     name = "radar-4",
     enabled = false,
     ingredients = {
-      { "radar-3", 1 },
-      { "processing-unit", 5 },
-      { "iron-gear-wheel", 5 },
-      { "steel-plate", 10 },
+      { type = "item", name = "radar-3", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
+      { type = "item", name = "steel-plate", amount = 10 },
     },
     results = { { type = "item", name = "radar-4", amount = 1 } },
   },
@@ -43,10 +43,10 @@ data:extend({
     name = "radar-5",
     enabled = false,
     ingredients = {
-      { "radar-4", 1 },
-      { "processing-unit", 5 },
-      { "iron-gear-wheel", 5 },
-      { "steel-plate", 10 },
+      { type = "item", name = "radar-4", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
+      { type = "item", name = "steel-plate", amount = 10 },
     },
     results = { { type = "item", name = "radar-5", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/recipe/recipe-updates.lua b/bobwarfare/prototypes/recipe/recipe-updates.lua
index 58682c1fc..962ad861f 100644
--- a/bobwarfare/prototypes/recipe/recipe-updates.lua
+++ b/bobwarfare/prototypes/recipe/recipe-updates.lua
@@ -27,7 +27,7 @@ end
 
 if data.raw.item["tungsten-plate"] then
   bobmods.lib.recipe.replace_ingredient("rocket-engine", "steel-plate", "tungsten-plate")
-  bobmods.lib.recipe.add_ingredient("rocket-engine", "tungsten-gear-wheel")
+  bobmods.lib.recipe.add_ingredient("rocket-engine", { type = "item", name = "tungsten-gear-wheel", amount = 1 })
   bobmods.lib.tech.add_prerequisite("bob-rocket", "tungsten-processing")
 end
 
@@ -38,8 +38,8 @@ if data.raw.fluid["liquid-fuel"] then
 end
 
 if data.raw.item["glass"] then
-  bobmods.lib.recipe.add_ingredient("sniper-rifle", { "glass", 2 })
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery", { "glass", 1 })
+  bobmods.lib.recipe.add_ingredient("sniper-rifle", { type = "item", name = "glass", amount = 2 })
+  bobmods.lib.recipe.add_ingredient("laser-rifle-battery", { type = "item", name = "glass", amount = 1 })
 end
 
 if data.raw.item["steel-gear-wheel"] then
@@ -58,14 +58,14 @@ elseif data.raw.item["steel-gear-wheel"] then
 end
 
 if data.raw.item["steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("radar-3", { "steel-bearing", 5 })
-  bobmods.lib.recipe.add_ingredient("bob-gun-turret-3", { "steel-bearing", 10 })
+  bobmods.lib.recipe.add_ingredient("radar-3", { type = "item", name = "steel-bearing", amount = 5 })
+  bobmods.lib.recipe.add_ingredient("bob-gun-turret-3", { type = "item", name = "steel-bearing", amount = 10 })
 end
 
 if data.raw.item["cobalt-steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("bob-sniper-turret-2", { "cobalt-steel-bearing", 20 })
+  bobmods.lib.recipe.add_ingredient("bob-sniper-turret-2", { type = "item", name = "cobalt-steel-bearing", amount = 20 })
 elseif data.raw.item["steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("bob-sniper-turret-2", { "steel-bearing", 20 })
+  bobmods.lib.recipe.add_ingredient("bob-sniper-turret-2", { type = "item", name = "steel-bearing", amount = 20 })
 end
 
 if data.raw.item["invar-alloy"] then
@@ -171,9 +171,9 @@ if data.raw.item["titanium-gear-wheel"] then
 end
 
 if data.raw.item["titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient("radar-4", { "titanium-bearing", 5 })
-  bobmods.lib.recipe.add_ingredient("bob-gun-turret-4", { "titanium-bearing", 10 })
-  bobmods.lib.recipe.add_ingredient("bob-tank-2", { "titanium-bearing", 15 })
+  bobmods.lib.recipe.add_ingredient("radar-4", { type = "item", name = "titanium-bearing", amount = 5 })
+  bobmods.lib.recipe.add_ingredient("bob-gun-turret-4", { type = "item", name = "titanium-bearing", amount = 10 })
+  bobmods.lib.recipe.add_ingredient("bob-tank-2", { type = "item", name = "titanium-bearing", amount = 15 })
 end
 
 if data.raw.item["silicon-nitride"] then
@@ -238,41 +238,41 @@ if data.raw.item["nitinol-gear-wheel"] then
 end
 
 if data.raw.item["nitinol-bearing"] then
-  bobmods.lib.recipe.add_ingredient("radar-5", { "nitinol-bearing", 5 })
-  bobmods.lib.recipe.add_ingredient("bob-gun-turret-5", { "nitinol-bearing", 10 })
-  bobmods.lib.recipe.add_ingredient("bob-sniper-turret-3", { "nitinol-bearing", 20 })
-  bobmods.lib.recipe.add_ingredient("bob-tank-3", { "nitinol-bearing", 15 })
+  bobmods.lib.recipe.add_ingredient("radar-5", { type = "item", name = "nitinol-bearing", amount = 5 })
+  bobmods.lib.recipe.add_ingredient("bob-gun-turret-5", { type = "item", name = "nitinol-bearing", amount = 10 })
+  bobmods.lib.recipe.add_ingredient("bob-sniper-turret-3", { type = "item", name = "nitinol-bearing", amount = 20 })
+  bobmods.lib.recipe.add_ingredient("bob-tank-3", { type = "item", name = "nitinol-bearing", amount = 15 })
 end
 
 if data.raw.item["ruby-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-ruby", { "ruby-5", 1 })
+  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-ruby", { type = "item", name = "ruby-5", amount = 1 })
   bobmods.lib.recipe.replace_ingredient("laser-rifle-battery-ruby", "laser-rifle-battery", "laser-rifle-battery-case")
   bobmods.lib.tech.add_prerequisite("bob-laser-rifle-ammo-1", "gem-processing-3")
 end
 
 if data.raw.item["sapphire-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-sapphire", { "sapphire-5", 1 })
+  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-sapphire", { type = "item", name = "sapphire-5", amount = 1 })
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-sapphire",
     "laser-rifle-battery-ruby",
     "laser-rifle-battery-case"
   )
-  bobmods.lib.recipe.add_ingredient("bob-laser-turret-2", { "sapphire-5", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-laser-turret-2", { type = "item", name = "sapphire-5", amount = 1 })
   bobmods.lib.tech.add_prerequisite("bob-laser-turrets-2", "gem-processing-3")
 end
 
 if data.raw.item["emerald-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-emerald", { "emerald-5", 1 })
+  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-emerald", { type = "item", name = "emerald-5", amount = 1 })
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-emerald",
     "laser-rifle-battery-sapphire",
     "laser-rifle-battery-case"
   )
-  bobmods.lib.recipe.add_ingredient("bob-laser-turret-3", { "emerald-5", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-laser-turret-3", { type = "item", name = "emerald-5", amount = 1 })
 end
 
 if data.raw.item["amethyst-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-amethyst", { "amethyst-5", 1 })
+  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-amethyst", { type = "item", name = "amethyst-5", amount = 1 })
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-amethyst",
     "laser-rifle-battery-emerald",
@@ -281,23 +281,23 @@ if data.raw.item["amethyst-5"] then
 end
 
 if data.raw.item["topaz-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-topaz", { "topaz-5", 1 })
+  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-topaz", { type = "item", name = "topaz-5", amount = 1 })
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-topaz",
     "laser-rifle-battery-amethyst",
     "laser-rifle-battery-case"
   )
-  bobmods.lib.recipe.add_ingredient("bob-laser-turret-4", { "topaz-5", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-laser-turret-4", { type = "item", name = "topaz-5", amount = 1 })
 end
 
 if data.raw.item["diamond-5"] then
-  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-diamond", { "diamond-5", 1 })
+  bobmods.lib.recipe.add_ingredient("laser-rifle-battery-diamond", { type = "item", name = "diamond-5", amount = 1 })
   bobmods.lib.recipe.replace_ingredient(
     "laser-rifle-battery-diamond",
     "laser-rifle-battery-topaz",
     "laser-rifle-battery-case"
   )
-  bobmods.lib.recipe.add_ingredient("bob-laser-turret-5", { "diamond-5", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-laser-turret-5", { type = "item", name = "diamond-5", amount = 1 })
 end
 
 if mods["bobmodules"] then
@@ -330,44 +330,44 @@ else
 end
 
 if data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-1", { "alien-artifact", 20 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-2", { "alien-artifact", 30 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-1", { type = "item", name = "alien-artifact", amount = 20 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-2", { type = "item", name = "alien-artifact", amount = 30 })
 end
 
 if data.raw.item["alien-artifact-orange"] and data.raw.item["alien-artifact-blue"] then
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk3", { "alien-artifact-orange", 25 })
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk3", { "alien-artifact-blue", 25 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-3", { "alien-artifact-orange", 10 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-3", { "alien-artifact-blue", 10 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk3", { type = "item", name = "alien-artifact-orange", amount = 25 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk3", { type = "item", name = "alien-artifact-blue", amount = 25 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-3", { type = "item", name = "alien-artifact-orange", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-3", { type = "item", name = "alien-artifact-blue", amount = 10 })
 elseif data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk3", { "alien-artifact", 70 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-3", { "alien-artifact", 40 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk3", { type = "item", name = "alien-artifact", amount = 70 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-3", { type = "item", name = "alien-artifact", amount = 40 })
 else
-  bobmods.lib.recipe.add_ingredient("bob-power-armor-mk3", { "processing-unit", 70 })
+  bobmods.lib.recipe.add_ingredient("bob-power-armor-mk3", { type = "item", name = "processing-unit", amount = 70 })
 end
 
 if data.raw.item["alien-artifact-yellow"] and data.raw.item["alien-artifact-purple"] then
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk4", { "alien-artifact-yellow", 25 })
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk4", { "alien-artifact-purple", 25 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-4", { "alien-artifact-yellow", 10 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-4", { "alien-artifact-purple", 10 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk4", { type = "item", name = "alien-artifact-yellow", amount = 25 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk4", { type = "item", name = "alien-artifact-purple", amount = 25 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-4", { type = "item", name = "alien-artifact-yellow", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-4", { type = "item", name = "alien-artifact-purple", amount = 10 })
 elseif data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk4", { "alien-artifact", 90 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-4", { "alien-artifact", 50 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk4", { type = "item", name = "alien-artifact", amount = 90 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-4", { type = "item", name = "alien-artifact", amount = 50 })
 else
-  bobmods.lib.recipe.add_ingredient("bob-power-armor-mk4", { "processing-unit", 90 })
+  bobmods.lib.recipe.add_ingredient("bob-power-armor-mk4", { type = "item", name = "processing-unit", amount = 90 })
 end
 
 if data.raw.item["alien-artifact-red"] and data.raw.item["alien-artifact-green"] then
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk5", { "alien-artifact-red", 25 })
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk5", { "alien-artifact-green", 25 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-5", { "alien-artifact-red", 10 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-5", { "alien-artifact-green", 10 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk5", { type = "item", name = "alien-artifact-red", amount = 25 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk5", { type = "item", name = "alien-artifact-green", amount = 25 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-5", { type = "item", name = "alien-artifact-red", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-5", { type = "item", name = "alien-artifact-green", amount = 10 })
 elseif data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk5", { "alien-artifact", 120 })
-  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-5", { "alien-artifact", 60 })
+  bobmods.lib.recipe.add_new_ingredient("bob-power-armor-mk5", { type = "item", name = "alien-artifact", amount = 120 })
+  bobmods.lib.recipe.add_new_ingredient("bob-plasma-turret-5", { type = "item", name = "alien-artifact", amount = 60 })
 else
-  bobmods.lib.recipe.add_ingredient("bob-power-armor-mk5", { "processing-unit", 120 })
+  bobmods.lib.recipe.add_ingredient("bob-power-armor-mk5", { type = "item", name = "processing-unit", amount = 120 })
 end
 
 if data.raw.item["alien-blue-alloy"] then
@@ -403,7 +403,7 @@ if data.raw.fluid["alien-explosive"] then
   data.raw.recipe["explosive-rocket-warhead"].category = "crafting-with-fluid"
 
   bobmods.lib.recipe.replace_ingredient("explosive-artillery-shell", "explosives", "alien-explosive")
-  bobmods.lib.recipe.add_new_ingredient("explosive-artillery-shell", { "explosives", 3 })
+  bobmods.lib.recipe.add_new_ingredient("explosive-artillery-shell", { type = "item", name = "explosives", amount = 3 })
   data.raw.recipe["explosive-artillery-shell"].category = "crafting-with-fluid"
   bobmods.lib.tech.add_prerequisite("bob-explosive-artillery-shells", "alien-yellow-research")
 end
@@ -426,17 +426,17 @@ end
 if data.raw.fluid["alien-fire"] then
   bobmods.lib.recipe.remove_ingredient("flame-bullet-projectile", "light-oil")
   bobmods.lib.recipe.remove_ingredient("flame-bullet-projectile", "heavy-oil")
-  bobmods.lib.recipe.add_new_ingredient("flame-bullet-projectile", { "alien-fire", 10 })
+  bobmods.lib.recipe.add_new_ingredient("flame-bullet-projectile", { type = "item", name = "alien-fire", amount = 10 })
   data.raw.recipe["flame-bullet-projectile"].category = "crafting-with-fluid"
 
   bobmods.lib.recipe.remove_ingredient("shotgun-flame-shell", "light-oil")
   bobmods.lib.recipe.remove_ingredient("shotgun-flame-shell", "heavy-oil")
-  bobmods.lib.recipe.add_new_ingredient("shotgun-flame-shell", { "alien-fire", 10 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-flame-shell", { type = "item", name = "alien-fire", amount = 10 })
   data.raw.recipe["shotgun-flame-shell"].category = "crafting-with-fluid"
 
   bobmods.lib.recipe.remove_ingredient("flame-rocket-warhead", "light-oil")
   bobmods.lib.recipe.remove_ingredient("flame-rocket-warhead", "heavy-oil")
-  bobmods.lib.recipe.add_new_ingredient("flame-rocket-warhead", { "alien-fire", 20 })
+  bobmods.lib.recipe.add_new_ingredient("flame-rocket-warhead", { type = "item", name = "alien-fire", amount = 20 })
   data.raw.recipe["flame-rocket-warhead"].category = "crafting-with-fluid"
 
   bobmods.lib.recipe.replace_ingredient("fire-artillery-shell", "light-oil", "alien-fire")
@@ -447,7 +447,7 @@ end
 
 if data.raw.item["distractor-robot"] then
   bobmods.lib.recipe.remove_ingredient("distractor-artillery-shell", "distractor-capsule")
-  bobmods.lib.recipe.add_ingredient("distractor-artillery-shell", { "distractor-robot", 15 })
+  bobmods.lib.recipe.add_ingredient("distractor-artillery-shell", { type = "item", name = "distractor-robot", amount = 15 })
 end
 
 if
@@ -458,76 +458,76 @@ if
   and data.raw.item["alien-artifact-red"]
   and data.raw.item["alien-artifact-green"]
 then
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "alien-artifact-orange", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "alien-artifact-blue", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "alien-artifact-yellow", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "alien-artifact-purple", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "alien-artifact-red", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "alien-artifact-green", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "copper-plate", 6 })
-
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "alien-artifact-orange", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "alien-artifact-blue", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "alien-artifact-yellow", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "alien-artifact-purple", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "alien-artifact-red", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "alien-artifact-green", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "shotgun-shell-casing", 6 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "cordite", 6 })
-
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "alien-artifact-orange", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "alien-artifact-blue", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "alien-artifact-yellow", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "alien-artifact-purple", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "alien-artifact-red", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "alien-artifact-green", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "steel-plate", 6 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "alien-artifact-orange", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "alien-artifact-blue", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "alien-artifact-yellow", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "alien-artifact-purple", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "alien-artifact-red", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "alien-artifact-green", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "copper-plate", amount = 6 })
+
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "alien-artifact-orange", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "alien-artifact-blue", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "alien-artifact-yellow", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "alien-artifact-purple", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "alien-artifact-red", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "alien-artifact-green", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "shotgun-shell-casing", amount = 6 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "cordite", amount = 6 })
+
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "alien-artifact-orange", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "alien-artifact-blue", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "alien-artifact-yellow", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "alien-artifact-purple", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "alien-artifact-red", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "alien-artifact-green", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "steel-plate", amount = 6 })
 elseif data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "alien-artifact", 10 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "copper-plate", 6 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "alien-artifact", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "copper-plate", amount = 6 })
 
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "alien-artifact", 10 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "shotgun-shell-casing", 6 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "cordite", 6 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "alien-artifact", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "shotgun-shell-casing", amount = 6 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "cordite", amount = 6 })
 
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "alien-artifact", 10 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "steel-plate", 6 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "alien-artifact", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "steel-plate", amount = 6 })
 else
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "electric-bullet-projectile", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "ap-bullet-projectile", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "he-bullet-projectile", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "acid-bullet-projectile", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "flame-bullet-projectile", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "poison-bullet-projectile", 1 })
-
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "shotgun-electric-shell", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "shotgun-ap-shell", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "shotgun-explosive-shell", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "shotgun-acid-shell", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "shotgun-flame-shell", 1 })
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "shotgun-poison-shell", 1 })
-
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "electric-rocket-warhead", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "piercing-rocket-warhead", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "explosive-rocket-warhead", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "acid-rocket-warhead", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "flame-rocket-warhead", 1 })
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "poison-rocket-warhead", 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "electric-bullet-projectile", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "ap-bullet-projectile", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "he-bullet-projectile", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "acid-bullet-projectile", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "flame-bullet-projectile", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "poison-bullet-projectile", amount = 1 })
+
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "shotgun-electric-shell", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "shotgun-ap-shell", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "shotgun-explosive-shell", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "shotgun-acid-shell", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "shotgun-flame-shell", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "shotgun-poison-shell", amount = 1 })
+
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "electric-rocket-warhead", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "piercing-rocket-warhead", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "explosive-rocket-warhead", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "acid-rocket-warhead", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "flame-rocket-warhead", amount = 1 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "poison-rocket-warhead", amount = 1 })
 end
 
 bobmods.lib.recipe.remove_ingredient("artillery-shell", "radar")
-bobmods.lib.recipe.set_ingredient("artillery-shell", { "explosive-cannon-shell", 3 })
+bobmods.lib.recipe.set_ingredient("artillery-shell", { type = "item", name = "explosive-cannon-shell", amount = 3 })
 
 if data.raw.fluid.deuterium then
-  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { "deuterium", 10 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-bullet-projectile", { type = "item", name = "deuterium", amount = 10 })
   data.raw.recipe["plasma-bullet-projectile"].category = "crafting-with-fluid"
   bobmods.lib.tech.add_prerequisite("bob-plasma-bullets", "deuterium-processing")
 
-  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { "deuterium", 10 })
+  bobmods.lib.recipe.add_new_ingredient("shotgun-plasma-shell", { type = "item", name = "deuterium", amount = 10 })
   data.raw.recipe["shotgun-plasma-shell"].category = "crafting-with-fluid"
   bobmods.lib.tech.add_prerequisite("bob-shotgun-plasma-shells", "deuterium-processing")
 
-  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { "deuterium", 10 })
+  bobmods.lib.recipe.add_new_ingredient("plasma-rocket-warhead", { type = "item", name = "deuterium", amount = 10 })
   data.raw.recipe["plasma-rocket-warhead"].category = "crafting-with-fluid"
   bobmods.lib.tech.add_prerequisite("bob-plasma-rocket", "deuterium-processing")
 end
@@ -538,11 +538,11 @@ bobmods.lib.recipe.enabled("radar", false)
 bobmods.lib.recipe.replace_ingredient("modular-armor", "advanced-circuit", "electronic-circuit")
 
 bobmods.lib.recipe.replace_ingredient("power-armor", "processing-unit", "advanced-circuit")
-bobmods.lib.recipe.add_ingredient("power-armor", { "modular-armor", 1 })
+bobmods.lib.recipe.add_ingredient("power-armor", { type = "item", name = "modular-armor", amount = 1 })
 -- By default, electric engines are Blue Science
 if (not mods["bobplates"]) and not mods["boblogistics"] then
   bobmods.lib.recipe.remove_ingredient("power-armor", "electric-engine-unit")
 end
 
 bobmods.lib.recipe.replace_ingredient("power-armor-mk2", "processing-unit", "advanced-circuit")
-bobmods.lib.recipe.add_ingredient("power-armor-mk2", { "power-armor", 1 })
+bobmods.lib.recipe.add_ingredient("power-armor-mk2", { type = "item", name = "power-armor", amount = 1 })
diff --git a/bobwarfare/prototypes/recipe/tank.lua b/bobwarfare/prototypes/recipe/tank.lua
index cf3bae8c2..5f5b90db5 100644
--- a/bobwarfare/prototypes/recipe/tank.lua
+++ b/bobwarfare/prototypes/recipe/tank.lua
@@ -4,11 +4,11 @@ data:extend({
     name = "bob-tank-2",
     enabled = false,
     ingredients = {
-      { "tank", 1 },
-      --      {"engine-unit", 16},
-      { "steel-plate", 50 },
-      { "iron-gear-wheel", 15 },
-      { "processing-unit", 5 },
+      { type = "item", name = "tank", amount = 1 },
+      --      { type = "item", name = "engine-unit", amount = 16 },
+      { type = "item", name = "steel-plate", amount = 50 },
+      { type = "item", name = "iron-gear-wheel", amount = 15 },
+      { type = "item", name = "processing-unit",amount =  5 },
     },
     results = { { type = "item", name = "bob-tank-2", amount = 1 } },
   },
@@ -18,12 +18,12 @@ data:extend({
     name = "bob-tank-3",
     enabled = false,
     ingredients = {
-      { "bob-tank-2", 1 },
-      --      {"engine-unit", 16},
-      { "steel-plate", 40 },
-      { "plastic-bar", 40 },
-      { "iron-gear-wheel", 15 },
-      { "processing-unit", 5 },
+      { type = "item", name = "bob-tank-2", amount = 1 },
+      --      { type = "item", name = "engine-unit", amount = 16 },
+      { type = "item", name = "steel-plate", amount = 40 },
+      { type = "item", name = "plastic-bar", amount = 40 },
+      { type = "item", name = "iron-gear-wheel", amount = 15 },
+      { type = "item", name = "processing-unit", amount = 5 },
     },
     results = { { type = "item", name = "bob-tank-3", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/recipe/turrets.lua b/bobwarfare/prototypes/recipe/turrets.lua
index 9520363f2..c7420ccd6 100644
--- a/bobwarfare/prototypes/recipe/turrets.lua
+++ b/bobwarfare/prototypes/recipe/turrets.lua
@@ -5,9 +5,9 @@ data:extend({
     enabled = false,
     energy_required = 5,
     ingredients = {
-      { "gun-turret", 1 },
-      { "iron-gear-wheel", 10 },
-      { "steel-plate", 20 },
+      { type = "item", name = "gun-turret", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 10 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "bob-gun-turret-2", amount = 1 } },
   },
@@ -17,9 +17,9 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "bob-gun-turret-2", 1 },
-      { "iron-gear-wheel", 10 },
-      { "steel-plate", 20 },
+      { type = "item", name = "bob-gun-turret-2", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 10 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "bob-gun-turret-3", amount = 1 } },
   },
@@ -29,9 +29,9 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "bob-gun-turret-3", 1 },
-      { "iron-gear-wheel", 10 },
-      { "steel-plate", 20 },
+      { type = "item", name = "bob-gun-turret-3", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 10 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "bob-gun-turret-4", amount = 1 } },
   },
@@ -41,9 +41,9 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "bob-gun-turret-4", 1 },
-      { "iron-gear-wheel", 10 },
-      { "steel-plate", 20 },
+      { type = "item", name = "bob-gun-turret-4", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 10 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "bob-gun-turret-5", amount = 1 } },
   },
@@ -54,9 +54,9 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "iron-gear-wheel", 20 },
-      { "copper-plate", 20 },
-      { "iron-plate", 20 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
+      { type = "item", name = "copper-plate", amount = 20 },
+      { type = "item", name = "iron-plate", amount = 20 },
     },
     results = { { type = "item", name = "bob-sniper-turret-1", amount = 1 } },
   },
@@ -66,10 +66,10 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-sniper-turret-1", 1 },
-      { "iron-gear-wheel", 20 },
-      { "steel-plate", 20 },
-      { "iron-plate", 20 },
+      { type = "item", name = "bob-sniper-turret-1", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "iron-plate", amount = 20 },
     },
     results = { { type = "item", name = "bob-sniper-turret-2", amount = 1 } },
   },
@@ -79,10 +79,10 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-sniper-turret-2", 1 },
-      { "iron-gear-wheel", 20 },
-      { "steel-plate", 20 },
-      { "plastic-bar", 20 },
+      { type = "item", name = "bob-sniper-turret-2", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "plastic-bar", amount = 20 },
     },
     results = { { type = "item", name = "bob-sniper-turret-3", amount = 1 } },
   },
@@ -93,9 +93,9 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "laser-turret", 1 },
-      { "steel-plate", 20 },
-      { "advanced-circuit", 20 },
+      { type = "item", name = "laser-turret", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "advanced-circuit", amount = 20 },
     },
     results = { { type = "item", name = "bob-laser-turret-2", amount = 1 } },
   },
@@ -105,9 +105,9 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-laser-turret-2", 1 },
-      { "steel-plate", 20 },
-      { "battery", 12 },
+      { type = "item", name = "bob-laser-turret-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "battery", amount = 12 },
     },
     results = { { type = "item", name = "bob-laser-turret-3", amount = 1 } },
   },
@@ -117,10 +117,10 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-laser-turret-3", 1 },
-      { "steel-plate", 20 },
-      { "processing-unit", 20 },
-      { "battery", 12 },
+      { type = "item", name = "bob-laser-turret-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "processing-unit", amount = 20 },
+      { type = "item", name = "battery", amount = 12 },
     },
     results = { { type = "item", name = "bob-laser-turret-4", amount = 1 } },
   },
@@ -130,10 +130,10 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-laser-turret-4", 1 },
-      { "steel-plate", 20 },
-      { "processing-unit", 20 },
-      { "battery", 12 },
+      { type = "item", name = "bob-laser-turret-4", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "processing-unit", amount = 20 },
+      { type = "item", name = "battery", amount = 12 },
     },
     results = { { type = "item", name = "bob-laser-turret-5", amount = 1 } },
   },
@@ -144,9 +144,9 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "steel-plate", 80 },
-      { "electronic-circuit", 80 },
-      { "battery", 48 },
+      { type = "item", name = "steel-plate", amount = 80 },
+      { type = "item", name = "electronic-circuit", amount = 80 },
+      { type = "item", name = "battery", amount = 48 },
     },
     results = { { type = "item", name = "bob-plasma-turret-1", amount = 1 } },
   },
@@ -156,10 +156,10 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-plasma-turret-1", 1 },
-      { "steel-plate", 80 },
-      { "advanced-circuit", 80 },
-      { "battery", 48 },
+      { type = "item", name = "bob-plasma-turret-1", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 80 },
+      { type = "item", name = "advanced-circuit", amount = 80 },
+      { type = "item", name = "battery", amount = 48 },
     },
     results = { { type = "item", name = "bob-plasma-turret-2", amount = 1 } },
   },
@@ -169,10 +169,10 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-plasma-turret-2", 1 },
-      { "steel-plate", 80 },
-      { "advanced-circuit", 80 },
-      { "battery", 48 },
+      { type = "item", name = "bob-plasma-turret-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 80 },
+      { type = "item", name = "advanced-circuit", amount = 80 },
+      { type = "item", name = "battery", amount = 48 },
     },
     results = { { type = "item", name = "bob-plasma-turret-3", amount = 1 } },
   },
@@ -182,10 +182,10 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-plasma-turret-3", 1 },
-      { "steel-plate", 80 },
-      { "processing-unit", 80 },
-      { "battery", 48 },
+      { type = "item", name = "bob-plasma-turret-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 80 },
+      { type = "item", name = "processing-unit", amount = 80 },
+      { type = "item", name = "battery", amount = 48 },
     },
     results = { { type = "item", name = "bob-plasma-turret-4", amount = 1 } },
   },
@@ -195,10 +195,10 @@ data:extend({
     enabled = false,
     energy_required = 20,
     ingredients = {
-      { "bob-plasma-turret-4", 1 },
-      { "steel-plate", 80 },
-      { "processing-unit", 80 },
-      { "battery", 48 },
+      { type = "item", name = "bob-plasma-turret-4", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 80 },
+      { type = "item", name = "processing-unit", amount = 80 },
+      { type = "item", name = "battery", amount = 48 },
     },
     results = { { type = "item", name = "bob-plasma-turret-5", amount = 1 } },
   },
@@ -209,11 +209,11 @@ data:extend({
     enabled = false,
     energy_required = 40,
     ingredients = {
-      { "artillery-turret", 1 },
-      { "steel-plate", 60 }, --titanium plate
-      { "concrete", 60 }, --silicon nitride
-      { "iron-gear-wheel", 40 }, --titanium gear wheel
-      { "processing-unit", 20 },
+      { type = "item", name = "artillery-turret", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 60 }, --titanium plate
+      { type = "item", name = "concrete", amount = 60 }, --silicon nitride
+      { type = "item", name = "iron-gear-wheel", amount = 40 }, --titanium gear wheel
+      { type = "item", name = "processing-unit", amount = 20 },
     },
     results = { { type = "item", name = "bob-artillery-turret-2", amount = 1 } },
   },
@@ -223,11 +223,11 @@ data:extend({
     enabled = false,
     energy_required = 40,
     ingredients = {
-      { "bob-artillery-turret-2", 1 },
-      { "steel-plate", 60 }, --nitinol alloy
-      { "concrete", 60 }, --tungsten carbide
-      { "iron-gear-wheel", 40 }, --nitinol gear wheel
-      { "processing-unit", 20 }, --advanced processing unit
+      { type = "item", name = "bob-artillery-turret-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 60 }, --nitinol alloy
+      { type = "item", name = "concrete", amount = 60 }, --tungsten carbide
+      { type = "item", name = "iron-gear-wheel", amount = 40 }, --nitinol gear wheel
+      { type = "item", name = "processing-unit", amount = 20 }, --advanced processing unit
     },
     results = { { type = "item", name = "bob-artillery-turret-3", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/recipe/wall.lua b/bobwarfare/prototypes/recipe/wall.lua
index 92cacbeb7..6083467b6 100644
--- a/bobwarfare/prototypes/recipe/wall.lua
+++ b/bobwarfare/prototypes/recipe/wall.lua
@@ -4,8 +4,8 @@ data:extend({
     name = "reinforced-wall",
     enabled = false,
     ingredients = {
-      { "stone-brick", 3 },
-      { "steel-plate", 3 },
+      { type = "item", name = "stone-brick", amount = 3 },
+      { type = "item", name = "steel-plate", amount = 3 },
     },
     results = { { type = "item", name = "reinforced-wall", amount = 1 } },
   },
@@ -14,9 +14,9 @@ data:extend({
     name = "reinforced-gate",
     enabled = false,
     ingredients = {
-      { "reinforced-wall", 1 },
-      { "steel-plate", 2 },
-      { "electronic-circuit", 2 },
+      { type = "item", name = "reinforced-wall", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "electronic-circuit", amount = 2 },
     },
     results = { { type = "item", name = "reinforced-gate", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/robot-parts.lua b/bobwarfare/prototypes/robot-parts.lua
index a6db46383..de42d43d0 100644
--- a/bobwarfare/prototypes/robot-parts.lua
+++ b/bobwarfare/prototypes/robot-parts.lua
@@ -88,7 +88,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electronic-circuit", 2 },
+        { type = "item", name = "electronic-circuit", amount = 2 },
       },
       results = { { type = "item", name = "robot-brain-combat", amount = 1 } },
     },
@@ -99,8 +99,8 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "electronic-circuit", 1 },
-        { "advanced-circuit", 1 },
+        { type = "item", name = "electronic-circuit", amount = 1 },
+        { type = "item", name = "advanced-circuit", amount = 1 },
       },
       results = { { type = "item", name = "robot-brain-combat-2", amount = 1 } },
     },
@@ -111,8 +111,8 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war
       energy_required = 15,
       enabled = false,
       ingredients = {
-        { "advanced-circuit", 1 },
-        { "processing-unit", 1 },
+        { type = "item", name = "advanced-circuit", amount = 1 },
+        { type = "item", name = "processing-unit", amount = 1 },
       },
       results = { { type = "item", name = "robot-brain-combat-3", amount = 1 } },
     },
@@ -123,7 +123,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war
       energy_required = 20,
       enabled = false,
       ingredients = {
-        { "processing-unit", 2 },
+        { type = "item", name = "processing-unit", amount = 2 },
       },
       results = { { type = "item", name = "robot-brain-combat-4", amount = 1 } },
     },
diff --git a/bobwarfare/prototypes/robots-updates.lua b/bobwarfare/prototypes/robots-updates.lua
index df860486e..9ba8ffa6f 100644
--- a/bobwarfare/prototypes/robots-updates.lua
+++ b/bobwarfare/prototypes/robots-updates.lua
@@ -1,9 +1,9 @@
 if settings.startup["bobmods-warfare-robotupdate"].value == true then
-  data.raw.recipe["defender-capsule"].ingredients = { { "defender-robot", 1 } }
+  data.raw.recipe["defender-capsule"].ingredients = { { type = "item", name = "defender-robot", amount = 1 } }
   data.raw.recipe["defender-capsule"].energy_required = 1
-  data.raw.recipe["distractor-capsule"].ingredients = { { "distractor-robot", 3 } }
+  data.raw.recipe["distractor-capsule"].ingredients = { { type = "item", name = "distractor-robot", amount = 3 } }
   data.raw.recipe["distractor-capsule"].energy_required = 1
-  data.raw.recipe["destroyer-capsule"].ingredients = { { "destroyer-robot", 5 } }
+  data.raw.recipe["destroyer-capsule"].ingredients = { { type = "item", name = "destroyer-robot", amount = 5 } }
   data.raw.recipe["destroyer-capsule"].energy_required = 1
 
   bobmods.lib.tech.add_recipe_unlock("defender", "defender-robot")
@@ -11,84 +11,84 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
   bobmods.lib.tech.add_recipe_unlock("destroyer", "destroyer-robot")
 
   if bobmods.warfare.RobotRequirePrevious == true then
-    bobmods.lib.recipe.add_ingredient("distractor-robot", { "defender-robot", 1 })
-    bobmods.lib.recipe.add_ingredient("destroyer-robot", { "distractor-robot", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "destroyer-robot", 1 })
+    bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "defender-robot", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "distractor-robot", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "destroyer-robot", amount = 1 })
   end
 
   if bobmods.warfare.FlyingRobotFrames == true then
-    bobmods.lib.recipe.add_ingredient("defender-robot", { "flying-robot-frame", 1 })
+    bobmods.lib.recipe.add_ingredient("defender-robot", { type = "item", name = "flying-robot-frame", amount = 1 })
     bobmods.lib.tech.add_prerequisite("defender", "robotics")
 
     if data.raw.item["flying-robot-frame-2"] then
-      bobmods.lib.recipe.add_ingredient("distractor-robot", { "flying-robot-frame-2", 1 })
+      bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "flying-robot-frame-2", amount = 1 })
       bobmods.lib.tech.add_prerequisite("distractor", "bob-robotics-2")
     else
       bobmods.lib.recipe.add_ingredient("distractor-robot", { "flying-robot-frame", 1 })
     end
 
     if data.raw.item["flying-robot-frame-3"] then
-      bobmods.lib.recipe.add_ingredient("destroyer-robot", { "flying-robot-frame-3", 1 })
+      bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "flying-robot-frame-3", amount = 1 })
       bobmods.lib.tech.add_prerequisite("destroyer", "bob-robotics-3")
     else
-      bobmods.lib.recipe.add_ingredient("destroyer-robot", { "flying-robot-frame", 1 })
+      bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "flying-robot-frame", amount = 1 })
     end
 
     if data.raw.item["flying-robot-frame-4"] then
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "flying-robot-frame-4", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "flying-robot-frame-4", amount = 1 })
       bobmods.lib.tech.add_prerequisite("bob-laser-robot", "bob-robotics-4")
     else
       bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "flying-robot-frame", 1 })
     end
   else
-    bobmods.lib.recipe.add_ingredient("defender-robot", { "steel-plate", 1 })
-    bobmods.lib.recipe.add_ingredient("defender-robot", { "electronic-circuit", 1 })
-    bobmods.lib.recipe.add_ingredient("defender-robot", { "iron-gear-wheel", 3 })
+    bobmods.lib.recipe.add_ingredient("defender-robot", { type = "item", name = "steel-plate", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("defender-robot", { type = "item", name = "electronic-circuit", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("defender-robot", { type = "item", name = "iron-gear-wheel", amount = 3 })
 
     if data.raw.item["aluminium-plate"] then
-      bobmods.lib.recipe.add_ingredient("distractor-robot", { "aluminium-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "aluminium-plate", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient("distractor-robot", { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "steel-plate", amount = 1 })
     end
-    bobmods.lib.recipe.add_ingredient("distractor-robot", { "advanced-circuit", 1 })
+    bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "advanced-circuit", amount = 1 })
     if data.raw.item["brass-gear-wheel"] then
-      bobmods.lib.recipe.add_ingredient("distractor-robot", { "brass-gear-wheel", 3 })
+      bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "brass-gear-wheel", amount = 3 })
       bobmods.lib.tech.add_prerequisite("distractor", "zinc-processing")
     else
-      bobmods.lib.recipe.add_ingredient("distractor-robot", { "iron-gear-wheel", 3 })
+      bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "iron-gear-wheel", amount = 3 })
     end
 
     if data.raw.item["titanium-plate"] then
-      bobmods.lib.recipe.add_ingredient("destroyer-robot", { "titanium-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "titanium-plate", amount = 1 })
       bobmods.lib.tech.add_prerequisite("destroyer", "titanium-processing")
     else
-      bobmods.lib.recipe.add_ingredient("destroyer-robot", { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "steel-plate", amount = 1 })
     end
-    bobmods.lib.recipe.add_ingredient("destroyer-robot", { "processing-unit", 1 })
+    bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "processing-unit", amount = 1 })
     bobmods.lib.tech.add_prerequisite("destroyer", "advanced-electronics-2")
     if data.raw.item["titanium-gear-wheel"] then
-      bobmods.lib.recipe.add_ingredient("destroyer-robot", { "titanium-gear-wheel", 3 })
+      bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "titanium-gear-wheel", amount = 3 })
     else
-      bobmods.lib.recipe.add_ingredient("destroyer-robot", { "iron-gear-wheel", 3 })
+      bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "iron-gear-wheel", amount = 3 })
     end
 
     if data.raw.item["silicon-nitride"] then
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "silicon-nitride", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "silicon-nitride", amount = 1 })
       bobmods.lib.tech.add_prerequisite("bob-laser-robot", "ceramics")
     else
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "steel-plate", amount = 1 })
     end
     if data.raw.item["advanced-processing-unit"] then
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "advanced-processing-unit", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "advanced-processing-unit", amount = 1 })
       bobmods.lib.tech.add_prerequisite("bob-laser-robot", "advanced-electronics-3")
     else
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "processing-unit", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "processing-unit", amount = 1 })
     end
     if data.raw.item["nitinol-gear-wheel"] then
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "nitinol-gear-wheel", 3 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "nitinol-gear-wheel", amount = 3 })
       bobmods.lib.tech.add_prerequisite("bob-laser-robot", "nitinol-processing")
     else
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "iron-gear-wheel", 3 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "iron-gear-wheel", amount = 3 })
     end
   end
 
@@ -97,7 +97,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
       data.raw.recipe["robot-brain-combat"].category = "electronics"
     end
     if data.raw.item["solder"] then
-      bobmods.lib.recipe.add_ingredient("robot-brain-combat", { "solder", 5 })
+      bobmods.lib.recipe.add_ingredient("robot-brain-combat", { type = "item", name = "solder", amount = 5 })
     end
   end
 
@@ -106,7 +106,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
       data.raw.recipe["robot-brain-combat-2"].category = "electronics"
     end
     if data.raw.item["solder"] then
-      bobmods.lib.recipe.add_ingredient("robot-brain-combat-2", { "solder", 5 })
+      bobmods.lib.recipe.add_ingredient("robot-brain-combat-2", { type = "item", name = "solder", amount = 5 })
     end
   end
 
@@ -115,7 +115,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
       data.raw.recipe["robot-brain-combat-3"].category = "electronics"
     end
     if data.raw.item["solder"] then
-      bobmods.lib.recipe.add_ingredient("robot-brain-combat-3", { "solder", 5 })
+      bobmods.lib.recipe.add_ingredient("robot-brain-combat-3", { type = "item", name = "solder", amount = 5 })
     end
   end
 
@@ -124,146 +124,146 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
       data.raw.recipe["robot-brain-combat-4"].category = "electronics"
     end
     if data.raw.item["solder"] then
-      bobmods.lib.recipe.add_ingredient("robot-brain-combat-4", { "solder", 5 })
+      bobmods.lib.recipe.add_ingredient("robot-brain-combat-4", { type = "item", name = "solder", amount = 5 })
     end
     if data.raw.item["advanced-processing-unit"] then
-      bobmods.lib.recipe.set_ingredient("robot-brain-combat-4", { "processing-unit", 1 })
-      bobmods.lib.recipe.add_ingredient("robot-brain-combat-4", { "advanced-processing-unit", 1 })
+      bobmods.lib.recipe.set_ingredient("robot-brain-combat-4", { type = "item", name = "processing-unit", amount = 1 })
+      bobmods.lib.recipe.add_ingredient("robot-brain-combat-4", { type = "item", name = "advanced-processing-unit", amount = 1 })
     end
   end
 
   if data.raw.recipe["robot-brain-combat"] then
     bobmods.lib.tech.add_recipe_unlock("defender", "robot-brain-combat")
-    bobmods.lib.recipe.add_ingredient("defender-robot", { "robot-brain-combat", 1 })
+    bobmods.lib.recipe.add_ingredient("defender-robot", { type = "item", name = "robot-brain-combat", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("defender-robot", { "electronic-circuit", 1 })
+    bobmods.lib.recipe.add_ingredient("defender-robot", { type = "item", name = "electronic-circuit", amount = 1 })
   end
   if data.raw.recipe["robot-brain-combat-2"] then
     bobmods.lib.tech.add_recipe_unlock("distractor", "robot-brain-combat-2")
-    bobmods.lib.recipe.add_ingredient("distractor-robot", { "robot-brain-combat-2", 1 })
+    bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "robot-brain-combat-2", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("distractor-robot", { "advanced-circuit", 1 })
+    bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "advanced-circuit", amount = 1 })
   end
   if data.raw.recipe["robot-brain-combat-3"] then
     bobmods.lib.tech.add_recipe_unlock("destroyer", "robot-brain-combat-3")
-    bobmods.lib.recipe.add_ingredient("destroyer-robot", { "robot-brain-combat-3", 1 })
+    bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "robot-brain-combat-3", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("destroyer-robot", { "processing-unit", 1 })
+    bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "processing-unit", amount = 1 })
   end
   if data.raw.recipe["robot-brain-combat-4"] then
     bobmods.lib.tech.add_recipe_unlock("bob-laser-robot", "robot-brain-combat-4")
-    bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "robot-brain-combat-4", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "robot-brain-combat-4", amount = 1 })
   else
     if data.raw.item["advanced-processing-unit"] then
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "advanced-processing-unit", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "advanced-processing-unit", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "processing-unit", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "processing-unit", amount = 1 })
     end
   end
 
   if data.raw.recipe["robot-tool-combat"] then
-    bobmods.lib.recipe.add_ingredient("robot-tool-combat", { "steel-plate", 1 })
+    bobmods.lib.recipe.add_ingredient("robot-tool-combat", { type = "item", name = "steel-plate", amount = 1 })
     if data.raw.item["steel-gear-wheel"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat", { "steel-gear-wheel", 5 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat", { type = "item", name = "steel-gear-wheel", amount = 5 })
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat", { "iron-gear-wheel", 5 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat", { type = "item", name = "iron-gear-wheel", amount = 5 })
     end
   end
 
   if data.raw.recipe["robot-tool-combat-2"] then
     if data.raw.item["brass-alloy"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { "brass-alloy", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { type = "item", name = "brass-alloy", amount = 1 })
       bobmods.lib.tech.add_prerequisite("distractor", "zinc-processing")
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { type = "item", name = "steel-plate", amount = 1 })
     end
 
     if data.raw.item["brass-gear-wheel"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { "brass-gear-wheel", 2 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { type = "item", name = "brass-gear-wheel", amount = 2 })
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { "iron-gear-wheel", 2 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { type = "item", name = "iron-gear-wheel", amount = 2 })
     end
 
-    bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { "battery", 1 })
+    bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { type = "item", name = "battery", amount = 1 })
 
     if data.raw.item["glass"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { "glass", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-2", { type = "item", name = "glass", amount = 1 })
     end
   end
 
   if data.raw.recipe["robot-tool-combat-3"] then
     if data.raw.item["titanium-plate"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { "titanium-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "titanium-plate", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "steel-plate", amount = 1 })
     end
     if data.raw.item["titanium-gear-wheel"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { "titanium-gear-wheel", 2 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "titanium-gear-wheel", amount = 2 })
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { "iron-gear-wheel", 2 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "iron-gear-wheel", amount = 2 })
     end
     if data.raw.item["lithium-ion-battery"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { "lithium-ion-battery", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "lithium-ion-battery", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { "battery", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "battery", amount = 1 })
     end
 
     if data.raw.item["emerald-5"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { "emerald-5", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-3", { type = "item", name = "emerald-5", amount = 1 })
       bobmods.lib.tech.add_prerequisite("destroyer", "gem-processing-3")
     end
   end
 
   if data.raw.recipe["robot-tool-combat-4"] then
     if data.raw.item["silicon-nitride"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { "silicon-nitride", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { type = "item", name = "silicon-nitride", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { type = "item", name = "steel-plate", amount = 1 })
     end
     if data.raw.item["nitinol-gear-wheel"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { "nitinol-gear-wheel", 2 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { type = "item", name = "nitinol-gear-wheel", amount = 2 })
       bobmods.lib.tech.add_prerequisite("bob-laser-robot", "nitinol-processing")
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { "iron-gear-wheel", 2 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { type = "item", name = "iron-gear-wheel", amount = 2 })
     end
     if data.raw.item["silver-zinc-battery"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { "silver-zinc-battery", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { type = "item", name = "silver-zinc-battery", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { "battery", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { type = "item", name = "battery", amount = 1 })
     end
     if data.raw.item["diamond-5"] then
-      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { "diamond-5", 1 })
+      bobmods.lib.recipe.add_ingredient("robot-tool-combat-4", { type = "item", name = "diamond-5", amount = 1 })
     end
   end
 
   if data.raw.recipe["robot-tool-combat"] then
     bobmods.lib.tech.add_recipe_unlock("defender", "robot-tool-combat")
-    bobmods.lib.recipe.add_ingredient("defender-robot", { "robot-tool-combat", 1 })
+    bobmods.lib.recipe.add_ingredient("defender-robot", { type = "item", name = "robot-tool-combat", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("defender-robot", { "piercing-rounds-magazine", 1 })
+    bobmods.lib.recipe.add_ingredient("defender-robot", { type = "item", name = "piercing-rounds-magazine", amount = 1 })
   end
 
   if data.raw.recipe["robot-tool-combat-2"] then
     bobmods.lib.tech.add_recipe_unlock("distractor", "robot-tool-combat-2")
-    bobmods.lib.recipe.add_ingredient("distractor-robot", { "robot-tool-combat-2", 1 })
+    bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "robot-tool-combat-2", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("distractor-robot", { "laser-rifle-battery", 1 })
+    bobmods.lib.recipe.add_ingredient("distractor-robot", { type = "item", name = "laser-rifle-battery", amount = 1 })
     bobmods.lib.tech.add_prerequisite("distractor", "bob-laser-rifle")
   end
 
   if data.raw.recipe["robot-tool-combat-3"] then
     bobmods.lib.tech.add_recipe_unlock("destroyer", "robot-tool-combat-3")
-    bobmods.lib.recipe.add_ingredient("destroyer-robot", { "robot-tool-combat-3", 1 })
+    bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "robot-tool-combat-3", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("destroyer-robot", { "laser-rifle-battery-emerald", 1 })
+    bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "laser-rifle-battery-emerald", amount = 1 })
     bobmods.lib.tech.add_prerequisite("destroyer", "bob-laser-rifle-ammo-3")
   end
 
   if data.raw.recipe["robot-tool-combat-4"] then
     bobmods.lib.tech.add_recipe_unlock("bob-laser-robot", "robot-tool-combat-4")
-    bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "robot-tool-combat-4", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "robot-tool-combat-4", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("bob-laser-robot", { "laser-rifle-battery-diamond", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-laser-robot", { type = "item", name = "laser-rifle-battery-diamond", amount = 1 })
     bobmods.lib.tech.add_prerequisite("bob-laser-robot", "bob-laser-rifle-ammo-6")
   end
 end
diff --git a/bobwarfare/prototypes/robots.lua b/bobwarfare/prototypes/robots.lua
index 6c20a7a5f..34dcdd2b9 100644
--- a/bobwarfare/prototypes/robots.lua
+++ b/bobwarfare/prototypes/robots.lua
@@ -143,7 +143,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "bob-laser-robot", 5 },
+        { type = "item", name = "bob-laser-robot", amount = 5 },
       },
       results = { { type = "item", name = "bob-laser-robot-capsule", amount = 1 } },
     },
diff --git a/bobwarfare/prototypes/spidertron-updates.lua b/bobwarfare/prototypes/spidertron-updates.lua
index a947d221d..448950725 100644
--- a/bobwarfare/prototypes/spidertron-updates.lua
+++ b/bobwarfare/prototypes/spidertron-updates.lua
@@ -39,24 +39,24 @@ end
 
 local function add_antron_power_supply()
   if data.raw.item.rtg then
-    bobmods.lib.recipe.add_ingredient("antron", { "rtg", 1 })
+    bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "rtg", amount = 1 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "rtg")
   elseif data.raw.item["vehicle-fusion-reactor-1"] then
-    bobmods.lib.recipe.add_ingredient("antron", { "vehicle-fusion-reactor-1", 1 })
+    bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "vehicle-fusion-reactor-1", amount = 1 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "vehicle-fusion-reactor-equipment-1")
   else
-    bobmods.lib.recipe.add_ingredient("antron", { "fusion-reactor-equipment", 1 })
+    bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "fusion-reactor-equipment", amount = 1 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "fusion-reactor-equipment")
   end
 end
 
 local function add_tankotron_power_supply()
   if data.raw.item.rtg then
-    bobmods.lib.recipe.add_ingredient("tankotron", { "rtg", 2 })
+    bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "rtg", amount = 2 })
   elseif data.raw.item["vehicle-fusion-reactor-1"] then
-    bobmods.lib.recipe.add_ingredient("tankotron", { "vehicle-fusion-reactor-1", 2 })
+    bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "vehicle-fusion-reactor-1", amount = 2 })
   else
-    bobmods.lib.recipe.add_ingredient("tankotron", { "fusion-reactor-equipment", 2 })
+    bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "fusion-reactor-equipment", amount = 2 })
   end
 end
 
@@ -86,23 +86,23 @@ end
 
 local function add_logistic_spidertron_power_supply()
   if data.raw.item.rtg then
-    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "rtg", 2 })
+    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "rtg", amount = 2 })
   elseif data.raw.item["vehicle-fusion-reactor-1"] then
-    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "vehicle-fusion-reactor-1", 2 })
+    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "vehicle-fusion-reactor-1", amount = 2 })
   else
-    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "fusion-reactor-equipment", 2 })
+    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "fusion-reactor-equipment", amount = 2 })
   end
 end
 
 local function add_heavy_spidertron_power_supply()
   if data.raw.item.rtg then
-    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "rtg", 3 })
+    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "rtg", amount = 3 })
     bobmods.lib.tech.add_prerequisite("heavy-spidertron", "rtg")
   elseif data.raw.item["vehicle-fusion-reactor-1"] then
-    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "vehicle-fusion-reactor-1", 3 })
+    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "vehicle-fusion-reactor-1", amount = 3 })
     bobmods.lib.tech.add_prerequisite("heavy-spidertron", "vehicle-fusion-reactor-equipment-1")
   else
-    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "fusion-reactor-equipment", 3 })
+    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "fusion-reactor-equipment", amount = 3 })
     bobmods.lib.tech.add_prerequisite("heavy-spidertron", "fusion-reactor-equipment")
   end
 end
@@ -146,38 +146,38 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
   bobmods.lib.tech.add_recipe_unlock("tankotron", "mech-armor-plate")
   bobmods.lib.tech.add_prerequisite("walking-vehicle", "low-density-structure")
 
-  bobmods.lib.recipe.add_ingredient("antron", { "mech-leg", 6 })
-  bobmods.lib.recipe.add_ingredient("antron", { "mech-frame", 1 })
+  bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "mech-leg", amount = 6 })
+  bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "mech-frame", amount = 1 })
   bobmods.lib.recipe.set_energy_required("antron", 4)
 
-  bobmods.lib.recipe.add_ingredient("tankotron", { "mech-leg", 6 })
-  bobmods.lib.recipe.add_ingredient("tankotron", { "mech-frame", 1 })
-  bobmods.lib.recipe.add_ingredient("tankotron", { "mech-armor-plate", 5 })
+  bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "mech-leg", amount = 6 })
+  bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "mech-frame", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "mech-armor-plate", amount = 5 })
   bobmods.lib.recipe.set_energy_required("tankotron", 5)
 
   bobmods.lib.recipe.remove_ingredient("spidertron", "exoskeleton-equipment")
-  bobmods.lib.recipe.add_ingredient("spidertron", { "mech-leg", 8 })
+  bobmods.lib.recipe.add_ingredient("spidertron", { type = "item", name = "mech-leg", amount = 8 })
   bobmods.lib.recipe.remove_ingredient("spidertron", "low-density-structure")
   bobmods.lib.recipe.remove_ingredient("spidertron", "rocket-control-unit")
   bobmods.lib.recipe.remove_ingredient("spidertron", "effectivity-module-3")
-  bobmods.lib.recipe.add_ingredient("spidertron", { "mech-frame", 1 })
-  bobmods.lib.recipe.add_ingredient("spidertron", { "mech-armor-plate", 10 })
+  bobmods.lib.recipe.add_ingredient("spidertron", { type = "item", name = "mech-frame", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("spidertron", { type = "item", name = "mech-armor-plate", amount = 10 })
   bobmods.lib.recipe.set_energy_required("spidertron", 5)
   bobmods.lib.tech.replace_prerequisite("spidertron", "walking-vehicle", "tankotron")
 
-  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { "mech-leg", 8 })
-  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { "mech-frame", 1 })
-  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { "mech-armor-plate", 5 })
+  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { type = "item", name = "mech-leg", amount = 8 })
+  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { type = "item", name = "mech-frame", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { type = "item", name = "mech-armor-plate", amount = 5 })
   bobmods.lib.recipe.set_energy_required("logistic-spidertron", 5)
   bobmods.lib.tech.replace_prerequisite("logistic-spidertron", "walking-vehicle", "tankotron")
 
-  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "mech-leg", 8 })
-  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "mech-frame", 1 })
-  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "mech-armor-plate", 20 })
+  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "mech-leg", amount = 8 })
+  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "mech-frame", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "mech-armor-plate", amount = 20 })
   bobmods.lib.recipe.set_energy_required("heavy-spidertron", 6)
 
   if data.raw.item.rubber then
-    bobmods.lib.recipe.add_ingredient("mech-foot", { "rubber", 1 })
+    bobmods.lib.recipe.add_ingredient("mech-foot", { type = "item", name = "rubber", amount = 1 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "bob-wood-processing")
   end
 
@@ -191,8 +191,8 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
   end
 
   if data.raw.item["titanium-bearing"] then
-    bobmods.lib.recipe.add_ingredient("mech-hip", { "titanium-bearing", 4 })
-    bobmods.lib.recipe.add_ingredient("mech-knee", { "titanium-bearing", 2 })
+    bobmods.lib.recipe.add_ingredient("mech-hip", { type = "item", name = "titanium-bearing", amount = 4 })
+    bobmods.lib.recipe.add_ingredient("mech-knee", { type = "item", name = "titanium-bearing", amount = 2 })
   end
 
   if data.raw.item["nitinol-alloy"] then
@@ -210,61 +210,61 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
   end
 
   if data.raw.item["solder"] then
-    bobmods.lib.recipe.add_ingredient("mech-brain", { "solder", 120 })
+    bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "solder", amount = 120 })
   end
 
   if data.raw.item["advanced-processing-unit"] then
-    bobmods.lib.recipe.add_ingredient("mech-brain", { "advanced-processing-unit", 20 })
+    bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "advanced-processing-unit", amount = 20 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "advanced-electronics-3")
   else
-    bobmods.lib.recipe.add_ingredient("mech-brain", { "effectivity-module-3", 6 })
+    bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "effectivity-module-3", amount = 6 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "effectivity-module-3")
   end
 
   if data.raw.tool["module-case"] or data.raw.item["module-case"] then
-    bobmods.lib.recipe.add_ingredient("mech-brain", { "module-case", 1 })
+    bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "module-case", amount = 1 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "modules")
   elseif data.raw.item["aluminium-plate"] then
-    bobmods.lib.recipe.add_ingredient("mech-brain", { "aluminium-plate", 10 })
+    bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "aluminium-plate", amount = 10 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "aluminium-processing")
   else
-    bobmods.lib.recipe.add_ingredient("mech-brain", { "steel-plate", 10 })
+    bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "steel-plate", amount = 10 })
   end
 else
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.remove_ingredient("spidertron", "effectivity-module-3")
     bobmods.lib.tech.remove_prerequisite("spidertron", "effectivity-module-3")
-    bobmods.lib.recipe.add_ingredient("spidertron", { "advanced-processing-unit", 10 })
+    bobmods.lib.recipe.add_ingredient("spidertron", { type = "item", name = "advanced-processing-unit", amount = 10 })
 
-    bobmods.lib.recipe.add_ingredient("antron", { "advanced-processing-unit", 8 })
+    bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "advanced-processing-unit", amount = 8 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "advanced-electronics-3")
-    bobmods.lib.recipe.add_ingredient("tankotron", { "advanced-processing-unit", 8 })
-    bobmods.lib.recipe.add_ingredient("logistic-spidertron", { "advanced-processing-unit", 10 })
-    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "advanced-processing-unit", 16 })
+    bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "advanced-processing-unit", amount = 8 })
+    bobmods.lib.recipe.add_ingredient("logistic-spidertron", { type = "item", name = "advanced-processing-unit", amount = 10 })
+    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "advanced-processing-unit", amount = 16 })
   else
-    bobmods.lib.recipe.add_ingredient("antron", { "effectivity-module-3", 2 })
+    bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "effectivity-module-3", amount = 2 })
     bobmods.lib.tech.add_prerequisite("walking-vehicle", "effectivity-module-3")
-    bobmods.lib.recipe.add_ingredient("tankotron", { "effectivity-module-3", 2 })
-    bobmods.lib.recipe.add_ingredient("logistic-spidertron", { "effectivity-module-3", 3 })
-    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "effectivity-module-3", 4 })
+    bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "effectivity-module-3", amount = 2 })
+    bobmods.lib.recipe.add_ingredient("logistic-spidertron", { type = "item", name = "effectivity-module-3", amount = 3 })
+    bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "effectivity-module-3", amount = 4 })
   end
 
-  bobmods.lib.recipe.add_ingredient("antron", { "exoskeleton-equipment", 3 })
+  bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "exoskeleton-equipment", amount = 3 })
   bobmods.lib.tech.add_prerequisite("walking-vehicle", "exoskeleton-equipment")
-  bobmods.lib.recipe.add_ingredient("antron", { "low-density-structure", 100 })
+  bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "low-density-structure", amount = 100 })
   bobmods.lib.tech.add_prerequisite("walking-vehicle", "low-density-structure")
 
-  bobmods.lib.recipe.add_ingredient("tankotron", { "exoskeleton-equipment", 3 })
-  bobmods.lib.recipe.add_ingredient("tankotron", { "low-density-structure", 120 })
+  bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "exoskeleton-equipment", amount = 3 })
+  bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "low-density-structure", amount = 120 })
 
-  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { "exoskeleton-equipment", 4 })
-  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { "rocket-control-unit", 18 })
-  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { "low-density-structure", 100 })
+  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { type = "item", name = "exoskeleton-equipment", amount = 4 })
+  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { type = "item", name = "rocket-control-unit", amount = 18 })
+  bobmods.lib.recipe.add_ingredient("logistic-spidertron", { type = "item", name = "low-density-structure", amount = 100 })
   bobmods.lib.tech.add_prerequisite("logistic-spidertron", "rocket-control-unit")
 
-  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "exoskeleton-equipment", 4 })
-  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "rocket-control-unit", 20 })
-  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { "low-density-structure", 200 })
+  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "exoskeleton-equipment", amount = 4 })
+  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "rocket-control-unit", amount = 20 })
+  bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "low-density-structure", amount = 200 })
 end
 
 if data.raw.item["titanium-chest"] then
diff --git a/bobwarfare/prototypes/spidertron.lua b/bobwarfare/prototypes/spidertron.lua
index 884ee2013..04fd3f3c0 100644
--- a/bobwarfare/prototypes/spidertron.lua
+++ b/bobwarfare/prototypes/spidertron.lua
@@ -81,8 +81,8 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "pipe", 3 },
-        { "steel-plate", 2 },
+        { type = "item", name = "pipe", amount = 3 },
+        { type = "item", name = "steel-plate", amount = 2 },
       },
       results = { { type = "item", name = "mech-leg-segment", amount = 1 } },
     },
@@ -92,7 +92,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "low-density-structure", 1 },
+        { type = "item", name = "low-density-structure", amount = 1 },
       },
       results = { { type = "item", name = "mech-foot", amount = 1 } },
     },
@@ -102,9 +102,9 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "low-density-structure", 2 },
-        { "electric-engine-unit", 5 },
-        { "iron-gear-wheel", 4 },
+        { type = "item", name = "low-density-structure", amount = 2 },
+        { type = "item", name = "electric-engine-unit", amount = 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 4 },
       },
       results = { { type = "item", name = "mech-hip", amount = 1 } },
     },
@@ -114,9 +114,9 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "low-density-structure", 2 },
-        { "electric-engine-unit", 10 },
-        { "iron-gear-wheel", 8 },
+        { type = "item", name = "low-density-structure", amount = 2 },
+        { type = "item", name = "electric-engine-unit", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 8 },
       },
       results = { { type = "item", name = "mech-knee", amount = 1 } },
     },
@@ -126,11 +126,11 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "mech-leg-segment", 2 },
-        { "mech-foot", 1 },
-        { "mech-hip", 1 },
-        { "mech-knee", 1 },
-        { "copper-cable", 4 },
+        { type = "item", name = "mech-leg-segment", amount = 2 },
+        { type = "item", name = "mech-foot", amount = 1 },
+        { type = "item", name = "mech-hip", amount = 1 },
+        { type = "item", name = "mech-knee", amount = 1 },
+        { type = "item", name = "copper-cable", amount = 4 },
       },
       results = { { type = "item", name = "mech-leg", amount = 1 } },
     },
@@ -149,8 +149,8 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
       enabled = false,
       energy_required = 5,
       ingredients = {
-        { "low-density-structure", 50 },
-        { "mech-brain", 1 },
+        { type = "item", name = "low-density-structure", amount = 50 },
+        { type = "item", name = "mech-brain", amount = 1 },
       },
       results = { { type = "item", name = "mech-frame", amount = 1 } },
     },
@@ -160,8 +160,8 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "low-density-structure", 5 },
-        { "steel-plate", 2 },
+        { type = "item", name = "low-density-structure", amount = 5 },
+        { type = "item", name = "steel-plate", amount = 2 },
       },
       results = { { type = "item", name = "mech-armor-plate", amount = 1 } },
     },
@@ -487,8 +487,8 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "steel-plate", 15 },
-      { "iron-gear-wheel", 5 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
     },
     results = { { type = "item", name = "spidertron-cannon", amount = 1 } },
   },
@@ -498,7 +498,7 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "gun-turret", 2 },
+      { type = "item", name = "gun-turret", amount = 2 },
     },
     results = { { type = "item", name = "antron", amount = 1 } },
   },
@@ -508,7 +508,7 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "spidertron-cannon", 2 },
+      { type = "item", name = "spidertron-cannon", amount = 2 },
     },
     results = { { type = "item", name = "tankotron", amount = 1 } },
   },
@@ -518,8 +518,8 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "gun-turret", 2 },
-      { "steel-chest", 1 },
+      { type = "item", name = "gun-turret", amount = 2 },
+      { type = "item", name = "steel-chest", amount = 1 },
     },
     results = { { type = "item", name = "logistic-spidertron", amount = 1 } },
   },
@@ -529,7 +529,7 @@ data:extend({
     enabled = false,
     energy_required = 12,
     ingredients = {
-      { "rocket-launcher", 8 },
+      { type = "item", name = "rocket-launcher", amount = 8 },
     },
     results = { { type = "item", name = "heavy-spidertron", amount = 1 } },
   },
diff --git a/bobwarfare/prototypes/train-updates.lua b/bobwarfare/prototypes/train-updates.lua
index ae224a221..0e3d9aa89 100644
--- a/bobwarfare/prototypes/train-updates.lua
+++ b/bobwarfare/prototypes/train-updates.lua
@@ -9,11 +9,11 @@ if data.raw.item["titanium-plate"] then
 end
 
 if data.raw.item["titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-2", { "titanium-bearing", 8 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-2", { type = "item", name = "titanium-bearing", amount = 8 })
 elseif data.raw.item["steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-2", { "steel-bearing", 8 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-2", { type = "item", name = "steel-bearing", amount = 8 })
 else
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-2", { "iron-gear-wheel", 8 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-2", { type = "item", name = "iron-gear-wheel", amount = 8 })
 end
 
 if data.raw.item["titanium-gear-wheel"] then
@@ -29,17 +29,17 @@ elseif data.raw.item["steel-pipe"] then
 end
 
 if data.raw.item["tungsten-carbide"] then
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { "tungsten-carbide", 10 })
+  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", "tungsten-alloy-processing")
 else
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { "steel-plate", 10 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "steel-plate", amount = 10 })
 end
 
 if data.raw.item["silicon-nitride"] then
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { "silicon-nitride", 10 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "silicon-nitride", amount = 10 })
   bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-3", "ceramics")
 else
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { "steel-plate", 10 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "steel-plate", amount = 10 })
 end
 
 if data.raw.item["nitinol-alloy"] then
@@ -48,10 +48,10 @@ if data.raw.item["nitinol-alloy"] then
 end
 
 if data.raw.item["nitinol-bearing"] then
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { "nitinol-bearing", 8 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "nitinol-bearing", amount = 8 })
   bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-3", "nitinol-processing")
 else
-  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { "iron-gear-wheel", 8 })
+  bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "iron-gear-wheel", amount = 8 })
 end
 
 if data.raw.item["nitinol-gear-wheel"] then
diff --git a/bobwarfare/prototypes/train.lua b/bobwarfare/prototypes/train.lua
index ea93ce7ba..e4971cd38 100644
--- a/bobwarfare/prototypes/train.lua
+++ b/bobwarfare/prototypes/train.lua
@@ -113,11 +113,11 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { "artillery-wagon", 1 },
-      { "iron-gear-wheel", 12 },
-      { "steel-plate", 40 },
-      { "pipe", 16 },
-      { "processing-unit", 20 },
+      { type = "item", name = "artillery-wagon", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 12 },
+      { type = "item", name = "steel-plate", amount = 40 },
+      { type = "item", name = "pipe", amount = 16 },
+      { type = "item", name = "processing-unit", amount = 20 },
     },
     results = { { type = "item", name = "bob-artillery-wagon-2", amount = 1 } },
   },
@@ -127,11 +127,11 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { "bob-artillery-wagon-2", 1 },
-      { "iron-gear-wheel", 12 },
-      { "steel-plate", 20 },
-      { "pipe", 16 },
-      { "processing-unit", 20 },
+      { type = "item", name = "bob-artillery-wagon-2", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 12 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "pipe", amount = 16 },
+      { type = "item", name = "processing-unit", amount = 20 },
     },
     results = { { type = "item", name = "bob-artillery-wagon-3", amount = 1 } },
   },