From 98b35797c7293404d1980b705da56411fe8ce49f Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 9 May 2021 13:27:59 -0700
Subject: Clean up list for bright nights Sort lists manually as they no longer
 autosort Swap a few recipes to different tiers

---
 json/recipes/basecamps/ordering.txt       |  15 +++
 json/recipes/basecamps/recipe_groups.json | 210 +++++++++++++++---------------
 2 files changed, 120 insertions(+), 105 deletions(-)
 create mode 100644 json/recipes/basecamps/ordering.txt

diff --git a/json/recipes/basecamps/ordering.txt b/json/recipes/basecamps/ordering.txt
new file mode 100644
index 0000000..5997319
--- /dev/null
+++ b/json/recipes/basecamps/ordering.txt
@@ -0,0 +1,15 @@
+meat
+fish
+egg
+fruit
+veggy
+mushroom
+bread
+nut
+
+weapon
+ammo
+armor
+component
+tool
+container
diff --git a/json/recipes/basecamps/recipe_groups.json b/json/recipes/basecamps/recipe_groups.json
index d3e4710..7cdfeb1 100644
--- a/json/recipes/basecamps/recipe_groups.json
+++ b/json/recipes/basecamps/recipe_groups.json
@@ -6,30 +6,30 @@
     "recipes": [
       { "id": "meat_cooked", "description": " Cook: Meat, Cooked" },
       { "id": "fish_cooked", "description": " Cook: Fish, Cooked" },
+      { "id": "boiled_egg", "description": " Cook: Egg, Boiled" },
       { "id": "veggy_cooked", "description": " Cook: Veggy, Cooked" },
       { "id": "veggy_wild_cooked", "description": " Cook: Veggy, Cooked Wild" },
-      { "id": "boiled_egg", "description": " Cook: Egg, Boiled" },
-      { "id": "starch", "description": " Cook: Starch" },
-      { "id": "starch_from_fibrous_stuff", "description": " Cook: Starch" },
+      { "id": "mushroom_cooked", "description": " Cook: Mushroom, Cooked" },
       { "id": "flatbread", "description": " Cook: Flatbread" },
       { "id": "acorn_roasted", "description": " Cook: Acorn, Roasted" },
+      { "id": "almond_unshelled", "description": " Cook: Almond, Unshelled" },
       { "id": "almond_roasted", "description": " Cook: Almond, Roasted" },
+      { "id": "chestnut_unshelled", "description": " Cook: Chestnut, Unshelled" },
       { "id": "chestnut_roasted", "description": " Cook: Chestnut, Roasted" },
       { "id": "edamame_roasted", "description": " Cook: Edamame, Roasted" },
-      { "id": "hazelnut_roasted", "description": " Cook: Hazelnut, Roasted" },
-      { "id": "hickory_nut_roasted", "description": " Cook: Hickory Nut, Roasted" },
-      { "id": "pecan_roasted", "description": " Cook: Pecan, Roasted" },
-      { "id": "pistachio_roasted", "description": " Cook: Pistachio, Roasted" },
-      { "id": "soy_nuts", "description": " Cook: Soybeans, Roasted" },
-      { "id": "walnut_roasted", "description": " Cook: Walnut, Roasted" },
-      { "id": "almond_unshelled", "description": " Cook: Almond, Unshelled" },
-      { "id": "chestnut_unshelled", "description": " Cook: Chestnut, Unshelled" },
       { "id": "hazelnut_unshelled", "description": " Cook: Hazelnut, Unshelled" },
+      { "id": "hazelnut_roasted", "description": " Cook: Hazelnut, Roasted" },
       { "id": "hickory_nut_unshelled", "description": " Cook: Hickory Nut, Unshelled" },
+      { "id": "hickory_nut_roasted", "description": " Cook: Hickory Nut, Roasted" },
+      { "id": "peanut_roasted", "description": " Cook: Peanut, Roasted" },
       { "id": "peanut_unshelled", "description": " Cook: Peanut, Unshelled" },
       { "id": "pecan_unshelled", "description": " Cook: Pecan, Unshelled" },
+      { "id": "pecan_roasted", "description": " Cook: Pecan, Roasted" },
       { "id": "pistachio_unshelled", "description": " Cook: Pistachio, Unshelled" },
-      { "id": "walnut_unshelled", "description": " Cook: Walnut, Unshelled" }
+      { "id": "pistachio_roasted", "description": " Cook: Pistachio, Roasted" },
+      { "id": "soy_nuts", "description": " Cook: Soybeans, Roasted" },
+      { "id": "walnut_unshelled", "description": " Cook: Walnut, Unshelled" },
+      { "id": "walnut_roasted", "description": " Cook: Walnut, Roasted" }
     ]
   },
   {
@@ -50,36 +50,38 @@
       { "id": "salt_from_hickory", "description": " Cook: Salt, from Hickory Root" },
       { "id": "salt_from_salt_water", "description": " Cook: Salt, from Salt Water" },
       { "id": "salt_from_mineral", "description": " Cook: Salt, from Rock Salt" },
+      { "id": "starch", "description": " Cook: Starch" },
+      { "id": "starch_from_fibrous_stuff", "description": " Cook: Starch" },
       { "id": "lard", "description": " Cook: Lard" },
+      { "id": "protein_powder", "description": " Cook: Protein Powder" },
+      { "id": "protein_powder_with_from_food_processor", "description": " Cook: Protein Powder, using Food Processor" },
+      { "id": "powder_eggs", "description": " Cook: Eggs, Powdered" },
+      { "id": "milk_powder", "description": " Cook: Milk, Powdered" },
+      { "id": "chilly-p", "description": " Cook: Chili Powder" },
+      { "id": "chilly-p_with_from_food_processor", "description": " Cook: Chili Powder, using Food Processor" },
       { "id": "bread", "description": " Cook: Bread" },
-      { "id": "cornbread", "description": " Cook: Cornbread" },
+      { "id": "cornbread", "description": " Cook: Bread, Cornbread" },
       { "id": "tortilla_corn", "description": " Cook: Corn Tortilla" },
-      { "id": "noodles_fast", "description": " Cook: Fast Noodles, Raw" },
-      { "id": "macaroni_raw", "description": " Cook: Macaroni Noodles, Raw" },
-      { "id": "spaghetti_raw", "description": " Cook: Spaghetti Noodles, Raw" },
-      { "id": "lasagne_raw", "description": " Cook: Lasagne Noodles, Raw" },
-      { "id": "jerky", "description": " Cook: Meat Jerky" },
-      { "id": "fruit_leather", "description": " Cook: Fruit Leather" },
-      { "id": "mushroom_cooked", "description": " Cook: Mushroom, Cooked" },
+      { "id": "noodles_fast", "description": " Cook: Noodles, Fast Noodles, Raw" },
+      { "id": "lasagne_raw", "description": " Cook: Noodles, Lasagne, Raw" },
+      { "id": "macaroni_raw", "description": " Cook: Noodles, Macaroni, Raw" },
+      { "id": "spaghetti_raw", "description": " Cook: Noodles, Spaghetti, Raw" },
+      { "id": "spaghetti_cooked", "description": " Cook: Noodles, Cooked" },
+      { "id": "jerky", "description": " Cook: Meat, Jerky" },
       { "id": "meat_smoked", "description": " Cook: Meat, Smoked" },
-      { "id": "fish_smoked", "description": " Cook: Fish, Smoked" },
       { "id": "dry_meat", "description": " Cook: Meat, Dehydrated" },
+      { "id": "fish_smoked", "description": " Cook: Fish, Smoked" },
       { "id": "dry_fish", "description": " Cook: Fish, Dehydrated" },
-      { "id": "dry_mushroom", "description": " Cook: Mushroom, Dried" },
-      { "id": "dry_tofu", "description": " Cook: Tofu, Dehydrated" },
+      { "id": "fruit_leather", "description": " Cook: Fruit, Leather" },
       { "id": "dry_veggy", "description": " Cook: Vegetable, Dehydrated" },
       { "id": "dry_beans", "description": " Cook: Beans, Dried" },
       { "id": "dry_lentils", "description": " Cook: Lentils, Dried" },
+      { "id": "dry_tofu", "description": " Cook: Tofu, Dehydrated" },
+      { "id": "dry_mushroom", "description": " Cook: Mushroom, Dried" },
       { "id": "dry_fruit", "description": " Cook: Fruit, Dehydrated" },
-      { "id": "protein_powder", "description": " Cook: Protein Powder" },
-      { "id": "protein_powder_with_from_food_processor", "description": " Cook: Protein Powder, using Food Processor" },
-      { "id": "powder_eggs", "description": " Cook: Eggs, Powdered" },
-      { "id": "milk_powder", "description": " Cook: Milk, Powdered" },
-      { "id": "chilly-p", "description": " Cook: Chili Powder" },
-      { "id": "chilly-p_with_from_food_processor", "description": " Cook: Chili Powder, using Food Processor" },
-      { "id": "bratwurst_sausage", "description": " Cook: Sausage, Bratwurst" },
       { "id": "sausage", "description": " Cook: Sausage" },
-      { "id": "sausage_wasteland", "description": " Cook: Sausage, Wasteland" }
+      { "id": "sausage_wasteland", "description": " Cook: Sausage, Wasteland" },
+      { "id": "bratwurst_sausage", "description": " Cook: Sausage, Bratwurst" }
     ]
   },
   {
@@ -97,7 +99,7 @@
       { "id": "raw_butter", "description": " Cook: Butter, Raw" },
       { "id": "tofu", "description": " Cook: Tofu" },
       { "id": "coffee_raw", "description": " Cook: Coffee Grounds" },
-      { "id": "coffee_raw_kentucky", "description": " Cook: Kentucky Coffee Grounds" },
+      { "id": "coffee_raw_kentucky", "description": " Cook: Coffee Grounds, Kentucky" },
       { "id": "pie_meat", "description": " Cook: Meat Pie" },
       { "id": "pie_veggy", "description": " Cook: Veggy Pie" },
       { "id": "pie", "description": " Cook: Fruit Pie" },
@@ -106,26 +108,26 @@
       { "id": "granola", "description": " Cook: Granola" },
       { "id": "hardtack", "description": " Cook: Hardtack" },
       { "id": "pemmican", "description": " Cook: Pemmican" },
-      { "id": "meat_pickled_jarred", "description": " Cook: Meat, Pickled" },
-      { "id": "fish_pickled_jarred", "description": " Cook: Fish, Pickled" },
-      { "id": "veggy_pickled_jarred", "description": " Cook: Veggy, Pickled" },
-      { "id": "sauerkraut_ferment", "description": " Cook: Sauerkraut, Fermenting" },
-      { "id": "pickles_ferment", "description": " Cook: Pickles, Fermenting" },
-      { "id": "eggs_ferment", "description": " Cook: Eggs, Fermenting" },
       { "id": "meat_canned", "description": " Cook: Meat, Canned" },
-      { "id": "fish_canned", "description": " Cook: Fish, Canned" },
-      { "id": "veggy_canned", "description": " Cook: Vegetables, Canned" },
-      { "id": "can_beans", "description": " Cook: Beans, Canned" },
-      { "id": "can_tomato", "description": " Cook: Tomatoes, Canned" },
-      { "id": "apple_canned", "description": " Cook: Fruit, Canned" },
       { "id": "meat_canned_jarred", "description": " Cook: Meat, Canned, Jar" },
+      { "id": "meat_pickled_jarred", "description": " Cook: Meat, Pickled" },
+      { "id": "fish_canned", "description": " Cook: Fish, Canned" },
       { "id": "fish_canned_jarred", "description": " Cook: Fish, Canned, Jar" },
-      { "id": "veggy_canned_jarred", "description": " Cook: Vegetables, Canned, Jar" },
+      { "id": "fish_pickled_jarred", "description": " Cook: Fish, Pickled" },
+      { "id": "eggs_ferment", "description": " Cook: Eggs, Fermenting, Jar" },
+      { "id": "apple_canned", "description": " Cook: Fruit, Canned" },
+      { "id": "apple_canned_jarred", "description": " Cook: Fruit, Canned, Jar" },
+      { "id": "veggy_canned", "description": " Cook: Vegetable, Canned" },
+      { "id": "veggy_canned_jarred", "description": " Cook: Vegetable, Canned, Jar" },
+      { "id": "veggy_pickled_jarred", "description": " Cook: Vegetable, Pickled" },
+      { "id": "can_beans", "description": " Cook: Beans, Canned" },
       { "id": "can_beans_jarred", "description": " Cook: Beans, Canned, Jar" },
+      { "id": "pickles_ferment", "description": " Cook: Pickles, Fermenting" },
+      { "id": "sauerkraut_ferment", "description": " Cook: Sauerkraut, Fermenting" },
+      { "id": "can_tomato", "description": " Cook: Tomatoes, Canned" },
       { "id": "can_tomato_jarred", "description": " Cook: Tomatoes, Canned, Jar" },
-      { "id": "apple_canned_jarred", "description": " Cook: Fruit, Canned, Jar" },
-      { "id": "meat_aspic", "description": " Cook: Meat Aspic" },
-      { "id": "veggy_aspic", "description": " Cook: Veggy Aspic" },
+      { "id": "meat_aspic", "description": " Cook: Aspic, Meat" },
+      { "id": "veggy_aspic", "description": " Cook: Aspic, Veggy" },
       { "id": "kompot", "description": " Cook: Kompot" }
     ]
   },
@@ -198,21 +200,21 @@
     "id": "blacksmith_recipes_1",
     "building_type": "SMITH",
     "recipes": [
-      { "id": "scrap_copper", "description": " Craft: Copper, Scrap" },
       { "id": "charcoal_npc", "description": " Craft: Charcoal" },
+      { "id": "concrete", "description": " Craft: Concrete" },
+      { "id": "scrap_copper", "description": " Craft: Copper, Scrap" },
+      { "id": "chem_manganese_dioxide", "description": " Craft: Manganese Dioxide" },
+      { "id": "plastic_chunk", "description": " Craft: Plastic, Chunk, from Bleach/Vinegar" },
+      { "id": "plastic_chunk_from_plastic_bags", "description": " Craft: Plastic, Chunk, from Plastic Bags" },
+      { "id": "plastic_chunk_from_cash_cards", "description": " Craft: Plastic, Chunk, from Cash Cards/Straws" },
       { "id": "spike", "description": " Craft: Spike" },
-      { "id": "caltrops_glass", "description": " Craft: Glass Caltrops" },
       { "id": "steel_chunk", "description": " Craft: Steel, Chunk" },
-      { "id": "anvil", "description": " Craft: Anvil" },
       { "id": "steel_lump", "description": " Craft: Steel, Lump" },
       { "id": "superglue", "description": " Craft: Superglue" },
-      { "id": "plastic_chunk", "description": " Craft: Plastic, Chunk, from Bleach/Vinegar" },
-      { "id": "plastic_chunk_from_plastic_bags", "description": " Craft: Plastic, Chunk, from Plastic Bags" },
-      { "id": "plastic_chunk_from_cash_cards", "description": " Craft: Plastic, Chunk, from Cash Cards/Straws" },
+      { "id": "material_quicklime", "description": " Craft: Quicklime" },
       { "id": "zinc_metal", "description": " Craft: Zinc" },
-      { "id": "concrete", "description": " Craft: Concrete" },
-      { "id": "chem_manganese_dioxide", "description": " Craft: Manganese Dioxide" },
-      { "id": "material_quicklime", "description": " Craft: Quicklime" }
+      { "id": "anvil", "description": " Craft: Anvil" },
+      { "id": "caltrops_glass", "description": " Craft: Glass Caltrops" }
     ]
   },
   {
@@ -220,19 +222,19 @@
     "id": "blacksmith_recipes_2",
     "building_type": "SMITH",
     "recipes": [
+      { "id": "copper_ax", "description": " Craft: Axe, Copper" },
       { "id": "copper_knife", "description": " Craft: Knife, Copper" },
+      { "id": "spear_copper", "description": " Craft: Spear, Copper" },
       { "id": "sword_crude", "description": " Craft: Sword, Crude" },
-      { "id": "pot_copper", "description": " Craft: Pot, Copper" },
       { "id": "bolt_metal", "description": " Craft: Crossbow Bolt, Steel" },
+      { "id": "cuirass_scrap", "description": " Craft: Armor, Scrap Cuirass" },
       { "id": "armor_scrapsuit", "description": " Craft: Armor, Scrap Suit" },
       { "id": "helmet_scrap", "description": " Craft: Helm, Scrap" },
-      { "id": "cuirass_scrap", "description": " Craft: Armor, Scrap Cuirass" },
       { "id": "armguard_scrap", "description": " Craft: Arm Guards, Scrap" },
       { "id": "legguard_scrap", "description": " Craft: Leg Guards, Scrap" },
       { "id": "boots_scrap", "description": " Craft: Boots, Scrap" },
-      { "id": "copper_ax", "description": " Craft: Axe, Copper" },
-      { "id": "spear_copper", "description": " Craft: Spear, Copper" },
-      { "id": "jerrycan", "description": " Craft: Jerrycan, Plastic" }
+      { "id": "jerrycan", "description": " Craft: Jerrycan, Plastic" },
+      { "id": "pot_copper", "description": " Craft: Pot, Copper" }
     ]
   },
   {
@@ -240,12 +242,12 @@
     "id": "blacksmith_recipes_3",
     "building_type": "SMITH",
     "recipes": [
-      { "id": "chisel", "description": " Craft: Metalworking Chisel" },
-      { "id": "metal_smoother", "description": " Craft: Metallic Smoother" },
-      { "id": "hammer", "description": " Craft: Hammer" },
-      { "id": "tongs", "description": " Craft: Metal Tongs" },
       { "id": "nail", "description": " Craft: Nail" },
       { "id": "wire", "description": " Craft: Wire" },
+      { "id": "hammer", "description": " Craft: Hammer" },
+      { "id": "metal_smoother", "description": " Craft: Metallic Smoother" },
+      { "id": "chisel", "description": " Craft: Metalworking Chisel" },
+      { "id": "tongs", "description": " Craft: Metal Tongs" },
       { "id": "swage", "description": " Craft: Swage and Die Set" }
     ]
   },
@@ -254,20 +256,19 @@
     "id": "blacksmith_recipes_4",
     "building_type": "SMITH",
     "recipes": [
-      { "id": "blade", "description": " Craft: Blade" },
+      { "id": "gold_ring", "description": " Craft: Gold Ring" }
       { "id": "bearing", "description": " Craft: Bearings" },
-      { "id": "caltrops", "description": " Craft: Caltrops" },
-      { "id": "hand_drill", "description": " Craft: Hand Drill" },
+      { "id": "blade", "description": " Craft: Blade" },
+      { "id": "chain", "description": " Craft: Chain" },
+      { "id": "rebar", "description": " Craft: Rebar" },
       { "id": "sheet_metal", "description": " Craft: Sheet Metal" },
       { "id": "steel_plate", "description": " Craft: Plating, Steel" },
-      { "id": "spiked_plate", "description": " Craft: Plating, Spiked Steel" },
       { "id": "hard_plate", "description": " Craft: Plating, Hard Steel" },
-      { "id": "chain", "description": " Craft: Chain" },
-      { "id": "shovel", "description": " Craft: Shovel" },
-      { "id": "rebar", "description": " Craft: Rebar" },
-      { "id": "rebar_rail", "description": " Craft: Ammunition, Rebar Rail" },
-      { "id": "gold_ring", "description": " Craft: Gold Ring" },
-      { "id": "hammer_sledge", "description": " Craft: Hammer, Sledge" }
+      { "id": "spiked_plate", "description": " Craft: Plating, Spiked Steel" },
+      { "id": "caltrops", "description": " Craft: Caltrops" },
+      { "id": "hammer_sledge", "description": " Craft: Hammer, Sledge" },
+      { "id": "hand_drill", "description": " Craft: Hand Drill" },
+      { "id": "shovel", "description": " Craft: Shovel" }
     ]
   },
   {
@@ -275,24 +276,24 @@
     "id": "blacksmith_recipes_5",
     "building_type": "SMITH",
     "recipes": [
+      { "id": "hatchet", "description": " Craft: Axe, Hatchet" },
+      { "id": "throwing_axe", "description": " Craft: Axe, Throwing" },
       { "id": "knife_combat", "description": " Craft: Knife, Combat" },
-      { "id": "knife_trench", "description": " Craft: Knife, Trench" },
       { "id": "knife_hunting", "description": " Craft: Knife, Hunting" },
+      { "id": "throwing_knife", "description": " Craft: Knife, Throwing" },
+      { "id": "knife_trench", "description": " Craft: Knife, Trench" },
       { "id": "spear_steel", "description": " Craft: Spear, Steel" },
-      { "id": "machete", "description": " Craft: Machete" },
+      { "id": "machete", "description": " Craft: Sword, Machete" },
       { "id": "pipe", "description": " Craft: Pipe" },
-      { "id": "screwdriver", "description": " Craft: Screwdriver" },
-      { "id": "throwing_axe", "description": " Craft: Axe, Throwing" },
-      { "id": "wrench", "description": " Craft: Wrench" },
-      { "id": "hatchet", "description": " Craft: Hatchet" },
-      { "id": "throwing_knife", "description": " Craft: Knife, Throwing" },
       { "id": "crowbar", "description": " Craft: Crowbar" },
-      { "id": "pot", "description": " Craft: Pot" },
-      { "id": "pot_canning", "description": " Craft: Pot, Canning" },
       { "id": "hoe", "description": " Craft: Hoe" },
+      { "id": "screwdriver", "description": " Craft: Screwdriver" },
+      { "id": "wrench", "description": " Craft: Wrench" },
       { "id": "30gal_drum_from_scratch", "description": " Craft: Drum, 100L" },
       { "id": "55gal_drum_from_scratch", "description": " Craft: Drum, 200L" },
-      { "id": "jerrycan_big", "description": " Craft: Jerrycan, Steel" }
+      { "id": "jerrycan_big", "description": " Craft: Jerrycan, Steel" },
+      { "id": "pot", "description": " Craft: Pot" },
+      { "id": "pot_canning", "description": " Craft: Pot, Canning" }
 
     ]
   },
@@ -301,34 +302,33 @@
     "id": "blacksmith_recipes_6",
     "building_type": "SMITH",
     "recipes": [
-      { "id": "pliers", "description": " Craft: Pliers" },
-      { "id": "needle_curved", "description": " Craft: Needle, Curved" },
-      { "id": "halberd", "description": " Craft: Spear, Halberd" },
-      { "id": "cuirass_lightplate", "description": " Craft: Armor, Plate Cuirass" },
       { "id": "pockknife", "description": " Craft: Knife, Pocket" },
       { "id": "warhammer", "description": " Craft: Hammer, War" },
+      { "id": "pike", "description": " Craft: Spear, Spear, Awl Pike" },
+      { "id": "halberd", "description": " Craft: Spear, Halberd" },
+      { "id": "rapier", "description": " Craft: Sword, Rapier" },
+      { "id": "scimitar", "description": " Craft: Sword, Scimitar" },
+      { "id": "zweihander", "description": " Craft: Sword, Zweihander" },
+      { "id": "cuirass_lightplate", "description": " Craft: Armor, Plate Cuirass" },
       { "id": "helmet_plate", "description": " Craft: Helm, Plate" },
       { "id": "armor_lightplate", "description": " Craft: Armor, Plate Suit" },
       { "id": "armguard_lightplate", "description": " Craft: Arm Guards, Plate" },
       { "id": "legguard_lightplate", "description": " Craft: Leg Guards, Plate" },
       { "id": "gloves_plate", "description": " Craft: Gauntlets, Plate" },
       { "id": "boots_plate", "description": " Craft: Boots, Plate" },
-      { "id": "broadsword", "description": " Craft: Sword, Broadsword" },
-      { "id": "scimitar", "description": " Craft: Sword, Scimitar" },
+      { "id": "sheet_metal_welding", "description": " Craft: Sheet Metal, Welded" },
       { "id": "fire_ax", "description": " Craft: Axe, Fire" },
+      { "id": "needle_curved", "description": " Craft: Needle, Curved" },
+      { "id": "pliers", "description": " Craft: Pliers" },
+      { "id": "broadsword", "description": " Craft: Sword, Broadsword" },
       { "id": "hacksaw", "description": " Craft: Hacksaw" },
-      { "id": "saw", "description": " Craft: Woodsaw" },
-      { "id": "pike", "description": " Craft: Spear, Awl Pike" },
-      { "id": "rapier", "description": " Craft: Sword, Rapier" },
       { "id": "halligan", "description": " Craft: Halligan Bar" },
-      { "id": "zweihander", "description": " Craft: Sword, Zweihander" },
       { "id": "pickaxe", "description": " Craft: Pickaxe" },
-      { "id": "steel_rail", "description": " Craft: Ammunition, Steel Rail" },
-      { "id": "sheet_metal_welding", "description": " Craft: Sheet Metal, Welded" },
+      { "id": "saw", "description": " Craft: Woodsaw" },
       { "id": "30gal_drum_welded", "description": " Craft: Drum, 100L, Welded" },
       { "id": "55gal_drum_welded", "description": " Craft: Drum, 200L, Welded" },
-      { "id": "metal_tank", "description": " Craft: Metal Tank, 60L, Welded" },
       { "id": "jerrycan_big_welder", "description": " Craft: Jerrycan, Steel, Welded" }
+      { "id": "metal_tank", "description": " Craft: Metal Tank, 60L, Welded" }
     ]
   },
   {
@@ -336,12 +336,6 @@
     "id": "blacksmith_recipes_7",
     "building_type": "SMITH",
     "recipes": [
-      { "id": "sheet_metal_npc_drop", "description": " Craft: Sheet Metal, Drop Hammer" },
-      { "id": "chain_npc_drop", "description": " Craft: Chain, Drop Hammer" },
-      { "id": "nail_npc_drop", "description": " Craft: Nail, Drop Hammer" },
-      { "id": "wire_npc_drop", "description": " Craft: Wire, Drop Hammer" },
-      { "id": "pipe_npc_drop", "description": " Craft: Pipe, Drop Hammer" },
-      { "id": "rebar_npc_drop", "description": " Craft: Rebar, Drop Hammer" },
       { "id": "reloaded_9mmfmj", "description": " Craft: Ammo, 9x19mm FMJ" },
       { "id": "reloaded_40fmj", "description": " Craft: Ammo, S&W .40 FMJ" },
       { "id": "reloaded_45_acp", "description": " Craft: Ammo, .45 ACP FMJ" },
@@ -351,7 +345,13 @@
       { "id": "reloaded_5x50dart", "description": " Craft: Ammo, RA110 5x50mm flechette" },
       { "id": "reloaded_300_winmag", "description": " Craft: Ammo, .300 Winchester Magnum" },
       { "id": "reloaded_50bmg", "description": " Craft: Ammo, .50 BMG Match" },
-      { "id": "reloaded_shot_slug", "description": " Craft: Ammo, 00 shotgun slug" }
+      { "id": "reloaded_shot_slug", "description": " Craft: Ammo, 00 shotgun slug" },
+      { "id": "chain_npc_drop", "description": " Craft: Chain, Drop Hammer" },
+      { "id": "nail_npc_drop", "description": " Craft: Nail, Drop Hammer" },
+      { "id": "pipe_npc_drop", "description": " Craft: Pipe, Drop Hammer" },
+      { "id": "rebar_npc_drop", "description": " Craft: Rebar, Drop Hammer" },
+      { "id": "sheet_metal_npc_drop", "description": " Craft: Sheet Metal, Drop Hammer" },
+      { "id": "wire_npc_drop", "description": " Craft: Wire, Drop Hammer" }
     ]
   }
 ]
-- 
cgit v1.2.1