Add item declarations for non-craftable MC items

* Update the `convert-nei-dump` script to avoid overwriting an
  `mod-version.cg` file and to only add those items which are missing

scripts/convert-nei-dump

@@ -32,9 +32,6 @@ if [[ "$SOURCE_DIR" == "" || "$TARGET_DIR" == "" ]]; then
     die
 fi
 
-echo "schema: 1" > $DATA_FILE
-echo "" >> $DATA_FILE
-
 mkdir -p $TARGET_DIR/images
 ls $SOURCE_DIR/itempanel_icons | while read FILE; do
     ITEM_NAME="$(echo $FILE | sed 's/.png//')"
@@ -46,6 +43,8 @@ ls $SOURCE_DIR/itempanel_icons | while read FILE; do
         | tr '[A-Z]' '[a-z]' \
     ).png"
     cp "$SOURCE_DIR/itempanel_icons/$FILE" "$TARGET_DIR/images/$TARGET_FILE"
+    if ! grep -q "item: $ITEM_NAME$" $DATA_FILE; then
         echo "item: $ITEM_NAME" >> $DATA_FILE
         echo "" >> $DATA_FILE
+    fi
 done

src/data/industrial_craft_2/experimental-2.2.663/mod-version.cg

@@ -95,78 +95,97 @@ group: Agriculture
             input: Steak, Tin Can
             pattern: 101 111 111
             tools: Canning Machine
+            quantity: 8
         recipe:
             input: Cooked Porkchop, Tin Can
             pattern: 101 111 111
             tools: Canning Machine
+            quantity: 8
         recipe:
             input: Baked Potato, Tin Can
             pattern: .0. 111 111
             tools: Canning Machine
+            quantity: 6
         recipe:
             input: Cooked Chicken, Tin Can
             pattern: .0. 111 111
             tools: Canning Machine
+            quantity: 6
         recipe:
             input: Pumpkin Pie, Tin Can
             pattern: .0. 111 111
             tools: Canning Machine
+            quantity: 6
         recipe:
             input: Mushroom Stew, Tin Can
             pattern: .0. 111 111
             tools: Canning Machine
+            quantity: 6
         recipe:
             input: Bread, Tin Can
             pattern: ... 101 111
             tools: Canning Machine
+            quantity: 5
         recipe:
             input: Cooked Fish, Tin Can
             pattern: ... 101 111
             tools: Canning Machine
+            quantity: 5
         recipe:
             input: Carrot, Tin Can
             pattern: ... .01 111
             tools: Canning Machine
+            quantity: 4
         recipe:
             input: Apple, Tin Can
             pattern: ... .01 111
             tools: Canning Machine
+            quantity: 4
         recipe:
             input: Raw Beef, Tin Can
             pattern: ... .0. 111
             tools: Canning Machine
+            quantity: 3
         recipe:
             input: Raw Porkchop, Tin Can
             pattern: ... .0. 111
             tools: Canning Machine
+            quantity: 3
         recipe:
             input: Melon, Tin Can
             pattern: ... .0. 1.1
             tools: Canning Machine
+            quantity: 2
         recipe:
             input: Cookie, Tin Can
             pattern: ... .0. 1.1
             tools: Canning Machine
+            quantity: 2
         recipe:
             input: Raw Chicken, Tin Can
             pattern: ... .0. 1.1
             tools: Canning Machine
+            quantity: 2
         recipe:
             input: Raw Fish, Tin Can
             pattern: ... .0. 1.1
             tools: Canning Machine
+            quantity: 2
         recipe:
             input: Potato, Tin Can
             pattern: ... .0. .1.
             tools: Canning Machine
+            quantity: 1
         recipe:
             input: Poisonous Potato, Tin Can
             pattern: .0. .0. .1.
             tools: Canning Machine
+            quantity: 1
         recipe:
             input: Rotten Flesh, Tin Can
             pattern: .0. .0. .1.
             tools: Canning Machine
+            quantity: 1
 
     item: Grin Powder
         recipe:

src/data/minecraft/1.7.10/mod-version.cg

@@ -2,6 +2,8 @@ schema: 1
 
 group: Agriculture
 
+    item: Apple
+
     item: Baked Potato
         recipe:
             input: Potato, furnace fuel
@@ -26,6 +28,8 @@ group: Agriculture
             pattern: ... 000 ...
             tools: Crafting Table
 
+    item: Cactus
+
     item: Cake
         recipe:
             extras: 3 Bucket
@@ -33,6 +37,10 @@ group: Agriculture
             pattern: 111 202 333
             tools: Crafting Table
 
+    item: Carrot
+
+    item: Cocoa Beans
+
     item: Cookie
         recipe:
             input: Cocoa Beans, Wheat
@@ -70,6 +78,14 @@ group: Agriculture
             input: Bowl, Mushroom (brown), Mushroom (red)
             pattern: .2. .1. .0.
 
+    item: Nether Wart
+
+    item: Poisonous Potato
+
+    item: Potato
+
+    item: Pumpkin
+
     item: Pumpkin Pie
         recipe:
             input: Egg, Pumpkin, Sugar
@@ -81,11 +97,15 @@ group: Agriculture
             pattern: ... .0. ...
             quantity: 4
 
+    item: Seeds
+
     item: Sugar
         recipe:
             input: Sugar Canes
             pattern: ... .0. ...
 
+    item: Sugar Canes
+
     item: Wheat
         gatherable: yes
         recipe:
@@ -501,6 +521,10 @@ group: Enchanting
             pattern: 111 000 111
             tools: Crafting Table
 
+    item: Bottle o' Enchanting
+
+    item: Enchanted Book
+
     item: Enchantment Table
         recipe:
             input: Book, Diamond, Obsidian
@@ -534,6 +558,8 @@ group: Functional Blocks
             pattern: 000 0.0 000
             tools: Crafting Table
 
+    item: Command Block
+
     item: Crafting Table
         recipe:
             input: Oak Wood Planks
@@ -563,6 +589,14 @@ group: Functional Blocks
             pattern: 111 101 111
             tools: Crafting Table
 
+    item: Ladder
+        recipe:
+            input: Stick
+            pattern: 0.0 000 0.0
+            tools: Crafting Table
+
+    item: Monster Spawner
+
     item: Note Block
         recipe:
             input: Oak Wood Planks, Redstone
@@ -850,6 +884,8 @@ group: Glass
 
 group: Husbandry
 
+    item: Clownfish
+
     item: Cooked Chicken
         recipe:
             input: Raw Chicken, furnace fuel
@@ -874,6 +910,10 @@ group: Husbandry
             pattern: .0. ... .1.
             tools: Furnace
 
+    item: Egg
+
+    item: Feather
+
     item: Hay Bale
         recipe:
             input: Wheat
@@ -887,12 +927,24 @@ group: Husbandry
             quantity: 2
             tools: Crafting Table
 
+    item: Leather
+
     item: Milk
         recipe:
             input: Bucket
             pattern: ... .0. ...
             tools: Cow
 
+    item: Raw Beef
+
+    item: Raw Chicken
+
+    item: Raw Fish
+
+    item: Raw Porkchop
+
+    item: Raw Salmon
+
     item: Steak
         recipe:
             input: Raw Beef, furnace fuel
@@ -982,6 +1034,14 @@ group: Husbandry: Wool
             input: Dandelion Yellow, Wool
             pattern: ... .0. .1.
 
+group: Liquids
+
+    item: Lava
+
+    item: Water
+
+    item: Fire
+
 group: Minerals
 
     item: Block of Coal
@@ -1039,6 +1099,8 @@ group: Minerals
             pattern: ... .0. ...
             quantity: 9
 
+    item: Coal Ore
+
     item: Diamond
         gatherable: yes
         recipe:
@@ -1046,6 +1108,8 @@ group: Minerals
             pattern: ... .0. ...
             quantity: 9
 
+    item: Diamond Ore
+
     item: Emerald
         gatherable: yes
         recipe:
@@ -1057,11 +1121,15 @@ group: Minerals
             pattern: .0. ... .1.
             tools: Furnace
 
+    item: Emerald Ore
+
     item: Glowstone
         recipe:
             input: Glowstone Dust
             pattern: 00. 00. ...
 
+    item: Glowstone Dust
+
     item: Gold Ingot
         recipe:
             input: Gold Ore, furnace fuel
@@ -1082,6 +1150,8 @@ group: Minerals
             pattern: ... .0. ...
             quantity: 9
 
+    item: Gold Ore
+
     item: Ice
         gatherable: yes
 
@@ -1095,6 +1165,8 @@ group: Minerals
             pattern: ... .0. ...
             quantity: 9
 
+    item: Iron Ore
+
     item: Lapis Lazuli
         gatherable: yes
         recipe:
@@ -1108,6 +1180,8 @@ group: Minerals
             pattern: 000 000 000
             tools: Crafting Table
 
+    item: Lapis Lazuli Ore
+
     item: Nether Quartz
         gatherable: yes
         recipe:
@@ -1115,6 +1189,10 @@ group: Minerals
             pattern: .0. ... .1.
             tools: Furnace
 
+    item: Nether Quartz Ore
+
+    item: Packed Ice
+
     item: Redstone
         gatherable: yes
         recipe:
@@ -1126,6 +1204,8 @@ group: Minerals
             pattern: ... .0. ...
             quantity: 9
 
+    item: Redstone Ore
+
     item: Sandstone
         recipe:
             input: Sand
@@ -1146,11 +1226,90 @@ group: Minerals
     item: Snowball
         gatherable: yes
 
-    item: Stone
-        recipe:
-            input: Cobblestone, furnace fuel
-            pattern: .0. ... .1.
-            tools: Furnace
+group: Mob Drops
+
+    item: Blaze Rod
+
+    item: Bone
+
+    item: Cobweb
+
+    item: Creeper Head
+
+    item: Dragon Egg
+
+    item: Ender Pearl
+
+    item: Ghast Tear
+
+    item: Gunpowder
+
+    item: Head
+
+    item: Ink Sac
+
+    item: Nether Star
+
+    item: Rotten Flesh
+
+    item: Skeleton Skull
+
+    item: Slimeball
+
+    item: Spider Eye
+
+    item: String
+        gatherable: yes
+
+    item: Wither Skeleton Skull
+
+    item: Zombie Head
+
+group: Plants
+
+    item: Allium
+
+    item: Azure Bluet
+
+    item: Blue Orchid
+
+    item: Dandelion
+
+    item: Dead Bush
+
+    item: Double Tallgrass
+
+    item: Fern
+
+    item: Grass
+
+    item: Large Fern
+
+    item: Lilac
+
+    item: Lily Pad
+
+    item: Orange Tulip
+
+    item: Oxeye Daisy
+
+    item: Peony
+
+    item: Pink Tulip
+
+    item: Poppy
+
+    item: Red Tulip
+
+    item: Rose Bush
+
+    item: Sponge
+
+    item: Sunflower
+
+    item: Vines
+
+    item: White Tulip
 
 group: Potions: Brewing
 
@@ -1222,6 +1381,8 @@ group: Potions: Brewing
             quantity: 3
             tools: Brewing Stand
 
+    item: Pufferfish
+
     item: Water Bottle
         recipe:
             input: Glass Bottle
@@ -1786,7 +1947,63 @@ group: Redstone Machines
             input: Gold Ingot
             pattern: ... 00. ...
 
-group: Stone
+group: Spawn Eggs
+
+    item: Spawn Bat
+
+    item: Spawn Blaze
+
+    item: Spawn Cave Spider
+
+    item: Spawn Chicken
+
+    item: Spawn Cow
+
+    item: Spawn Creeper
+
+    item: Spawn Enderman
+
+    item: Spawn Ghast
+
+    item: Spawn Horse
+
+    item: Spawn Iron Golem
+
+    item: Spawn Magma Cube
+
+    item: Spawn Mooshroom
+
+    item: Spawn Ocelot
+
+    item: Spawn Pig
+
+    item: Spawn Sheep
+
+    item: Spawn Silverfish
+
+    item: Spawn Skeleton
+
+    item: Spawn Slime
+
+    item: Spawn Snow Golem
+
+    item: Spawn Spider
+
+    item: Spawn Squid
+
+    item: Spawn Villager
+
+    item: Spawn Witch
+
+    item: Spawn Wolf
+
+    item: Spawn Zombie
+
+    item: Spawn Zombie Pigman
+
+group: Earth Materials
+
+    item: Bedrock
 
     item: Brick
         recipe:
@@ -1823,6 +2040,10 @@ group: Stone
             input: Sandstone Slab
             pattern: ... .0. .0.
 
+    item: Chiseled Stone Bricks
+
+    item: Cobblestone
+
     item: Cobblestone Slab
         recipe:
             input: Cobblestone
@@ -1836,6 +2057,20 @@ group: Stone
             quantity: 6
             tools: Crafting Table
 
+    item: Cracked Stone Bricks
+
+    item: Dirt
+
+    item: End Stone
+
+    item: Flint
+
+    item: Grass Block
+
+    item: Gravel
+
+    item: Moss Stone
+
     item: Mossy Cobblestone Wall
         recipe:
             input: Moss Stone
@@ -1843,6 +2078,10 @@ group: Stone
             quantity: 6
             tools: Crafting Table
 
+    item: Mossy Stone Bricks
+
+    item: Mycelium
+
     item: Nether Brick
         recipe:
             input: Netherrack, furnace fuel
@@ -1874,12 +2113,18 @@ group: Stone
             quantity: 4
             tools: Crafting Table
 
+    item: Netherrack
+
+    item: Obsidian
+
     item: Pillar Quartz Block
         recipe:
             input: Block of Quartz
             pattern: ... .0. .0.
             quantity: 2
 
+    item: Podzol
+
     item: Quartz Slab
         recipe:
             input: Block of Quartz
@@ -1894,6 +2139,10 @@ group: Stone
             quantity: 4
             tools: Crafting Table
 
+    item: Red Sand
+
+    item: Sand
+
     item: Sandstone Slab
         recipe:
             input: Sandstone
@@ -1914,6 +2163,14 @@ group: Stone
             pattern: 00. 00. ...
             quantity: 4
 
+    item: Soul Sand
+
+    item: Stone
+        recipe:
+            input: Cobblestone, furnace fuel
+            pattern: .0. ... .1.
+            tools: Furnace
+
     item: Stone Brick Stairs
         recipe:
             input: Stone Bricks
@@ -2025,6 +2282,8 @@ group: Tools
             input: Gunpowder, Paper
             pattern: ... .1. 000
 
+    item: Firework Star
+
     item: Fishing Rod
         recipe:
             input: Stick, String
@@ -2089,6 +2348,12 @@ group: Tools
             input: Bucket, Lava
             pattern: ... .1. .0.
 
+    item: Music Disc
+
+    item: Name Tag
+
+    item: Saddle
+
     item: Shears
         recipe:
             input: Iron Ingot
@@ -2124,9 +2389,6 @@ group: Tools
             pattern: .0. .1. .1.
             tools: Crafting Table
 
-    item: String
-        gatherable: yes
-    
     item: Water Bucket
         recipe:
             input: Bucket, Water
@@ -2156,6 +2418,8 @@ group: Tools
             pattern: .0. .1. .1.
             tools: Crafting Table
 
+    item: Written Book
+
 group: Tools: Armor
 
     item: Chain Boots
@@ -2206,12 +2470,16 @@ group: Tools: Armor
             pattern: 00. .1. .1.
             tools: Crafting Table
 
+    item: Diamond Horse Armor
+
     item: Diamond Leggings
         recipe:
             input: Diamond
             pattern: 000 0.0 0.0
             tools: Crafting Table
 
+    item: Gold Horse Armor
+
     item: Golden Boots
         recipe:
             input: Gold Ingot
@@ -2254,6 +2522,8 @@ group: Tools: Armor
             pattern: 000 0.0 ...
             tools: Crafting Table
 
+    item: Iron Horse Armor
+
     item: Iron Leggings
         recipe:
             input: Iron Ingot
@@ -2363,6 +2633,8 @@ group: Transportation
             input: Chest, Minecart
             pattern: ... .0. .1.
 
+    item: Minecart with Command Block
+
     item: Minecart with Furnace
         recipe:
             input: Furnace, Minecart
@@ -2394,6 +2666,12 @@ group: Transportation
 
 group: Wood
 
+    item: Acacia Leaves
+
+    item: Acacia Sapling
+
+    item: Acacia Wood
+
     item: Acacia Wood Planks
         recipe:
             input: Acacia Wood
@@ -2414,6 +2692,12 @@ group: Wood
             quantity: 4
             tools: Crafting Table
 
+    item: Birch Leaves
+
+    item: Birch Sapling
+
+    item: Birch Wood
+
     item: Birch Wood Planks
         recipe:
             input: Birch Wood
@@ -2434,6 +2718,12 @@ group: Wood
             quantity: 4
             tools: Crafting Table
 
+    item: Dark Oak Leaves
+
+    item: Dark Oak Sapling
+
+    item: Dark Oak Wood
+
     item: Dark Oak Wood Planks
         recipe:
             input: Dark Oak Wood
@@ -2454,6 +2744,12 @@ group: Wood
             quantity: 4
             tools: Crafting Table
 
+    item: Jungle Leaves
+
+    item: Jungle Sapling
+
+    item: Jungle Wood
+
     item: Jungle Wood Planks
         recipe:
             input: Jungle Wood
@@ -2474,6 +2770,12 @@ group: Wood
             quantity: 4
             tools: Crafting Table
 
+    item: Oak Leaves
+
+    item: Oak Sapling
+
+    item: Oak Wood
+
     item: Oak Wood Planks
         recipe:
             input: Oak Wood
@@ -2493,6 +2795,12 @@ group: Wood
             pattern: 0.. 00. 000
             quantity: 4
 
+    item: Spruce Leaves
+
+    item: Spruce Sapling
+
+    item: Spruce Wood
+
     item: Spruce Wood Planks
         recipe:
             input: Spruce Wood
@@ -2512,4 +2820,3 @@ group: Wood
             pattern: 0.. 00. 000
             quantity: 4
             tools: Crafting Table
-