Clean up existing recipe list.

Add some items form my mods.
Remove generally useless recipes.

3 files changed, 115 insertions, 71 deletions

diff --git a/Readme.txt b/Readme.txt
index 0bbcfd8..ec33438 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -1,9 +1,18 @@
 The purpose of this mod is to expand upon the variety of the faction 
 camp recipes while keeping it in line with the pre-existing recipes.
 
-Eventually companions will be able to work on crafting stacks, but 
-until then this is a hack to improve quality of life by delegating the 
-production of regularly mass-crafted materials.
+Eventually companions will be able to work on crafting stacks without 
+the player being the lead crafter, but until then this is a hack to 
+improve quality of life by delegating the production of regularly 
+mass-crafted materials.
+
+Since BN has removed the entire basecamp feature from upstream, I've 
+opted to modify this list however I choose since there is no upstream 
+list to worry about breaking anymore.
+It will now include several recipes added by the mods included in my 
+build of the game.
+Additionally several of the more useless recipes have been removed to 
+cut down on scrolling.
 
 
 Additions to expect:
@@ -35,6 +44,18 @@ Renamed several recipes to make the resulting item more clear.
 Redid suffixes to make the variant and tool more clear. Circle Brackets for variant materials, Square brackets for variant tools.
 
 
+Kitchen:
+Level 1: (These recipes are available to both the main camp and any kitchen expansions)
+Anything you can cook with simple tools like a stick, a shovel, or a cutting board. (ie, Food Cooking 1)
+Also simple boiling, such as hardboiled eggs. (ie, Boiling 1)(NPCs can't return recipes that are liquids, else coffee or clean water would be here too)
+
+Level 2:
+Anything that requires a frying pan, or baking. (ie, Food Cooking 2)
+
+Level 3:
+Anything more complex than that.
+
+
 Workshop Baseline guide for crafting requirements:
 (Crafting tools can be crafting at the same tier as new ones added in the same tier, unless those are furniture tools.)
 (ie, Swage and Die is Level 4, even though a requirement, Metalworking Chisel, also is.)
@@ -51,6 +72,9 @@ Requires Anvil.
 Requires Plastic Mold.
 Primitive Weapons and Armor.
 
+Level 3:
+Requires Soldering Iron
+
 Level 4:
 Requires Bolt Cutters.
 Requires Drilling 2.
diff --git a/json/recipes/basecamps/recipe_groups.json b/json/recipes/basecamps/recipe_groups.json
index f0247e9..ad9632d 100644
--- a/json/recipes/basecamps/recipe_groups.json
+++ b/json/recipes/basecamps/recipe_groups.json
@@ -5,12 +5,23 @@
     "building_type": "COOK",
     "recipes": [
       { "id": "meat_cooked", "description": " Meat, Cooked" },
+      { "id": "meat_scrap_cooked", "description": " Meat, Scrap, Cooked" },
       { "id": "fish_cooked", "description": " Fish, Cooked" },
-      { "id": "boiled_egg", "description": " Egg, Boiled" },
-      { "id": "veggy_cooked", "description": " Veggy, Cooked" },
-      { "id": "veggy_wild_cooked", "description": " Veggy, Cooked Wild" },
+      { "id": "veggy_cooked", "description": " Plant Marrow, Cooked" },
+      { "id": "veggy_wild_cooked", "description": " Wild Vegetables, Cooked" },
+      { "id": "cooked_cattail_stalk", "description": " Cattail Stalk, Cooked" },
       { "id": "mushroom_cooked", "description": " Mushroom, Cooked" },
-      { "id": "flatbread", "description": " Flatbread" },
+      { "id": "morel_cooked", "description": " Mushroom, Morel, Cooked" },
+
+      { "id": "boiled_egg", "description": " Egg, Boiled" },
+      { "id": "fiddlehead_boiled", "description": " Fiddleheads, Boiled" },
+
+      { "id": "cooked_dinner", "description": " TV Dinner, Cooked" },
+      { "id": "hotdogs_campfire", "description": " Hot Dog, Cooked" },
+      { "id": "corndogs_cooked", "description": " Corn Dog, Cooked" },
+      { "id": "sausage_cooked", "description": " Sausage, Cooked" },
+      { "id": "sausage_wasteland_cooked", "description": " Sausage, Wasteland, Cooked" },
+
       { "id": "acorn_roasted", "description": " Acorn, Roasted" },
       { "id": "almond_roasted", "description": " Almond, Roasted" },
       { "id": "chestnut_roasted", "description": " Chestnut, Roasted" },
@@ -22,6 +33,7 @@
       { "id": "soy_nuts", "description": " Soybeans, Roasted" },
       { "id": "walnut_roasted", "description": " Walnut, Roasted" },
       { "id": "salsify_baked", "description": " Salsify, Roasted" },
+
       { "id": "pine_nuts", "description": " Pine Nut (from Pinecone)" }
     ]
   },
@@ -42,6 +54,11 @@
       { "id": "meal_bone_with_from_food_processor", "description": " Bonemeal [using Food Processor]" },
       { "id": "meal_chitin_piece", "description": " Chitin Powder" },
       { "id": "meal_chitin_piece_with_from_food_processor", "description": " Chitin Powder [using Food Processor]" },
+      { "id": "protein_powder", "description": " Protein Powder" },
+      { "id": "protein_powder_with_from_food_processor", "description": " Protein Powder [using Food Processor]" },
+      { "id": "chilly-p", "description": " Chili Powder" },
+      { "id": "chilly-p_with_from_food_processor", "description": " Chili Powder [using Food Processor]" },
+
       { "id": "sugar", "description": " Sugar (from Sweet Water)" },
       { "id": "salt_from_hickory", "description": " Salt (from Hickory Root)" },
       { "id": "salt_from_salt_water", "description": " Salt (from Salt Water)" },
@@ -49,23 +66,24 @@
       { "id": "starch", "description": " Starch" },
       { "id": "starch_from_fibrous_stuff", "description": " Starch (from Cattail Rhizomes)" },
       { "id": "lard", "description": " Lard" },
-      { "id": "protein_powder", "description": " Protein Powder" },
-      { "id": "protein_powder_with_from_food_processor", "description": " Protein Powder [using Food Processor]" },
+
       { "id": "powder_eggs", "description": " Eggs, Powdered" },
       { "id": "milk_powder", "description": " Milk, Powdered" },
-      { "id": "chilly-p", "description": " Chili Powder" },
-      { "id": "chilly-p_with_from_food_processor", "description": " Chili Powder [using Food Processor]" },
+
       { "id": "bread", "description": " Bread" },
       { "id": "cornbread", "description": " Bread, Cornbread" },
       { "id": "tortilla_corn", "description": " Corn Tortilla" },
+      { "id": "flatbread", "description": " Flatbread" },
+
+      { "id": "spaghetti_cooked", "description": " Noodles, Cooked" },
+
       { "id": "lasagne_raw", "description": " Noodles, Lasagne, Raw [using Pasta Extruder]" },
       { "id": "macaroni_raw", "description": " Noodles, Macaroni, Raw [using Pasta Extruder]" },
       { "id": "spaghetti_raw", "description": " Noodles, Spaghetti, Raw [using Pasta Extruder]" },
-      { "id": "spaghetti_cooked", "description": " Noodles, Cooked" },
+
       { "id": "jerky", "description": " Meat, Jerky" },
-      { "id": "meat_smoked", "description": " Meat, Smoked" },
+
       { "id": "dry_meat", "description": " Meat, Dehydrated" },
-      { "id": "fish_smoked", "description": " Fish, Smoked" },
       { "id": "dry_fish", "description": " Fish, Dehydrated" },
       { "id": "fruit_leather", "description": " Fruit, Leather" },
       { "id": "dry_veggy", "description": " Vegetable, Dehydrated" },
@@ -74,14 +92,19 @@
       { "id": "dry_tofu", "description": " Tofu, Dehydrated" },
       { "id": "dry_mushroom", "description": " Mushroom, Dried" },
       { "id": "dry_fruit", "description": " Fruit, Dehydrated" },
+
+      { "id": "meat_smoked", "description": " Meat, Smoked" },
+      { "id": "fish_smoked", "description": " Fish, Smoked" },
+      { "id": "sausage", "description": " Sausage, Smoked" },
+      { "id": "sausage_wasteland", "description": " Sausage, Wasteland, Smoked" },
+
       { "id": "meat_salted_vacuum_packed", "description": " Salted Meat Slices [using Vacuum Sealer]" },
       { "id": "salted_fish_vacuum_packed", "description": " Salted Fish [using Vacuum Sealer]" },
       { "id": "apple_sugar_vacuum_packed", "description": " Fruit Slices [using Vacuum Sealer]" },
       { "id": "veggy_salted_vacuum_packed", "description": " Salted Veggy Chunks [using Vacuum Sealer]" },
-      { "id": "sausage", "description": " Sausage, Smoked" },
+
       { "id": "sausage_casings", "description": " Sausage, Casings" },
       { "id": "sausage_raw", "description": " Sausage, Raw" },
-      { "id": "sausage_wasteland", "description": " Sausage, Wasteland, Smoked" },
       { "id": "sausage_wasteland_raw", "description": " Sausage, Wasteland, Raw" },
       { "id": "bratwurst_sausage", "description": " Sausage, Bratwurst" }
     ]
@@ -92,9 +115,11 @@
     "building_type": "COOK",
     "recipes": [
       { "id": "sugar_from_beets", "description": " Sugar (from Sugar Beets)" },
+
       { "id": "sugar_from_sweets", "description": " Sugar (from Sweets)[using Chemistry Set]" },
       { "id": "sugar_from_wood", "description": " Sugar (from Wood)[using Chemistry Set]" },
       { "id": "salt", "description": " Salt (from Bleach/Lye)[using Chemistry Set]" },
+
       { "id": "tallow", "description": " Tallow" },
       { "id": "cheese_fresh", "description": " Cheese, Fresh" },
       { "id": "cheese_hard", "description": " Cheese, Hard" },
@@ -103,51 +128,58 @@
       { "id": "flask_yeast", "description": " Yeast" },
       { "id": "rennet", "description": " Rennet" },
       { "id": "tofu", "description": " Tofu" },
+
       { "id": "coffee_raw", "description": " Coffee Grounds" },
       { "id": "coffee_raw_kentucky", "description": " Coffee Grounds, Kentucky" },
+
       { "id": "pie_meat", "description": " Meat Pie" },
       { "id": "pie_veggy", "description": " Veggy Pie" },
       { "id": "pie", "description": " Fruit Pie" },
       { "id": "pie_maple", "description": " Maple Pie" },
+
       { "id": "biscuit", "description": " Biscuit" },
       { "id": "granola", "description": " Granola" },
       { "id": "hardtack", "description": " Hardtack" },
       { "id": "pemmican", "description": " Pemmican" },
+
       { "id": "meat_canned", "description": " Meat, Canned (Small Tin Can)" },
+      { "id": "fish_canned", "description": " Fish, Canned (Small Tin Can)" },
+      { "id": "apple_canned", "description": " Fruit, Canned (Small Tin Can)" },
+      { "id": "veggy_canned", "description": " Vegetable, Canned (Small Tin Can)" },
+      { "id": "can_beans", "description": " Beans, Canned (Medium Tin Can)" },
+      { "id": "can_beans_canned_3l", "description": " Beans, Canned (Large Tin Can)" },
+      { "id": "can_corn", "description": " Corn, Canned (Medium Tin Can)" },
+      { "id": "can_corn_canned_3l", "description": " Corn, Canned (Large Tin Can)" },
+      { "id": "can_tomato", "description": " Tomatoes, Canned (Small Tin Can)" },
+      { "id": "can_tomato_canned_3l", "description": " Tomatoes, Canned (Large Tin Can)" },
+
       { "id": "meat_canned_jarred", "description": " Meat, Canned (Glass Jar)" },
       { "id": "meat_canned_jarred_3l", "description": " Meat, Canned (3L Glass Jar)" },
       { "id": "meat_pickled_jarred", "description": " Meat, Pickled (Glass Jar)" },
       { "id": "meat_pickled_jarred_3l", "description": " Meat, Pickled (3L Glass Jar)" },
-      { "id": "fish_canned", "description": " Fish, Canned (Small Tin Can)" },
       { "id": "fish_canned_jarred", "description": " Fish, Canned (Glass Jar)" },
       { "id": "fish_canned_jarred_3l", "description": " Fish, Canned (3L Glass Jar)" },
       { "id": "fish_pickled_jarred", "description": " Fish, Pickled (Glass Jar)" },
       { "id": "fish_pickled_jarred_3l", "description": " Fish, Pickled (3L Glass Jar)" },
-      { "id": "eggs_ferment", "description": " Eggs, Pickled (Glass Jar)[using Fermentation]" },
-      { "id": "apple_canned", "description": " Fruit, Canned (Small Tin Can)" },
       { "id": "apple_canned_jarred", "description": " Fruit, Canned (Glass Jar)" },
       { "id": "apple_canned_jarred_3l", "description": " Fruit, Canned (3L Glass Jar)" },
-      { "id": "veggy_canned", "description": " Vegetable, Canned (Small Tin Can)" },
       { "id": "veggy_canned_jarred", "description": " Vegetable, Canned (Glass Jar)" },
       { "id": "veggy_canned_jarred_3l", "description": " Vegetable, Canned (3L Glass Jar)" },
       { "id": "veggy_pickled_jarred", "description": " Vegetable, Pickled (Glass Jar)" },
       { "id": "veggy_pickled_jarred_3l", "description": " Vegetable, Pickled (3L Glass Jar)" },
-      { "id": "can_beans", "description": " Beans, Canned (Medium Tin Can)" },
-      { "id": "can_beans_canned_3l", "description": " Beans, Canned (Large Tin Can)" },
       { "id": "can_beans_jarred", "description": " Beans, Canned (Glass Jar)" },
       { "id": "can_beans_jarred_3l", "description": " Beans, Canned (3L Glass Jar)" },
-      { "id": "pickles_ferment", "description": " Pickles (Glass Jar)[using Fermentation]" },
-      { "id": "sauerkraut_ferment", "description": " Sauerkraut (Glass Jar)[using Fermentation]" },
-      { "id": "can_tomato", "description": " Tomatoes, Canned (Small Tin Can)" },
-      { "id": "can_tomato_canned_3l", "description": " Tomatoes, Canned (Large Tin Can)" },
       { "id": "can_tomato_jarred", "description": " Tomatoes, Canned (Glass Jar)" },
       { "id": "can_tomato_jarred_3l", "description": " Tomatoes, Canned (3L Glass Jar)" },
-      { "id": "can_corn", "description": " Corn, Canned (Medium Tin Can)" },
-      { "id": "can_corn_canned_3l", "description": " Corn, Canned (Large Tin Can)" },
-      { "id": "meat_aspic", "description": " Aspic, Meat" },
-      { "id": "veggy_aspic", "description": " Aspic, Veggy" },
       { "id": "kompot_jarred", "description": " Kompot (Glass Jar)" },
-      { "id": "kompot_jarred_3l", "description": " Kompot (3L Glass Jar)" }
+      { "id": "kompot_jarred_3l", "description": " Kompot (3L Glass Jar)" },
+
+      { "id": "eggs_ferment", "description": " Eggs, Pickled (Glass Jar)[using Fermentation]" },
+      { "id": "pickles_ferment", "description": " Cucumbers, Pickled (Glass Jar)[using Fermentation]" },
+      { "id": "sauerkraut_ferment", "description": " Sauerkraut (Glass Jar)[using Fermentation]" },
+
+      { "id": "meat_aspic", "description": " Aspic, Meat" },
+      { "id": "veggy_aspic", "description": " Aspic, Veggy" }
     ]
   },
   {
@@ -158,6 +190,7 @@
       { "id": "tinder", "description": " Tinder" },
       { "id": "pointy_stick", "description": " Pointy Stick" },
       { "id": "pebble", "description": " Pebbles" },
+
       { "id": "cured_hide", "description": " Cured Hide" },
       { "id": "cured_pelt", "description": " Cured Pelt" },
       { "id": "leather", "description": " Leather Patch" },
@@ -165,6 +198,7 @@
       { "id": "fur", "description": " Fur Pelt" },
       { "id": "leather_modern", "description": " Leather Patch [using Lye]" },
       { "id": "fur_modern", "description": " Fur Pelt [using Lye]" },
+
       { "id": "plant_fibre", "description": " Plant Fiber" },
       { "id": "cordage_6", "description": " Cordage Piece, Short" },
       { "id": "cordage_36", "description": " Cordage Piece, Long" },
@@ -227,7 +261,6 @@
     "id": "blacksmith_recipes_1",
     "building_type": "SMITH",
     "recipes": [
-      { "id": "blade", "description": " Blade (from broadsword/machete)" },
       { "id": "charcoal_npc", "description": " Charcoal" },
       { "id": "concrete", "description": " Concrete" },
       { "id": "brick", "description": " Brick" },
@@ -253,8 +286,7 @@
       { "id": "denat_alocohol_sealed", "description": " Denatured Alcohol" },
       { "id": "material_cement", "description": " Cement" },
       { "id": "anvil", "description": " Anvil" },
-      { "id": "tongs", "description": " Metal Tongs" },
-      { "id": "caltrops_glass", "description": " Glass Caltrops" }
+      { "id": "tongs", "description": " Metal Tongs" }
     ]
   },
   {
@@ -264,14 +296,6 @@
     "recipes": [
       { "id": "copper_ax", "description": " Axe, Copper" },
       { "id": "copper_knife", "description": " Knife, Copper" },
-      { "id": "spear_copper", "description": " Spear, Copper" },
-      { "id": "sword_crude", "description": " Sword, Crude" },
-      { "id": "cuirass_scrap", "description": " Armor, Scrap Cuirass" },
-      { "id": "armor_scrapsuit", "description": " Armor, Scrap Suit" },
-      { "id": "helmet_scrap", "description": " Helm, Scrap" },
-      { "id": "armguard_scrap", "description": " Arm Guards, Scrap" },
-      { "id": "legguard_scrap", "description": " Leg Guards, Scrap" },
-      { "id": "boots_scrap", "description": " Boots, Scrap" },
       { "id": "jug_plastic", "description": " Gallon Jug" },
       { "id": "jerrycan", "description": " Jerrycan, Plastic" }
     ]
@@ -311,8 +335,6 @@
       { "id": "steel_plate", "description": " Plating, Steel" },
       { "id": "hard_plate", "description": " Plating, Hard Steel" },
       { "id": "spiked_plate", "description": " Plating, Spiked Steel" },
-      { "id": "caltrops", "description": " Caltrops" },
-      { "id": "caltrops_from wire", "description": " Caltrops (from Wire)" },
       { "id": "glass_sheet", "description": " Glass Sheet" },
       { "id": "pilot_light", "description": " Pilot Light" },
       { "id": "hammer_sledge", "description": " Hammer, Sledge" },
@@ -320,6 +342,7 @@
       { "id": "wood_panel_from wooden sheets", "description": " Wood, Panel (from Large Wooden Sheet)" },
       { "id": "wood_panel_from nailed planks", "description": " Wood, Panel (from Planks)" },
       { "id": "chem_manganese_dioxide", "description": " Manganese Dioxide" },
+
       { "id": "smpistol_primer", "description": " Primer, Pistol, Small" },
       { "id": "lgpistol_primer", "description": " Primer, Pistol, Large" },
       { "id": "smrifle_primer", "description": " Primer, Rifle, Small" },
@@ -338,7 +361,6 @@
       { "id": "knife_hunting", "description": " Knife, Hunting" },
       { "id": "throwing_knife", "description": " Knife, Throwing" },
       { "id": "knife_trench", "description": " Knife, Trench" },
-      { "id": "spear_steel", "description": " Spear, Steel" },
       { "id": "machete", "description": " Sword, Machete" },
       { "id": "pipe", "description": " Pipe, Steel" },
       { "id": "cu_pipe", "description": " Pipe, Copper" },
@@ -360,7 +382,6 @@
       { "id": "jerrycan_big", "description": " Jerrycan, Steel" },
       { "id": "pot", "description": " Pot" },
       { "id": "pot_canning", "description": " Pot, Canning" }
-
     ]
   },
   { 
@@ -368,57 +389,51 @@
     "id": "blacksmith_recipes_6",
     "building_type": "SMITH",
     "recipes": [
-      { "id": "pockknife", "description": " Knife, Pocket" },
-      { "id": "warhammer", "description": " Hammer, War" },
-      { "id": "pike", "description": " Spear, Pike" },
-      { "id": "halberd", "description": " Spear, Halberd" },
-      { "id": "rapier", "description": " Sword, Rapier" },
-      { "id": "scimitar", "description": " Sword, Scimitar" },
-      { "id": "zweihander", "description": " Sword, Zweihander" },
       { "id": "arrow_wood", "description": " Arrow, Wooden, Broadhead" },
       { "id": "arrow_field_point_fletched", "description": " Arrow, Wooden, Bodkin" },
       { "id": "arrow_heavy_field_point_fletched", "description": " Arrow, Wooden, Hunting" },
       { "id": "bolt_wood", "description": " Crossbow Bolt, Wooden, Broadhead" },
       { "id": "bolt_wood_bodkin", "description": " Crossbow Bolt, Wooden, Bodkin" },
       { "id": "bolt_wood_small_game", "description": " Crossbow Bolt, Wooden, Hunting" },
-      { "id": "cuirass_lightplate", "description": " Armor, Plate Cuirass" },
-      { "id": "helmet_plate", "description": " Helm, Plate" },
-      { "id": "armor_lightplate", "description": " Armor, Plate Suit" },
-      { "id": "armguard_lightplate", "description": " Arm Guards, Plate" },
-      { "id": "legguard_lightplate", "description": " Leg Guards, Plate" },
-      { "id": "gloves_plate", "description": " Gauntlets, Plate" },
-      { "id": "boots_plate", "description": " Boots, Plate" },
-      { "id": "sheet_metal_welding", "description": " Sheet Metal [using Welder]" },
+
       { "id": "fire_ax", "description": " Axe, Fire" },
-      { "id": "needle_curved", "description": " Needle, Curved" },
-      { "id": "broadsword", "description": " Sword, Broadsword" },
+      { "id": "pockknife", "description": " Knife, Pocket" },
       { "id": "hacksaw", "description": " Hacksaw" },
       { "id": "halligan", "description": " Halligan Bar" },
+      { "id": "needle_curved", "description": " Needle, Curved" },
       { "id": "pickaxe", "description": " Pickaxe" },
       { "id": "saw", "description": " Woodsaw" },
+
+      { "id": "sheet_metal_welding", "description": " Sheet Metal [using Welder]" },
       { "id": "canister_empty", "description": " Canister" },
-      { "id": "pot_copper", "description": " Pot, Copper" },
       { "id": "30gal_drum_welded", "description": " Drum, 100L [using Welder]" },
       { "id": "55gal_drum_welded", "description": " Drum, 200L [using Welder]" },
       { "id": "jerrycan_big_welder", "description": " Jerrycan, Steel [using Welder]" },
       { "id": "metal_tank", "description": " Metal Tank, 60L [using Welder]" },
-      { "id": "chem_potassium_hydroxide", "description": " Potassium Hydroxide" },
-      { "id": "chem_thermite", "description": " Thermite" },
-      { "id": "tin", "description": " Tin, Powder" },
-      { "id": "chem_rdx", "description": " RDX" },
+
+      { "id": "chem_compositionb", "description": " Composition B" },
       { "id": "chem_hexamine", "description": " Hexamine" },
       { "id": "chem_hmtd", "description": " HMTD" },
       { "id": "oxy_powder", "description": " Oxidizer Powder [using Electrolysis]" },
-      { "id": "chem_compositionb", "description": " Composition B" },
+      { "id": "chem_potassium_hydroxide", "description": " Potassium Hydroxide" },
+      { "id": "chem_rdx", "description": " RDX" },
+      { "id": "chem_thermite", "description": " Thermite" },
+      { "id": "tin", "description": " Tin, Powder" },
+
       { "id": "biodiesel_sealed", "description": " Biodiesel" },
       { "id": "lye_sealed_from_electrolysis", "description": " Lye (from salt water)[using Electrolysis]" },
       { "id": "lye_powder", "description": " Lye, Powder (from Charcoal)" },
+
       { "id": "plastic_chunk", "description": " Plastic, Chunk (from Milk/Vinegar)" },
       { "id": "superglue", "description": " Superglue" },
+
       { "id": "light_minus_disposable_cell", "description": " Disposable Battery, Ultra-Light" },
       { "id": "light_disposable_cell", "description": " Disposable Battery, Light" },
       { "id": "medium_disposable_cell", "description": " Disposable Battery, Medium" },
-      { "id": "heavy_disposable_cell", "description": " Disposable Battery, Heavy" }
+      { "id": "heavy_disposable_cell", "description": " Disposable Battery, Heavy" },
+
+      { "id": "delay_fuze", "description": " Fuze, Delayed" },
+      { "id": "impact_fuze", "description": " Fuze, Impact" }
     ]
   },
   {
@@ -437,10 +452,15 @@
       { "id": "reloaded_3006fmj", "description": " Ammo, .30-06 M2 AP" },
       { "id": "reloaded_50bmg", "description": " Ammo, .50 BMG M33 Ball" },
       { "id": "reloaded_shot_flechette", "description": " Ammo, 00 shotgun flechette" },
+
+      { "id": "40x46mm_bootleg_m433", "description": " Ammo, 40x46mm M433" },
+      { "id": "40x53mm_bootleg_m430a1", "description": " Ammo, 40x53mm M430A1" },
+
       { "id": "ammolink223", "description": " Ammo Belt, .223" },
       { "id": "ammolink308", "description": " Ammo Belt, .308" },
       { "id": "ammolink50", "description": " Ammo Belt, .50" },
       { "id": "ammolink40mm", "description": " Ammo Belt, 40x53mm" },
+
       { "id": "chain_npc_drop", "description": " Chain [using Drop Hammer]" },
       { "id": "combatnail_npc_drop", "description": " Flechette [using Drop Hammer]" },
       { "id": "nail_npc_drop", "description": " Nail [using Drop Hammer]" },
diff --git a/modinfo.json b/modinfo.json
index 6103bc5..ab0effb 100644
--- a/modinfo.json
+++ b/modinfo.json
@@ -7,6 +7,6 @@
     "description": "Add several recipes to the faction camp that in all honesty should be there.",
     "category": "rebalance",
     "dependencies": [ "bn", "recipe_fixes" ],
-    "conflicts": [ "no_rivtech_guns", "faction_camp_recipe_expansion_norv" ]
+    "conflicts": [ "no_rivtech_guns", "no_rivtech_guns_v2", "faction_camp_recipe_expansion_norv" ]
   }
 ]