Fix many pluralization typos.

Add can bomb naming fix.
Reduce crafting time of fuzes to 10 minutes.

3 files changed, 55 insertions, 48 deletions

diff --git a/json/items/tool/explosive.json b/json/items/tool/explosive.json
index e8dd1df..13cf58a 100644
--- a/json/items/tool/explosive.json
+++ b/json/items/tool/explosive.json
@@ -1,10 +1,17 @@
 [
   {
+    "id": "can_bomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "can_bomb_act",
+    "name": { "str": "can bomb (active)", "str_pl": "can bombs (active)" }
+  },
+  {
     "id": "EMPbomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "EMPbomb_act",
-    "name": { "str": "EMP bomb (active)" }
+    "name": { "str": "EMP bomb (active)", "str_pl": "EMP bombs (active)" }
   },
   {
     "id": "flashbang",
@@ -18,35 +25,28 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "flashbang_act",
-    "name": { "str": "flashbang grenade (active)" }
+    "name": { "str": "flashbang grenade (active)", "str_pl": "flashbang grenades (active)" }
   },
   {
     "id": "fragment_bomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "fragment_bomb_act",
-    "name": { "str": "fragment bomb (lit)" }
+    "name": { "str": "fragment bomb (lit)", "str_pl": "fragment bombs (lit)" }
   },
   {
     "id": "fungicidalbomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "fungicidalbomb_act",
-    "name": { "str": "fungicidal gas grenade (active)" }
+    "name": { "str": "fungicidal gas grenade (active)", "str_pl": "fungicidal gas grenades (active)" }
   },
   {
     "id": "fungicidalbomb_makeshift_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "fungicidalbomb_makeshift_act",
-    "name": { "str": "makeshift fungicidal gas grenade (active)" }
-  },
-  {
-    "id": "gasbomb_makeshift_act",
-    "type": "TOOL",
-    "category": "weapons",
-    "copy-from": "gasbomb_makeshift_act",
-    "name": { "str": "makeshift gas canister (active)" }
+    "name": { "str": "makeshift fungicidal gas grenade (active)", "str_pl": "makeshift fungicidal gas grenades (active)" }
   },
   {
     "id": "grenade",
@@ -60,56 +60,63 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "grenade_act",
-    "name": { "str": "fragmentation grenade (active)" }
+    "name": { "str": "fragmentation grenade (active)", "str_pl": "fragmentation grenades (active)" }
+  },
+  {
+    "id": "makeshift_grenade",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "makeshift_grenade",
+    "name": { "str": "makeshift fragmentation grenade" }
+  },
+  {
+    "id": "makeshift_grenade_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "makeshift_grenade_act",
+    "name": { "str": "makeshift fragmentation grenade (active)", "str_pl": "makeshift fragmentation grenades (active)" }
   },
   {
     "id": "grenade_emp_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "grenade_emp_act",
-    "name": { "str": "EMP grenade (active)" }
+    "name": { "str": "EMP grenade (active)", "str_pl": "EMP grenades (active)" }
   },
   {
     "id": "grenade_inc_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "grenade_inc_act",
-    "name": { "str": "incendiary grenade (active)" }
+    "name": { "str": "incendiary grenade (active)", "str_pl": "incendiary grenades (active)" }
   },
   {
     "id": "gasbomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "gasbomb_act",
-    "name": { "str": "tear gas grenade (active)" }
+    "name": { "str": "tear gas grenade (active)", "str_pl": "tear gas grenades (active)" }
   },
   {
-    "id": "insecticidalbomb_act",
-    "type": "TOOL",
-    "category": "weapons",
-    "copy-from": "insecticidalbomb_act",
-    "name": { "str": "insecticidal gas grenade (active)" }
-  },
-  {
-    "id": "insecticidalbomb_makeshift_act",
+    "id": "gasbomb_makeshift_act",
     "type": "TOOL",
     "category": "weapons",
-    "copy-from": "insecticidalbomb_makeshift_act",
-    "name": { "str": "makeshift insecticidal gas grenade (active)" }
+    "copy-from": "gasbomb_makeshift_act",
+    "name": { "str": "makeshift gas canister (active)", "str_pl": "makeshift gas canisters (active)" }
   },
   {
-    "id": "makeshift_grenade",
+    "id": "insecticidalbomb_act",
     "type": "TOOL",
     "category": "weapons",
-    "copy-from": "makeshift_grenade",
-    "name": { "str": "makeshift fragmentation grenade" }
+    "copy-from": "insecticidalbomb_act",
+    "name": { "str": "insecticidal gas grenade (active)", "str_pl": "insecticidal gas grenades (active)" }
   },
   {
-    "id": "makeshift_grenade_act",
+    "id": "insecticidalbomb_makeshift_act",
     "type": "TOOL",
     "category": "weapons",
-    "copy-from": "makeshift_grenade_act",
-    "name": { "str": "makeshift fragmentation grenade (active)" }
+    "copy-from": "insecticidalbomb_makeshift_act",
+    "name": { "str": "makeshift insecticidal gas grenade (active)", "str_pl": "makeshift insecticidal gas grenades (active)" }
   },
   {
     "id": "mininuke_act",
@@ -123,28 +130,28 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "molotov_lit",
-    "name": { "str": "Molotov cocktail (lit)" }
+    "name": { "str": "Molotov cocktail (lit)", "str_pl": "Molotov cocktails (lit)" }
   },
   {
     "id": "nail_bomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "nail_bomb_act",
-    "name": { "str": "nail bomb (lit)" }
+    "name": { "str": "nail bomb (lit)", "str_pl": "nail bombs (lit)" }
   },
   {
     "id": "pipebomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "pipebomb_act",
-    "name": { "str": "pipe bomb (lit)" }
+    "name": { "str": "pipe bomb (lit)", "str_pl": "pipe bombs (lit)" }
   },
   {
     "id": "scrambler_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "scrambler_act",
-    "name": { "str": "scrambler grenade (active)" }
+    "name": { "str": "scrambler grenade (active)", "str_pl": "scrambler grenades (active)" }
   },
   {
     "id": "smokebomb",
@@ -158,34 +165,34 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "smokebomb_act",
-    "name": { "str": "smoke grenade (active)" }
+    "name": { "str": "smoke grenade (active)", "str_pl": "smoke grenades (active)" }
   },
   {
     "id": "tool_anfo_charge_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "tool_anfo_charge_act",
-    "name": { "str": "ANFO charge (lit)" }
+    "name": { "str": "ANFO charge (lit)", "str_pl": "ANFO charges (lit)" }
   },
   {
     "id": "tool_black_powder_charge_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "tool_black_powder_charge_act",
-    "name": { "str": "black gunpowder charge (lit)" }
+    "name": { "str": "black gunpowder charge (lit)", "str_pl": "black gunpowder charges (lit)" }
   },
   {
     "id": "tool_rdx_charge_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "tool_rdx_charge_act",
-    "name": { "str": "RDX charge (lit)" }
+    "name": { "str": "RDX charge (lit)", "str_pl": "RDX charges (lit)" }
   },
   {
     "id": "tool_rocket_candy_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "tool_rocket_candy_act",
-    "name": { "str": "rocket candy (lit)" }
+    "name": { "str": "rocket candy (lit)", "str_pl": "rocket candies (lit)" }
   }
 ]
diff --git a/json/recipes/other/materials.json b/json/recipes/other/materials.json
index b4c0d2e..1d2df2d 100644
--- a/json/recipes/other/materials.json
+++ b/json/recipes/other/materials.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "recipe",
-    "note": "Loosely based on plastic chunk from plastic bag recipe",
+    "//": "Loosely based on plastic chunk from plastic bag recipe",
     "result": "rubber_slug",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_COMPONENTS",
@@ -22,13 +22,13 @@
   },
   {
     "result": "delay_fuze",
-    "note": "Loosely based on fuse and wire recipes",
+    "//": "Loosely based on fuse and wire recipes",
     "type": "recipe",
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_MATERIALS",
     "skill_used": "fabrication",
     "difficulty": 4,
-    "time": "40 m",
+    "time": "10 m",
     "book_learn": [ [ "textbook_anarch", 6 ] ],
     "batch_time_factors": [ 50, 2 ],
     "qualities": [
@@ -52,13 +52,13 @@
   },
   {
     "result": "impact_fuze",
-    "note": "Loosely based on fuse and wire recipes",
+    "//": "Loosely based on fuse and wire recipes",
     "type": "recipe",
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_MATERIALS",
     "skill_used": "fabrication",
     "difficulty": 4,
-    "time": "40 m",
+    "time": "10 m",
     "book_learn": [ [ "textbook_anarch", 6 ] ],
     "batch_time_factors": [ 50, 2 ],
     "qualities": [
diff --git a/json/recipes/weapons/explosive.json b/json/recipes/weapons/explosive.json
index 5da0c48..919492a 100644
--- a/json/recipes/weapons/explosive.json
+++ b/json/recipes/weapons/explosive.json
@@ -197,9 +197,9 @@
     ]
   },
   {
-    "type": "recipe",
-    "note": "Roughly a double-size freagmentation grenade with an impact timer.",
     "result": "landmine",
+    "//": "Roughly a double-size freagmentation grenade with an impact timer.",
+    "type": "recipe",
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_TRAPS",
     "skill_used": "traps",