4 files changed, 404 insertions, 404 deletions

diff --git a/Server/brewing.txt b/Server/brewing.txt
index af690d81e..41d70c5b5 100644
--- a/Server/brewing.txt
+++ b/Server/brewing.txt
@@ -142,13 +142,13 @@
 ## Negative ##
 
 # Potion of Harming
-8197 + fermentedspidereye = 8204
 8196 + fermentedspidereye = 8204
+8197 + fermentedspidereye = 8204
 8260 + fermentedspidereye = 8204
 
 # Potion of Harming II
-8229 + fermentedspidereye = 8236
 8228 + fermentedspidereye = 8236
+8229 + fermentedspidereye = 8236
 
 # Potion of Harming II
 8204 + glowstonedust = 8236
@@ -163,8 +163,8 @@
 8260 + glowstonedust = 8228
 
 # Potion of Slowness
-8195 + fermentedspidereye = 8202
 8194 + fermentedspidereye = 8202
+8195 + fermentedspidereye = 8202
 8203 + fermentedspidereye = 8202
 
 # Potion of Slowness (extended)
@@ -172,17 +172,17 @@
 8234 + redstonedust = 8266
 
 # Potion of Slowness (extended)
-8259 + fermentedspidereye = 8266
 8258 + fermentedspidereye = 8266
+8259 + fermentedspidereye = 8266
 8267 + fermentedspidereye = 8266
 
 # Potion of Weakness
-8201 + fermentedspidereye = 8200
 8193 + fermentedspidereye = 8200
+8201 + fermentedspidereye = 8200
 
 # Potion of Weakness (extended)
-8265 + fermentedspidereye = 8264
 8257 + fermentedspidereye = 8264
+8265 + fermentedspidereye = 8264
 
 # Potion of Weakness (extended)
 8200 + redstonedust = 8264
@@ -223,13 +223,13 @@
 ## Fermented Spider Eye ##
 
 # Potion of Harming (reverted)
-8261 + fermentedspidereye = 8268
 8260 + fermentedspidereye = 8268
+8261 + fermentedspidereye = 8268
 
 # Potion of Slowness (reverted)
-8227 + fermentedspidereye = 8234
 8226 + fermentedspidereye = 8234
+8227 + fermentedspidereye = 8234
 
 # Potion of Weakness (reverted)
-8233 + fermentedspidereye = 8232
 8225 + fermentedspidereye = 8232
+8233 + fermentedspidereye = 8232
diff --git a/Server/crafting.txt b/Server/crafting.txt
index 3e631fac7..d4331d648 100644
--- a/Server/crafting.txt
+++ b/Server/crafting.txt
@@ -43,19 +43,19 @@
 
 # Need to list each of the four log types, otherwise all logs would get converted into apple planks (^0)
 
-OakPlanks, 4     = OakLog, * 
-SprucePlanks, 4  = SpruceLog, *
-BirchPlanks, 4   = BirchLog, *
-JunglePlanks, 4  = JungleLog, *
 AcaciaPlanks, 4  = AcaciaLog, *
+BirchPlanks, 4   = BirchLog, *
+Chest            = Planks^-1, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
 DarkOakPlanks, 4 = DarkOakLog, *
+EnderChest       = EyeOfEnder,  2:2 | Obsidian, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
+Furnace          = Cobblestone, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
+JunglePlanks, 4  = JungleLog, *
+OakPlanks, 4     = OakLog, * 
+SprucePlanks, 4  = SpruceLog, *
 Stick, 4         = Planks^-1, 2:2, 2:3
 Torch, 4         = Stick, 1:2 | Coal^-1, 1:1
-Workbench        = Planks^-1, 1:1, 1:2, 2:1, 2:2
-Chest            = Planks^-1, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
 TrappedChest     = TripWireHook, 1:1 | Chest, 2:1
-EnderChest       = EyeOfEnder,  2:2 | Obsidian, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
-Furnace          = Cobblestone, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
+Workbench        = Planks^-1, 1:1, 1:2, 2:1, 2:2
 
 
 
@@ -64,100 +64,100 @@ Furnace          = Cobblestone, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
 #******************************************************#
 # Blocks
 #
-IronBlock               = IronIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-GoldBlock               = GoldIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+Andesite, 2             = Diorite, * | Cobblestone, *
+BookShelf               = Planks^-1, 1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
+BrickBlock              = Brick,     1:1, 1:2, 2:1, 2:2
+ChiseledQuartzBlock     = QuartzSlab, 1:1, 1:2
+ChiseledRedSandstone    = RedSandstoneSlab, 1:1, 1:2
+ClayBlock               = Clay,      1:1, 1:2, 2:1, 2:2
+CoalBlock               = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+CoarsedDirt, 4          = Dirt, 1:1, 2:2 | Gravel, 1:2, 2:1
+CoarsedDirt, 4          = Gravel, 1:1, 2:2 | Dirt, 1:2, 2:1
+DarkPrismarine          = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Inksac, 2:2
 DiamondBlock            = Diamond,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-LapisBlock              = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+Diorite, 2              = Cobblestone, * | NetherQuartz, *
 EmeraldBlock            = Emerald,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-RedstoneBlock           = RedstoneDust,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-CoalBlock               = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-QuartzBlock             = NetherQuartz, 1:1, 1:2, 2:1, 2:2
-NetherBrickBlock        = NetherBrick, 1:1, 1:2, 2:1, 2:2
 Glowstone               = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
-Wool                    = String,    1:1, 1:2, 2:1, 2:2
-TNT                     = Gunpowder, 1:1, 3:1, 2:2, 1:3, 3:3 | Sand, 2:1, 1:2, 3:2, 2:3
-PillarQuartzBlock, 2    = QuartzBlock, 1:1, 1:2
-ChiseledQuartzBlock     = QuartzSlab, 1:1, 1:2
-HayBale                 = Wheat, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-SnowBlock               = SnowBall,  1:1, 1:2, 2:1, 2:2
-ClayBlock               = Clay,      1:1, 1:2, 2:1, 2:2
-BrickBlock              = Brick,     1:1, 1:2, 2:1, 2:2
-PolishedGranite, 4      = Granite,   1:1, 1:2, 2:1, 2:2
-PolishedDiorite, 4      = Diorite,   1:1, 1:2, 2:1, 2:2
-PolishedAndesite, 4     = Andesite,  1:1, 1:2, 2:1, 2:2
+GoldBlock               = GoldIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 Granite, 2              = Diorite, * | NetherQuartz, *
-Diorite, 2              = Cobblestone, * | NetherQuartz, *
-Andesite, 2             = Diorite, * | Cobblestone, *
-StoneBrick, 4           = Stone,     1:1, 1:2, 2:1, 2:2
-BookShelf               = Planks^-1, 1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
-Sandstone               = Sand,      1:1, 1:2, 2:1, 2:2
-SmoothSandstone, 4      = Sandstone, 1:1, 1:2, 2:1, 2:2
-OrnamentSandstone       = SandstoneSlab, 1:1, 1:2
+HayBale                 = Wheat, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+IronBlock               = IronIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 JackOLantern            = Pumpkin, 1:1 | Torch, 1:2
-CoarsedDirt, 4          = Dirt, 1:1, 2:2 | Gravel, 1:2, 2:1
-CoarsedDirt, 4          = Gravel, 1:1, 2:2 | Dirt, 1:2, 2:1
-SlimeBlock              = Slimeball, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-Prismarine              = PrismarineShard, 1:1, 1:2, 2:1, 2:2
+LapisBlock              = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+Leather                 = RabbitHide, 1:1, 1:2, 2:1, 2:2
+MossyCobblestone        = Cobblestone, * | Vines, *
+MossyStoneBrick         = Stonebrick, * | Vines, *
+NetherBrickBlock        = NetherBrick, 1:1, 1:2, 2:1, 2:2
+OrnamentSandstone       = SandstoneSlab, 1:1, 1:2
+PillarQuartzBlock, 2    = QuartzBlock, 1:1, 1:2
+PolishedAndesite, 4     = Andesite,  1:1, 1:2, 2:1, 2:2
+PolishedDiorite, 4      = Diorite,   1:1, 1:2, 2:1, 2:2
+PolishedGranite, 4      = Granite,   1:1, 1:2, 2:1, 2:2
 PrismarineBricks        = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-DarkPrismarine          = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Inksac, 2:2
-SeaLantern              = PrismarineShard, 1:1, 1:3, 3:1, 3:3 | PrismarineCrystals, 1:2, 2:1, 2:2, 2:3, 3:2
+Prismarine              = PrismarineShard, 1:1, 1:2, 2:1, 2:2
+QuartzBlock             = NetherQuartz, 1:1, 1:2, 2:1, 2:2
 RedSandstone            = RedSand, 1:1, 1:2, 2:1, 2:2
-ChiseledRedSandstone    = RedSandstoneSlab, 1:1, 1:2
+RedstoneBlock           = RedstoneDust,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+Sandstone               = Sand,      1:1, 1:2, 2:1, 2:2
+SeaLantern              = PrismarineShard, 1:1, 1:3, 3:1, 3:3 | PrismarineCrystals, 1:2, 2:1, 2:2, 2:3, 3:2
+SlimeBlock              = Slimeball, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 SmoothRedSandstone, 4   = RedSandstone, 1:1, 1:2, 2:1, 2:2
-MossyStoneBrick         = Stonebrick, * | Vines, *
-MossyCobblestone        = Cobblestone, * | Vines, *
-Leather                 = RabbitHide, 1:1, 1:2, 2:1, 2:2
+SmoothSandstone, 4      = Sandstone, 1:1, 1:2, 2:1, 2:2
+SnowBlock               = SnowBall,  1:1, 1:2, 2:1, 2:2
+StoneBrick, 4           = Stone,     1:1, 1:2, 2:1, 2:2
+TNT                     = Gunpowder, 1:1, 3:1, 2:2, 1:3, 3:3 | Sand, 2:1, 1:2, 3:2, 2:3
+Wool                    = String,    1:1, 1:2, 2:1, 2:2
 
 # Slabs:
-StoneSlab,       6  = Stone,             1:1, 2:1, 3:1
-SandstoneSlab,   6  = Sandstone,         1:1, 2:1, 3:1
-SandstoneSlab,   6  = SmoothSandstone,   1:1, 2:1, 3:1
-SandstoneSlab,   6  = OrnamentSandstone, 1:1, 2:1, 3:1
-SpruceWoodSlab,  6  = SprucePlanks,      1:1, 2:1, 3:1
-BirchWoodSlab,   6  = BirchPlanks,       1:1, 2:1, 3:1
-JungleWoodSlab,  6  = JunglePlanks,      1:1, 2:1, 3:1
 AcaciaWoodSlab,  6  = AcaciaPlanks,      1:1, 2:1, 3:1
-DarkOakWoodSlab, 6  = DarkOakPlanks,     1:1, 2:1, 3:1
-OakWoodSlab,     6  = OakPlanks,         1:1, 2:1, 3:1
-CobblestoneSlab, 6  = Cobblestone,       1:1, 2:1, 3:1
+BirchWoodSlab,   6  = BirchPlanks,       1:1, 2:1, 3:1
 BrickSlab,       6  = BrickBlock,        1:1, 2:1, 3:1
-StonebrickSlab,  6  = StoneBrick,        1:1, 2:1, 3:1
+CobblestoneSlab, 6  = Cobblestone,       1:1, 2:1, 3:1
+DarkOakWoodSlab, 6  = DarkOakPlanks,     1:1, 2:1, 3:1
+JungleWoodSlab,  6  = JunglePlanks,      1:1, 2:1, 3:1
 NetherbrickSlab, 6  = NetherBrick,       1:1, 2:1, 3:1
+OakWoodSlab,     6  = OakPlanks,         1:1, 2:1, 3:1
 Quartzslab,      6  = QuartzBlock,       1:1, 2:1, 3:1
-SnowLayer,       6  = SnowBlock,         1:1, 2:1, 3:1
 RedSandstoneSlab, 6 = RedSandstone^-1,   1:1, 2:1, 3:1
+SandstoneSlab,   6  = OrnamentSandstone, 1:1, 2:1, 3:1
+SandstoneSlab,   6  = Sandstone,         1:1, 2:1, 3:1
+SandstoneSlab,   6  = SmoothSandstone,   1:1, 2:1, 3:1
+SnowLayer,       6  = SnowBlock,         1:1, 2:1, 3:1
+SpruceWoodSlab,  6  = SprucePlanks,      1:1, 2:1, 3:1
+StonebrickSlab,  6  = StoneBrick,        1:1, 2:1, 3:1
+StoneSlab,       6  = Stone,             1:1, 2:1, 3:1
 
 # Stairs:
-SpruceWoodStairs, 4  = SprucePlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-SpruceWoodStairs, 4  = SprucePlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-BirchWoodStairs, 4   = BirchPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-BirchWoodStairs, 4   = BirchPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-JungleWoodStairs, 4  = JunglePlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-JungleWoodStairs, 4  = JunglePlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 AcaciaWoodStairs, 4  = AcaciaPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 AcaciaWoodStairs, 4  = AcaciaPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-DarkOakWoodStairs, 4 = DarkOakPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-DarkOakWoodStairs, 4 = DarkOakPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-WoodStairs, 4        = OakPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-WoodStairs, 4        = OakPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-cobblestoneStairs, 4 = Cobblestone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-cobblestoneStairs, 4 = Cobblestone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+BirchWoodStairs, 4   = BirchPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+BirchWoodStairs, 4   = BirchPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 BrickStairs, 4       = BrickBlock,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 BrickStairs, 4       = BrickBlock,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-SandstoneStairs, 4   = Sandstone,   1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-SandstoneStairs, 4   = Sandstone,   3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-SandstoneStairs, 4   = SmoothSandstone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-SandstoneStairs, 4   = SmoothSandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-SandstoneStairs, 4   = OrnamentSandstone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-SandstoneStairs, 4   = OrnamentSandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+cobblestoneStairs, 4 = Cobblestone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+cobblestoneStairs, 4 = Cobblestone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+DarkOakWoodStairs, 4 = DarkOakPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+DarkOakWoodStairs, 4 = DarkOakPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+JungleWoodStairs, 4  = JunglePlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+JungleWoodStairs, 4  = JunglePlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 NetherBrickStairs, 4 = NetherBrick, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 NetherBrickStairs, 4 = NetherBrick, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 quartzstairs, 4      = QuartzBlock, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 quartzstairs, 4      = QuartzBlock, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-StoneBrickStairs, 4  = StoneBrick,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-StoneBrickStairs, 4  = StoneBrick,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 RedSandstoneStairs, 4 = RedSandstone^-1,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 RedSandstoneStairs, 4 = RedSandstone^-1,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+SandstoneStairs, 4   = OrnamentSandstone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+SandstoneStairs, 4   = OrnamentSandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+SandstoneStairs, 4   = Sandstone,   1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+SandstoneStairs, 4   = Sandstone,   3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+SandstoneStairs, 4   = SmoothSandstone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+SandstoneStairs, 4   = SmoothSandstone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+SpruceWoodStairs, 4  = SprucePlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+SpruceWoodStairs, 4  = SprucePlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+StoneBrickStairs, 4  = StoneBrick,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+StoneBrickStairs, 4  = StoneBrick,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+WoodStairs, 4        = OakPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+WoodStairs, 4        = OakPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 
 
 
@@ -166,49 +166,49 @@ RedSandstoneStairs, 4 = RedSandstone^-1,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 #
 
 # Axes:
-WoodenAxe  = Stick, 2:2, 2:3 | Planks^-1,   2:1, 1:1, 1:2
-WoodenAxe  = Stick, 2:2, 2:3 | Planks^-1,   2:1, 3:1, 3:2
-StoneAxe   = Stick, 2:2, 2:3 | Cobblestone, 2:1, 1:1, 1:2
-StoneAxe   = Stick, 2:2, 2:3 | Cobblestone, 2:1, 3:1, 3:2
+DiamondAxe = Stick, 2:2, 2:3 | Diamond,     2:1, 1:1, 1:2
+DiamondAxe = Stick, 2:2, 2:3 | Diamond,     2:1, 3:1, 3:2
 GoldenAxe  = Stick, 2:2, 2:3 | GoldIngot,   2:1, 1:1, 1:2
 GoldenAxe  = Stick, 2:2, 2:3 | GoldIngot,   2:1, 3:1, 3:2
 IronAxe    = Stick, 2:2, 2:3 | IronIngot,   2:1, 1:1, 1:2
 IronAxe    = Stick, 2:2, 2:3 | IronIngot,   2:1, 3:1, 3:2
-DiamondAxe = Stick, 2:2, 2:3 | Diamond,     2:1, 1:1, 1:2
-DiamondAxe = Stick, 2:2, 2:3 | Diamond,     2:1, 3:1, 3:2
+StoneAxe   = Stick, 2:2, 2:3 | Cobblestone, 2:1, 1:1, 1:2
+StoneAxe   = Stick, 2:2, 2:3 | Cobblestone, 2:1, 3:1, 3:2
+WoodenAxe  = Stick, 2:2, 2:3 | Planks^-1,   2:1, 1:1, 1:2
+WoodenAxe  = Stick, 2:2, 2:3 | Planks^-1,   2:1, 3:1, 3:2
 
 # Pickaxes:
-WoodenPickaxe  = Stick, 2:2, 2:3 | Planks^-1,   1:1, 2:1, 3:1
-StonePickaxe   = Stick, 2:2, 2:3 | Cobblestone, 1:1, 2:1, 3:1
+DiamondPickaxe = Stick, 2:2, 2:3 | Diamond,     1:1, 2:1, 3:1
 GoldenPickaxe  = Stick, 2:2, 2:3 | GoldIngot,   1:1, 2:1, 3:1
 IronPickaxe    = Stick, 2:2, 2:3 | IronIngot,   1:1, 2:1, 3:1
-DiamondPickaxe = Stick, 2:2, 2:3 | Diamond,     1:1, 2:1, 3:1
+StonePickaxe   = Stick, 2:2, 2:3 | Cobblestone, 1:1, 2:1, 3:1
+WoodenPickaxe  = Stick, 2:2, 2:3 | Planks^-1,   1:1, 2:1, 3:1
 
 # Shovels:
-WoodenShovel  = Stick, 2:2, 2:3 | Planks^-1,   2:1
-StoneShovel   = Stick, 2:2, 2:3 | Cobblestone, 2:1
+DiamondShovel = Stick, 2:2, 2:3 | Diamond,     2:1
 GoldenShovel  = Stick, 2:2, 2:3 | GoldIngot,   2:1
 IronShovel    = Stick, 2:2, 2:3 | IronIngot,   2:1
-DiamondShovel = Stick, 2:2, 2:3 | Diamond,     2:1
+StoneShovel   = Stick, 2:2, 2:3 | Cobblestone, 2:1
+WoodenShovel  = Stick, 2:2, 2:3 | Planks^-1,   2:1
 
 # Hoes:
-WoodenHoe  = Stick, 2:2, 2:3 | Planks^-1,   2:1, *:1
-StoneHoe   = Stick, 2:2, 2:3 | Cobblestone, 2:1, *:1
+DiamondHoe = Stick, 2:2, 2:3 | Diamond,     2:1, *:1
 GoldenHoe  = Stick, 2:2, 2:3 | GoldIngot,   2:1, *:1
 IronHoe    = Stick, 2:2, 2:3 | IronIngot,   2:1, *:1
-DiamondHoe = Stick, 2:2, 2:3 | Diamond,     2:1, *:1
+StoneHoe   = Stick, 2:2, 2:3 | Cobblestone, 2:1, *:1
+WoodenHoe  = Stick, 2:2, 2:3 | Planks^-1,   2:1, *:1
 
-Lighter        = IronIngot, *                  | Flint, *
 Bucket         = IronIngot, 1:1, 2:2, 3:1
 Compass        = IronIngot, 2:1, 1:2, 3:2, 2:3 | RedstoneDust, 2:2
 EmptyMap       = Paper,     1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Compass, 2:2
-Watch          = GoldIngot, 2:1, 1:2, 3:2, 2:3 | RedstoneDust, 2:2
+FireCharge, 3  = BlazePowder, *   | Coal, *    | Gunpowder, *
 FishingRod     = Stick, 1:3, 2:2, 3:1          | String, 3:2, 3:3
 FishingRod     = Stick, 3:3, 2:2, 1:1          | String, 1:2, 1:3
+Lead, 2        = String, 1:1, 1:2, 2:1, 3:3    | Slimeball, 2:2
+Lighter        = IronIngot, *                  | Flint, *
 Shears         = IronIngot, 1:1, 2:2
 Shears         = IronIngot, 2:1, 1:2
-FireCharge, 3  = BlazePowder, *   | Coal, *    | Gunpowder, *
-Lead, 2        = String, 1:1, 1:2, 2:1, 3:3    | Slimeball, 2:2
+Watch          = GoldIngot, 2:1, 1:2, 3:2, 2:3 | RedstoneDust, 2:2
 
 
 
@@ -217,14 +217,14 @@ Lead, 2        = String, 1:1, 1:2, 2:1, 3:3    | Slimeball, 2:2
 #******************************************************#
 # Weapons
 #
-WoodenSword    = Stick, 2:3 | Planks^-1,   2:1, 2:2
-StoneSword     = Stick, 2:3 | Cobblestone, 2:1, 2:2
-GoldenSword    = Stick, 2:3 | GoldIngot,   2:1, 2:2
-IronSword      = Stick, 2:3 | IronIngot,   2:1, 2:2
-DiamondSword   = Stick, 2:3 | Diamond,     2:1, 2:2
+Arrow, 4       = Flint, 1:1             | Stick, 1:2       | Feather, 1:3
 Bow            = Stick, 2:1, 1:2, 2:3   | String, 3:1, 3:2, 3:3
 Bow            = Stick, 2:1, 3:2, 2:3   | String, 1:1, 1:2, 1:3
-Arrow, 4       = Flint, 1:1             | Stick, 1:2       | Feather, 1:3
+DiamondSword   = Stick, 2:3 | Diamond,     2:1, 2:2
+GoldenSword    = Stick, 2:3 | GoldIngot,   2:1, 2:2
+IronSword      = Stick, 2:3 | IronIngot,   2:1, 2:2
+StoneSword     = Stick, 2:3 | Cobblestone, 2:1, 2:2
+WoodenSword    = Stick, 2:3 | Planks^-1,   2:1, 2:2
 
 
 
@@ -236,32 +236,32 @@ Arrow, 4       = Flint, 1:1             | Stick, 1:2       | Feather, 1:3
 #
 
 # Helmets:
-LeatherHelmet    = Leather,   1:1, 2:1, 3:1, 1:2, 3:2
 ChainmailHelmet  = Fire,      1:1, 2:1, 3:1, 1:2, 3:2
+DiamondHelmet    = Diamond,   1:1, 2:1, 3:1, 1:2, 3:2
 GoldenHelmet     = GoldIngot, 1:1, 2:1, 3:1, 1:2, 3:2
 IronHelmet       = IronIngot, 1:1, 2:1, 3:1, 1:2, 3:2
-DiamondHelmet    = Diamond,   1:1, 2:1, 3:1, 1:2, 3:2
+LeatherHelmet    = Leather,   1:1, 2:1, 3:1, 1:2, 3:2
 
 # Chestplates:
-LeatherChestplate    = Leather,   1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 2:3, 3:3
 ChainmailChestplate  = Fire,      1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 2:3, 3:3
+DiamondChestplate    = Diamond,   1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 2:3, 3:3
 GoldenChestplate     = GoldIngot, 1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 2:3, 3:3
 IronChestplate       = IronIngot, 1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 2:3, 3:3
-DiamondChestplate    = Diamond,   1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 2:3, 3:3
+LeatherChestplate    = Leather,   1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 2:3, 3:3
 
 # Leggins:
-LeatherPants     = Leather,   1:1, 2:1, 3:1, 1:2, 3:2, 1:3, 3:3
 ChainmailPants   = Fire,      1:1, 2:1, 3:1, 1:2, 3:2, 1:3, 3:3
+DiamondPants     = Diamond,   1:1, 2:1, 3:1, 1:2, 3:2, 1:3, 3:3
 GoldenPants      = GoldIngot, 1:1, 2:1, 3:1, 1:2, 3:2, 1:3, 3:3
 IronPants        = IronIngot, 1:1, 2:1, 3:1, 1:2, 3:2, 1:3, 3:3
-DiamondPants     = Diamond,   1:1, 2:1, 3:1, 1:2, 3:2, 1:3, 3:3
+LeatherPants     = Leather,   1:1, 2:1, 3:1, 1:2, 3:2, 1:3, 3:3
 
 # Boots:
-LeatherBoots     = Leather,   1:1, 3:1, 1:2, 3:2
 ChainmailBoots   = Fire,      1:1, 3:1, 1:2, 3:2
+DiamondBoots     = Diamond,   1:1, 3:1, 1:2, 3:2
 GoldenBoots      = GoldIngot, 1:1, 3:1, 1:2, 3:2
 IronBoots        = IronIngot, 1:1, 3:1, 1:2, 3:2
-DiamondBoots     = Diamond,   1:1, 3:1, 1:2, 3:2
+LeatherBoots     = Leather,   1:1, 3:1, 1:2, 3:2
 
 
 
@@ -270,17 +270,17 @@ DiamondBoots     = Diamond,   1:1, 3:1, 1:2, 3:2
 #******************************************************#
 # Transportation
 #
+ActivatorRail, 6 = IronIngot, 1:1, 1:2, 1:3, 3:1, 3:2, 3:3 | Stick, 2:1, 2:3 | RedstoneTorchon, 2:2
+Boat             = Planks^-1, 1:1, 3:1, 1:2, 2:2, 3:2
 CarrotOnAStick   = FishingRod, 1:2 | Carrot, 2:3
+DetectorRail, 6  = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | StonePlate, 2:2 | RedstoneDust, 2:3
+hopperminecart   = Minecart, * | Hopper, *
 Minecart         = IronIngot, 1:1, 3:1, 1:2, 2:2, 3:2
 PoweredMinecart  = Minecart, * | Furnace, *
+PoweredRail, 6   = GoldIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | Stick, 2:2      | RedstoneDust, 2:3
+Rails, 16        = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | Stick, 2:2
 StorageMinecart  = Minecart, * | Chest, *
 TNTMinecart      = Minecart, * | TNT, *
-hopperminecart   = Minecart, * | Hopper, *
-Rails, 16        = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | Stick, 2:2
-PoweredRail, 6   = GoldIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | Stick, 2:2      | RedstoneDust, 2:3
-DetectorRail, 6  = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 3:3 | StonePlate, 2:2 | RedstoneDust, 2:3
-Boat             = Planks^-1, 1:1, 3:1, 1:2, 2:2, 3:2
-ActivatorRail, 6 = IronIngot, 1:1, 1:2, 1:3, 3:1, 3:2, 3:3 | Stick, 2:1, 2:3 | RedstoneTorchon, 2:2
 
 
 
@@ -288,35 +288,35 @@ ActivatorRail, 6 = IronIngot, 1:1, 1:2, 1:3, 3:1, 3:2, 3:3 | Stick, 2:1, 2:3 | R
 #******************************************************#
 # Mechanisms
 #
-SpruceDoor, 3    = SprucePlanks,  1:1, 1:2, 1:3, 2:1, 2:2, 2:3
-BirchDoor, 3     = BirchPlanks,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3
-JungleDoor, 3    = JunglePlanks,  1:1, 1:2, 1:3, 2:1, 2:2, 2:3
 AcaciaDoor, 3    = AcaciaPlanks,  1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+BirchDoor, 3     = BirchPlanks,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+Comparator       = RedstoneTorchOn, 2:1, 1:2, 3:2   | NetherQuartz, 2:2 | Stone, 1:3, 2:3, 3:3
 DarkOakDoor, 3   = DarkOakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
-WoodenDoor, 3    = OakPlanks,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+DaylightSensor   = Glass, 1:1, 2:1, 3:1             | NetherQuartz, 1:2, 2:2, 3:2 | WoodenSlab^-1, 1:3, 2:3, 3:3
+Dispenser        = Cobblestone, 1:1, 1:2, 1:3, 2:1, 3:1, 3:2, 3:3      | RedstoneDust, 2:3  | Bow, 2:2
+Dropper          = Cobblestone, 1:1, 2:1, 3:1, 1:2, 1:3, 3:2, 3:3 | Hopper, 2:2 | RedstoneDust, 2:3
+heavyweightedpressureplate = IronIngot, 1:1, 2:1
+Hopper           = IronIngot, 1:1, 3:1, 1:2, 3:2, 2:3 | Chest, 2:2
 IronDoor, 3      = IronIngot, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
-TrapDoor, 2      = Planks^-1, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
 IronTrapDoor     = IronIngot, 1:1, 1:2, 2:1, 2:2
-WoodPlate        = Planks^-1, 1:1, 2:1
-StonePlate       = Stone,     1:1, 2:1
-lightweightedpressureplate = GoldIngot, 1:1, 2:1
-heavyweightedpressureplate = IronIngot, 1:1, 2:1
-StoneButton      = Stone,     1:1
-WoodenButton     = Planks^-1, 1:1
-RedstoneTorchOn  = Stick, 1:2        | RedstoneDust, 1:1
+Jukebox          = Planks^-1,   1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Diamond,      2:2
+JungleDoor, 3    = JunglePlanks,  1:1, 1:2, 1:3, 2:1, 2:2, 2:3
 Lever            = Cobblestone, 1:2  | Stick, 1:1
+lightweightedpressureplate = GoldIngot, 1:1, 2:1
 NoteBlock        = Planks^-1,   1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | RedstoneDust, 2:2
-Jukebox          = Planks^-1,   1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Diamond,      2:2
-Dispenser        = Cobblestone, 1:1, 1:2, 1:3, 2:1, 3:1, 3:2, 3:3      | RedstoneDust, 2:3  | Bow, 2:2
-Dropper          = Cobblestone, 1:1, 2:1, 3:1, 1:2, 1:3, 3:2, 3:3 | Hopper, 2:2 | RedstoneDust, 2:3
-Repeater         = Stone,  1:2, 2:2, 3:2            | RedstoneTorchOn, 1:1, 3:1 | RedstoneDust, 2:1
-Comparator       = RedstoneTorchOn, 2:1, 1:2, 3:2   | NetherQuartz, 2:2 | Stone, 1:3, 2:3, 3:3
-DaylightSensor   = Glass, 1:1, 2:1, 3:1             | NetherQuartz, 1:2, 2:2, 3:2 | WoodenSlab^-1, 1:3, 2:3, 3:3
-Hopper           = IronIngot, 1:1, 3:1, 1:2, 3:2, 2:3 | Chest, 2:2
 Piston           = Planks^-1, 1:1, 2:1, 3:1 | RedstoneDust, 2:3 | Cobblestone, 1:2, 3:2, 1:3, 3:3 | IronIngot, 2:2
-StickyPiston     = Piston, * | SlimeBall, *
 RedstoneLamp     = RedstoneDust, 2:1, 1:2, 3:2, 2:3 | Glowstone, 2:2
+RedstoneTorchOn  = Stick, 1:2        | RedstoneDust, 1:1
+Repeater         = Stone,  1:2, 2:2, 3:2            | RedstoneTorchOn, 1:1, 3:1 | RedstoneDust, 2:1
+SpruceDoor, 3    = SprucePlanks,  1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+StickyPiston     = Piston, * | SlimeBall, *
+StoneButton      = Stone,     1:1
+StonePlate       = Stone,     1:1, 2:1
+TrapDoor, 2      = Planks^-1, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
 TripwireHook, 2  = Planks^-1, 2:3 | stick, 2:2 | IronIngot, 2:1
+WoodenButton     = Planks^-1, 1:1
+WoodenDoor, 3    = OakPlanks,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+WoodPlate        = Planks^-1, 1:1, 2:1
 
 
 
@@ -326,20 +326,20 @@ TripwireHook, 2  = Planks^-1, 2:3 | stick, 2:2 | IronIngot, 2:1
 # Food
 #
 Bowl, 4              = Planks^-1, 1:1, 2:2, 3:1
-MushroomStew         = Bowl, * | BrownMushroom, * | RedMushroom, *
 Bread                = Wheat, 1:1, 2:1, 3:1
-Sugar                = Sugarcane, *
 Cake                 = MilkBucket, 1:1, 2:1, 3:1 | Sugar, 1:2, 3:2 | Egg, 2:2 | Wheat, 1:3, 2:3, 3:3
 Cookie, 8            = Wheat, *, * | CocoaBeans, *
-GoldenApple          = RedApple, 2:2 | GoldIngot, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
 EnchantedGoldenApple = RedApple, 2:2 | GoldBlock, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
+GoldenApple          = RedApple, 2:2 | GoldIngot, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
 Melon                = MelonSlice, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 MelonSeeds           = MelonSlice, *
-PumpkinSeeds, 4      = Pumpkin, *
+MushroomStew         = Bowl, * | BrownMushroom, * | RedMushroom, *
 PumpkinPie           = Pumpkin, * | Sugar, * | egg, *
-Wheat, 9             = Haybale, *
+PumpkinSeeds, 4      = Pumpkin, *
 RabbitStew           = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato, 2:2 | BrownMushroom, 3:2 | Bowl, 2:3
 RabbitStew           = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato, 2:2 | RedMushroom, 3:2 | Bowl, 2:3
+Sugar                = Sugarcane, *
+Wheat, 9             = Haybale, *
 
 
 
@@ -350,68 +350,68 @@ RabbitStew           = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato, 2:2 | Red
 #
 
 # Minerals:
-IronIngot, 9    = IronBlock, *
-GoldIngot, 9    = GoldBlock, *
+Clay, 4         = ClayBlock, *
+Coal, 9         = CoalBlock, *
 Diamond, 9      = DiamondBlock, *
-LapisLazuli, 9  = LapisBlock, *
 Emerald, 9      = EmeraldBlock, *
+GoldIngot, 9    = GoldBlock, *
+IronIngot, 9    = IronBlock, *
+LapisLazuli, 9  = LapisBlock, *
 RedstoneDust, 9 = RedstoneBlock, *
-Coal, 9         = CoalBlock, *
-Clay, 4         = ClayBlock, *
 SlimeBall, 9    = SlimeBlock, *
 
-Painting            = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Wool^-1, 2:2
-ItemFrame           = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Leather, 2:2
-Sign, 3             = Planks^-1, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2         | Stick, 2:3
-Ladder, 3           = Stick, 1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 3:3
-GlassPane, 16       = Glass,     1:1, 2:1, 3:1, 1:2, 2:2, 3:2
-IronBars, 16        = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
-Paper, 3            = Sugarcane, 1:1, 2:1, 3:1
-Book                = Paper, *, *, * | leather, *
-Bookandquill        = Book, * | feather, * | inksac, *
-SpruceFence, 3      = SprucePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+AcaciaFence, 3      = AcaciaPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+AcaciaFenceGate     = Stick,       1:1, 1:2, 3:1, 3:2  | AcaciaPlanks, 2:1, 2:2
+Anvil               = IronBlock, 1:1, 2:1, 3:1 | IronIngot, 2:2, 1:3, 2:3, 3:3
+ArmorStand          = Stick, 1:1, 1:3, 2:1, 2:2, 3:1, 3:3 | StoneSlab, 2:3
+Beacon              = Glass, 1:1, 1:2, 2:1, 3:1, 3:2 | Obsidian, 1:3, 2:3, 3:3 | NetherStar, 2:2
+Bed                 = Planks^-1,   1:2, 2:2, 3:2       | Wool^-1,   1:1, 2:1, 3:1
 BirchFence, 3       = BirchPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
-JungleFence, 3      = JunglePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+BirchFenceGate      = Stick,       1:1, 1:2, 3:1, 3:2  | BirchPlanks, 2:1, 2:2
+Bookandquill        = Book, * | feather, * | inksac, *
+Book                = Paper, *, *, * | leather, *
+Cobblestonewall, 6  = cobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 DarkOakFence, 3     = DarkOakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
-AcaciaFence, 3      = AcaciaPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+DarkOakFenceGate    = Stick,       1:1, 1:2, 3:1, 3:2  | DarkOakPlanks, 2:1, 2:2
+EyeOfEnder          = EnderPearl, *                 | BlazePowder, *
 Fence, 3            = OakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
-Cobblestonewall, 6  = cobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+FenceGate           = Stick,       1:1, 1:2, 3:1, 3:2  | OakPlanks, 2:1, 2:2
+FlowerPot           = Brick, 1:2, 2:3, 3:2
+GlassPane, 16       = Glass,     1:1, 2:1, 3:1, 1:2, 2:2, 3:2
+GoldIngot           = GoldNugget, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+IronBars, 16        = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
+ItemFrame           = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Leather, 2:2
+JungleFence, 3      = JunglePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+JungleFenceGate     = Stick,       1:1, 1:2, 3:1, 3:2  | JunglePlanks, 2:1, 2:2
+Ladder, 3           = Stick, 1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 3:3
 mossycobblestonewall, 6  = mossycobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 NetherBrickFence, 6 = NetherBrick, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
+Painting            = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Wool^-1, 2:2
+Paper, 3            = Sugarcane, 1:1, 2:1, 3:1
+Sign, 3             = Planks^-1, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2         | Stick, 2:3
+SpruceFence, 3      = SprucePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
 SpruceFenceGate     = Stick,       1:1, 1:2, 3:1, 3:2  | SprucePlanks, 2:1, 2:2
-BirchFenceGate      = Stick,       1:1, 1:2, 3:1, 3:2  | BirchPlanks, 2:1, 2:2
-JungleFenceGate     = Stick,       1:1, 1:2, 3:1, 3:2  | JunglePlanks, 2:1, 2:2
-DarkOakFenceGate    = Stick,       1:1, 1:2, 3:1, 3:2  | DarkOakPlanks, 2:1, 2:2
-AcaciaFenceGate     = Stick,       1:1, 1:2, 3:1, 3:2  | AcaciaPlanks, 2:1, 2:2
-FenceGate           = Stick,       1:1, 1:2, 3:1, 3:2  | OakPlanks, 2:1, 2:2
-Bed                 = Planks^-1,   1:2, 2:2, 3:2       | Wool^-1,   1:1, 2:1, 3:1
-GoldIngot           = GoldNugget, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-EyeOfEnder          = EnderPearl, *                 | BlazePowder, *
-Beacon              = Glass, 1:1, 1:2, 2:1, 3:1, 3:2 | Obsidian, 1:3, 2:3, 3:3 | NetherStar, 2:2
-Anvil               = IronBlock, 1:1, 2:1, 3:1 | IronIngot, 2:2, 1:3, 2:3, 3:3
-FlowerPot           = Brick, 1:2, 2:3, 3:2
-ArmorStand          = Stick, 1:1, 1:3, 2:1, 2:2, 3:1, 3:3 | StoneSlab, 2:3
 
 # These are just the basic ones, you can add various shapes and stuff to each of them
 # ToDo: Add the various shapes (saved in NBT-Tags, not in meta)
 # Banners:
 
-WhiteBanner         = Stick, 2:3 | WhiteWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-OrangeBanner        = Stick, 2:3 | OrangeWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-MagentaBanner       = Stick, 2:3 | MagentaWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+BlackBanner         = Stick, 2:3 | BlackWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+BlueBanner          = Stick, 2:3 | BlueWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+BrownBanner         = Stick, 2:3 | BrownWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+CyanBanner          = Stick, 2:3 | CyanWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+GrayBanner          = Stick, 2:3 | GrayWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+GreenBanner         = Stick, 2:3 | GreenWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
 LightBlueBanner     = Stick, 2:3 | LightBlueWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-YellowBanner        = Stick, 2:3 | YellowWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+LightGrayBanner     = Stick, 2:3 | LightGrayWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
 LimeBanner          = Stick, 2:3 | LimeWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+MagentaBanner       = Stick, 2:3 | MagentaWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+OrangeBanner        = Stick, 2:3 | OrangeWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
 PinkBanner          = Stick, 2:3 | PinkWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-GrayBanner          = Stick, 2:3 | GrayWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-LightGrayBanner     = Stick, 2:3 | LightGrayWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-CyanBanner          = Stick, 2:3 | CyanWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
 PurpleBanner        = Stick, 2:3 | PurpleWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-BlueBanner          = Stick, 2:3 | BlueWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-BrownBanner         = Stick, 2:3 | BrownWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-GreenBanner         = Stick, 2:3 | GreenWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
 RedBanner           = Stick, 2:3 | RedWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
-BlackBanner         = Stick, 2:3 | BlackWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+WhiteBanner         = Stick, 2:3 | WhiteWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+YellowBanner        = Stick, 2:3 | YellowWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
 
 
 
@@ -421,20 +421,20 @@ BlackBanner         = Stick, 2:3 | BlackWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
 # Dyes
 #
 
-WhiteDye, 3   = Bone, *
 RedDye, 2     = Rose, *
+WhiteDye, 3   = Bone, *
 YellowDye, 2  = Dandelion, *
 
 # Color mixing, duals:
-OrangeDye, 2  = YellowDye, * | RedDye, *
 CyanDye, 2    = GreenDye, *  | BlueDye, *
-PurpleDye, 2  = RedDye, *    | BlueDye, *
 GrayDye, 2    = BlackDye, *  | WhiteDye, *
-LtBlueDye, 2  = BlueDye, *   | WhiteDye, *
-PinkDye, 2    = RedDye, *    | WhiteDye, *
 LimeDye, 2    = GreenDye, *  | WhiteDye, *
-MagentaDye, 2 = PurpleDye, * | PinkDye, *
+LtBlueDye, 2  = BlueDye, *   | WhiteDye, *
 LtGrayDye, 2  = GrayDye, *   | WhiteDye, *
+MagentaDye, 2 = PurpleDye, * | PinkDye, *
+OrangeDye, 2  = YellowDye, * | RedDye, *
+PinkDye, 2    = RedDye, *    | WhiteDye, *
+PurpleDye, 2  = RedDye, *    | BlueDye, *
 
 # triplets:
 LtGrayDye, 3  = BlackDye, *  | WhiteDye, *, *
@@ -450,113 +450,113 @@ MagentaDye, 4 = BlueDye, *   | WhiteDye, * | RedDye, *, *
 #******************************************************#
 # Colored wool:
 #
-WhiteWool     = Wool^-1, * | BoneMeal, *
-OrangeWool    = WhiteWool, * | OrangeDye, *
-MagentaWool   = WhiteWool, * | MagentaDye, *
+BlackWool     = WhiteWool, * | BlackDye, *
+BlueWool      = WhiteWool, * | BlueDye, *
+BrownWool     = WhiteWool, * | BrownDye, *
+CyanWool      = WhiteWool, * | CyanDye, *
+GrayWool      = WhiteWool, * | GrayDye, *
+GreenWool     = WhiteWool, * | GreenDye, *
 LightBlueWool = WhiteWool, * | LightBlueDye, *
-YellowWool    = WhiteWool, * | YellowDye, *
+LightGrayWool = WhiteWool, * | LightGrayDye, *
 LimeWool      = WhiteWool, * | LimeDye, *
+MagentaWool   = WhiteWool, * | MagentaDye, *
+OrangeWool    = WhiteWool, * | OrangeDye, *
 PinkWool      = WhiteWool, * | PinkDye, *
-GrayWool      = WhiteWool, * | GrayDye, *
-LightGrayWool = WhiteWool, * | LightGrayDye, *
-CyanWool      = WhiteWool, * | CyanDye, *
 PurpleWool    = WhiteWool, * | PurpleDye, *
-BlueWool      = WhiteWool, * | BlueDye, *
-BrownWool     = WhiteWool, * | BrownDye, *
-GreenWool     = WhiteWool, * | GreenDye, *
 RedWool       = WhiteWool, * | RedDye, *
-BlackWool     = WhiteWool, * | BlackDye, *
+WhiteWool     = Wool^-1, * | BoneMeal, *
+YellowWool    = WhiteWool, * | YellowDye, *
 
-OrangeCarpet, 3    = OrangeWool, 1:1, 2:1
-MagentaCarpet, 3   = MagentaWool, 1:1, 2:1
+BlackCarpet, 3     = BlackWool, 1:1, 2:1
+BlueCarpet, 3      = BlueWool, 1:1, 2:1
+BrownCarpet, 3     = BrownWool, 1:1, 2:1
+CyanCarpet, 3      = CyanWool, 1:1, 2:1
+GrayCarpet, 3      = GrayWool, 1:1, 2:1
+GreenCarpet, 3     = GreenWool, 1:1, 2:1
 LightBlueCarpet, 3 = LightBlueWool, 1:1, 2:1
-YellowCarpet, 3    = YellowWool, 1:1, 2:1
+LightGrayCarpet, 3 = LightGrayWool, 1:1, 2:1
 LimeCarpet, 3      = LimeWool, 1:1, 2:1
+MagentaCarpet, 3   = MagentaWool, 1:1, 2:1
+OrangeCarpet, 3    = OrangeWool, 1:1, 2:1
 PinkCarpet, 3      = PinkWool, 1:1, 2:1
-GrayCarpet, 3      = GrayWool, 1:1, 2:1
-LightGrayCarpet, 3 = LightGrayWool, 1:1, 2:1
-CyanCarpet, 3      = CyanWool, 1:1, 2:1
 PurpleCarpet, 3    = PurpleWool, 1:1, 2:1
-BlueCarpet, 3      = BlueWool, 1:1, 2:1
-BrownCarpet, 3     = BrownWool, 1:1, 2:1
-GreenCarpet, 3     = GreenWool, 1:1, 2:1
 RedCarpet, 3       = RedWool, 1:1, 2:1
-BlackCarpet, 3     = BlackWool, 1:1, 2:1
 WhiteCarpet, 3     = WhiteWool, 1:1, 2:1
+YellowCarpet, 3    = YellowWool, 1:1, 2:1
 
 #******************************************************#
 # Stained Glass:
 #
-OrangeStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | OrangeDye, 2:2
-MagentaStainedGlass, 8   = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | MagentaDye, 2:2
-LightBlueStainedGlass, 8 = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightBlueDye, 2:2
-YellowStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | YellowDye, 2:2
-LimeStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LimeDye, 2:2
-PinkStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | PinkDye, 2:2
-GrayStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | GrayDye, 2:2
-LightGrayStainedGlass, 8 = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightGrayDye, 2:2
-CyanStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | CyanDye, 2:2
-VioletStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | VioletDye, 2:2
+BlackStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BlackDye, 2:2
 BlueStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BlueDye, 2:2
 BrownStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BrownDye, 2:2
+CyanStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | CyanDye, 2:2
+GrayStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | GrayDye, 2:2
 GreenStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | GreenDye, 2:2
+LightBlueStainedGlass, 8 = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightBlueDye, 2:2
+LightGrayStainedGlass, 8 = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightGrayDye, 2:2
+LimeStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LimeDye, 2:2
+MagentaStainedGlass, 8   = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | MagentaDye, 2:2
+OrangeStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | OrangeDye, 2:2
+PinkStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | PinkDye, 2:2
 RedStainedGlass, 8       = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | RedDye, 2:2
-BlackStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BlackDye, 2:2
+VioletStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | VioletDye, 2:2
 WhiteStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BoneMeal, 2:2
+YellowStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | YellowDye, 2:2
 
 #******************************************************#
 # Stained Glass Pane:
 #
-OrangeStainedGlassPane, 16    = OrangeStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-MagentaStainedGlassPane, 16   = MagentaStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-LightBlueStainedGlassPane, 16 = LightBlueStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-YellowStainedGlassPane, 16    = YellowStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-LimeStainedGlassPane, 16      = LimeStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-PinkStainedGlassPane, 16      = PinkStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-GrayStainedGlassPane, 16      = GrayStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-LightGrayStainedGlassPane, 16 = LightGrayStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-CyanStainedGlassPane, 16      = CyanStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-VioletStainedGlassPane, 16    = VioletStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+BlackStainedGlassPane , 16    = BlackStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 BlueStainedGlassPane, 16      = BlueStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 BrownStainedGlassPane, 16     = BrownStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+CyanStainedGlassPane, 16      = CyanStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+GrayStainedGlassPane, 16      = GrayStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 GreenStainedGlassPane, 16     = GreenStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+LightBlueStainedGlassPane, 16 = LightBlueStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+LightGrayStainedGlassPane, 16 = LightGrayStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+LimeStainedGlassPane, 16      = LimeStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+MagentaStainedGlassPane, 16   = MagentaStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+OrangeStainedGlassPane, 16    = OrangeStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+PinkStainedGlassPane, 16      = PinkStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 RedStainedGlassPane, 16       = RedStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
-BlackStainedGlassPane , 16    = BlackStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+VioletStainedGlassPane, 16    = VioletStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 WhiteStainedGlassPane, 16     = WhiteStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+YellowStainedGlassPane, 16    = YellowStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 
 #******************************************************#
 # Stained Clay:
 #
-WhiteStainedClay, 8     = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BoneMeal, 2:2
-OrangeStainedClay, 8    = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | OrangeDye, 2:2
-MagentaStainedClay, 8   = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | MagentaDye, 2:2
-LightBlueStainedClay, 8 = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightBlueDye, 2:2
-YellowStainedClay, 8    = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | YellowDye, 2:2
-LimeStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LimeDye, 2:2
-PinkStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | PinkDye, 2:2
-GrayStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | GrayDye, 2:2
-LightGrayStainedClay, 8 = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightGrayDye, 2:2
-CyanStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | CyanDye, 2:2
-VioletStainedClay, 8    = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | VioletDye, 2:2
+BlackStainedClay, 8     = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BlackDye, 2:2
 BlueStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BlueDye, 2:2
 BrownStainedClay, 8     = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BrownDye, 2:2
+CyanStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | CyanDye, 2:2
+GrayStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | GrayDye, 2:2
 GreenStainedClay, 8     = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | GreenDye, 2:2
+LightBlueStainedClay, 8 = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightBlueDye, 2:2
+LightGrayStainedClay, 8 = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightGrayDye, 2:2
+LimeStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LimeDye, 2:2
+MagentaStainedClay, 8   = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | MagentaDye, 2:2
+OrangeStainedClay, 8    = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | OrangeDye, 2:2
+PinkStainedClay, 8      = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | PinkDye, 2:2
 RedStainedClay, 8       = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | RedDye, 2:2
-BlackStainedClay, 8     = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BlackDye, 2:2
+VioletStainedClay, 8    = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | VioletDye, 2:2
+WhiteStainedClay, 8     = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BoneMeal, 2:2
+YellowStainedClay, 8    = HardenedClay, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | YellowDye, 2:2
 
 #******************************************************#
 # Enchantment & Brewing
 #
-GlassBottle, 3     = Glass, 1:1, 2:2, 3:1
-Cauldron           = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 2:3, 3:3
-BrewingStand       = Cobblestone, 1:2, 2:2, 3:2   | BlazeRod, 2:1
 BlazePowder, 2     = BlazeRod, *
-MagmaCream         = SlimeBall, *    | BlazePowder, *
+BrewingStand       = Cobblestone, 1:2, 2:2, 3:2   | BlazeRod, 2:1
+Cauldron           = IronIngot, 1:1, 3:1, 1:2, 3:2, 1:3, 2:3, 3:3
+EnchantmentTable   = Obsidian, 1:3, 2:3, 3:3, 2:2 | Diamond, 1:2, 3:2 | Book, 2:1
 FermentedSpiderEye = SpiderEye, *   | Sugar, *    | BrownMushroom, *
+GlassBottle, 3     = Glass, 1:1, 2:2, 3:1
 GlisteringMelon    = MelonSlice, 2:2  | GoldNugget, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
 GoldenCarrot       = Carrot, 2:2  | GoldNugget, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
 GoldNugget, 9      = GoldIngot, *
-EnchantmentTable   = Obsidian, 1:3, 2:3, 3:3, 2:2 | Diamond, 1:2, 3:2 | Book, 2:1
+MagmaCream         = SlimeBall, *    | BlazePowder, *
 
 #******************************************************#
 # Dyed Armor 
@@ -602,12 +602,12 @@ LeatherBoots		= LeatherBoots^-1, * | Dye^-1, * | Dye^-1, * | Dye^-1, * | Dye^-1,
 # (Best not to add non-vanilla items to this as it will cause internal firework data handling code to log warnings)
 
 # Ballistic firework rockets - plain and with firework star, all with 1 - 3 gunpowder
-FireworkRocket   = Paper, * | Gunpowder, *
-FireworkRocket   = Paper, * | Gunpowder, * | Gunpowder, *
-FireworkRocket   = Paper, * | Gunpowder, * | Gunpowder, * | Gunpowder, *
 FireworkRocket   = FireworkStar, * | Paper, * | Gunpowder, *
 FireworkRocket   = FireworkStar, * | Paper, * | Gunpowder, * | Gunpowder, *
 FireworkRocket   = FireworkStar, * | Paper, * | Gunpowder, * | Gunpowder, * | Gunpowder, *
+FireworkRocket   = Paper, * | Gunpowder, *
+FireworkRocket   = Paper, * | Gunpowder, * | Gunpowder, *
+FireworkRocket   = Paper, * | Gunpowder, * | Gunpowder, * | Gunpowder, *
 
 # Radioactive firework stars
 # Plain powder and dye
@@ -619,25 +619,25 @@ FireworkStar     = Gunpowder, * | Dye ^-1, * | Glowdust, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Glowdust, * | Diamond, *
 
 # Powder and shape (no shape combining possible)
+FireworkStar     = Gunpowder, * | Dye ^-1, * | Feather, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Firecharge, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Goldnugget, *
-FireworkStar     = Gunpowder, * | Dye ^-1, * | Feather, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | SkeletonHead ^-1, *
 
 # Power and shape (no shape combining possible), combined with effect
+FireworkStar     = Gunpowder, * | Dye ^-1, * | Feather, * | Diamond, *
+FireworkStar     = Gunpowder, * | Dye ^-1, * | Feather, * | Glowdust, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Firecharge, * | Diamond, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Firecharge, * | Glowdust, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Goldnugget, * | Diamond, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Goldnugget, * | Glowdust, *
-FireworkStar     = Gunpowder, * | Dye ^-1, * | Feather, * | Diamond, *
-FireworkStar     = Gunpowder, * | Dye ^-1, * | Feather, * | Glowdust, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | SkeletonHead ^-1, * | Diamond, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | SkeletonHead ^-1, * | Glowdust, *
 
 # Power and shape (no shape combining possible), combined with effect (with effect combining)
+FireworkStar     = Gunpowder, * | Dye ^-1, * | Feather, * | Glowdust, * | Diamond, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Firecharge, * | Glowdust, * | Diamond, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | Goldnugget, * | Glowdust, * | Diamond, *
-FireworkStar     = Gunpowder, * | Dye ^-1, * | Feather, * | Glowdust, * | Diamond, *
 FireworkStar     = Gunpowder, * | Dye ^-1, * | SkeletonHead ^-1, * | Glowdust, * | Diamond, *
 
 # Star fade colour-change
diff --git a/Server/furnace.txt b/Server/furnace.txt
index 764020cb4..340afe73a 100644
--- a/Server/furnace.txt
+++ b/Server/furnace.txt
@@ -42,26 +42,26 @@
 #--------------------------
 # Smelting recipes
 
+Cactus           = GreenDye
+ClayBlock        = HardenedClay
+Clay             = Brick
 Cobble           = Stone
-IronOre          = IronIngot
+DarkOakLog       = CharCoal
 GoldOre          = GoldIngot
+IronOre          = IronIngot
+Log              = CharCoal
 NetherQuartzOre  = NetherQuartz
-Sand             = Glass
+Netherrack       = NetherBrick
 Pork             = CookedPork
-RawBeef          = Steak
 Potato           = BakedPotato
+RawBeef          = Steak
 RawChicken       = CookedChicken
-Clay             = Brick
-ClayBlock        = HardenedClay
-Netherrack       = NetherBrick
 RawFish          = CookedFish
-Log              = CharCoal
-DarkOakLog       = CharCoal
-Cactus           = GreenDye
-WetSponge        = Sponge
-Stonebrick       = CrackedStonebrick
-RawRabbit        = CookedRabbit
 RawMutton        = CookedMutton
+RawRabbit        = CookedRabbit
+Sand             = Glass
+Stonebrick       = CrackedStonebrick
+WetSponge        = Sponge
 
 
 
@@ -70,61 +70,61 @@ RawMutton        = CookedMutton
 #--------------------------
 # Fuels
 
-! CharCoal        = 1600   # -> 80 sec
-! Coal            = 1600   # -> 80 sec
-! WoodenSlab      = 15     # -> 7.5 sec
-! Planks          = 300    # -> 15 sec
-! Stick           = 100    # -> 5 sec
-! Fence           = 300    # -> 15 sec
-! SpruceFence     = 300    # -> 15 sec
-! BirchFence      = 300    # -> 15 sec
-! JungleFence     = 300    # -> 15 sec
-! DarkOakFence    = 300    # -> 15 sec
 ! AcaciaFence     = 300    # -> 15 sec
-! WoodStairs      = 300    # -> 15 sec
-! Workbench       = 300    # -> 15 sec
-! Bookshelf       = 300    # -> 15 sec
-! Chest           = 300    # -> 15 sec
-! Jukebox         = 300    # -> 15 sec
-! Lavabucket      = 20000  # -> 1000 sec
-! Log             = 300    # -> 15 sec
-! DarkOakLog      = 300    # -> 15 sec
-! Sapling         = 100    # -> 5 sec
-! CoalBlock       = 16000  # -> 800 sec
-! BlazeRod        = 2400   # -> 120 sec
-! NoteBlock       = 300    # -> 15 sec
-! HugeRedMushroom = 300    # -> 15 sec
-! HugeBrownMushroom = 300  # -> 15 sec
 ! Banner          = 300    # -> 15 sec
+! BirchFence      = 300    # -> 15 sec
+! BirchFenceGate  = 300    # -> 15 sec
 ! BlackBanner     = 300    # -> 15 sec
-! RedBanner       = 300    # -> 15 sec
-! GreenBanner     = 300    # -> 15 sec
-! BrownBanner     = 300    # -> 15 sec
+! BlazeRod        = 2400   # -> 120 sec
 ! BlueBanner      = 300    # -> 15 sec
-! PurpleBanner    = 300    # -> 15 sec
+! Bookshelf       = 300    # -> 15 sec
+! BrownBanner     = 300    # -> 15 sec
+! CharCoal        = 1600   # -> 80 sec
+! Chest           = 300    # -> 15 sec
+! Coal            = 1600   # -> 80 sec
+! CoalBlock       = 16000  # -> 800 sec
 ! CyanBanner      = 300    # -> 15 sec
-! SilverBanner    = 300    # -> 15 sec
+! DarkOakFence    = 300    # -> 15 sec
+! DarkOakFenceGate = 300   # -> 15 sec
+! DarkOakLog      = 300    # -> 15 sec
+! DaylightSensor  = 300    # -> 15 sec
+! Fence           = 300    # -> 15 sec
+! FenceGate       = 300    # -> 15 sec
 ! GrayBanner      = 300    # -> 15 sec
-! PinkBanner      = 300    # -> 15 sec
-! LimeBanner      = 300    # -> 15 sec
-! YellowBanner    = 300    # -> 15 sec
+! GreenBanner     = 300    # -> 15 sec
+! HugeBrownMushroom = 300  # -> 15 sec
+! HugeRedMushroom = 300    # -> 15 sec
+! Jukebox         = 300    # -> 15 sec
+! JungleFence     = 300    # -> 15 sec
+! JungleFenceGate = 300    # -> 15 sec
+! Lavabucket      = 20000  # -> 1000 sec
 ! LightBlueBanner = 300    # -> 15 sec
+! LimeBanner      = 300    # -> 15 sec
+! Log             = 300    # -> 15 sec
 ! MagentaBanner   = 300    # -> 15 sec
+! NoteBlock       = 300    # -> 15 sec
 ! OrangeBanner    = 300    # -> 15 sec
-! WhiteBanner     = 300    # -> 15 sec
-! DaylightSensor  = 300    # -> 15 sec
-! FenceGate       = 300    # -> 15 sec
+! PinkBanner      = 300    # -> 15 sec
+! Planks          = 300    # -> 15 sec
+! PurpleBanner    = 300    # -> 15 sec
+! RedBanner       = 300    # -> 15 sec
+! Sapling         = 100    # -> 5 sec
+! SilverBanner    = 300    # -> 15 sec
+! SpruceFence     = 300    # -> 15 sec
 ! SpruceFenceGate = 300    # -> 15 sec
-! BirchFenceGate  = 300    # -> 15 sec
-! JungleFenceGate = 300    # -> 15 sec
-! DarkOakFenceGate = 300   # -> 15 sec
+! Stick           = 100    # -> 5 sec
 ! Trapdoor        = 300    # -> 15 sec
 ! TrappedChest    = 300    # -> 15 sec
-! WoodPlate       = 300    # -> 15 sec
-! WoodPickaxe     = 200    # -> 10 sec
+! WhiteBanner     = 300    # -> 15 sec
 ! WoodAxe         = 200    # -> 10 sec
-! WoodShovel      = 200    # -> 10 sec
+! WoodenSlab      = 15     # -> 7.5 sec
 ! WoodHoe         = 200    # -> 10 sec
+! WoodPickaxe     = 200    # -> 10 sec
+! WoodPlate       = 300    # -> 15 sec
+! WoodShovel      = 200    # -> 10 sec
+! WoodStairs      = 300    # -> 15 sec
 ! WoodSword       = 200    # -> 10 sec
+! Workbench       = 300    # -> 15 sec
+! YellowBanner    = 300    # -> 15 sec
 
 
diff --git a/Server/monsters.ini b/Server/monsters.ini
index af1938e3e..f327a38bc 100644
--- a/Server/monsters.ini
+++ b/Server/monsters.ini
@@ -1,213 +1,213 @@
 [Bat]
+AttackDamage=0.0
 AttackRange=2.0
 AttackRate=1
-AttackDamage=0.0
-SightDistance=25.0
 MaxHealth=6
+SightDistance=25.0
 
 [Blaze]
-AttackRange=15.0
-AttackRate=1  
 AttackDamage=6.0
-SightDistance=25.0
-MaxHealth=20
+AttackRange=15.0
+AttackRate=1
 IsFireproof=1
+MaxHealth=20
+SightDistance=25.0
 
 [CaveSpider]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=2.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=12
+SightDistance=25.0
 
 [Chicken]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=4
+SightDistance=25.0
 
 [Cow]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=10
+SightDistance=25.0
 
 [Creeper]
-AttackRange=3.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=3.0
+AttackRate=1
 MaxHealth=20
+SightDistance=25.0
 
 [EnderDragon]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=6.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=200
+SightDistance=25.0
 
 [Enderman]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=4.0
-SightDistance=64.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=40
+SightDistance=64.0
 
 
 [Ghast]
+AttackDamage=0.0
 AttackRange=50.0
 AttackRate=1
-AttackDamage=0.0
-SightDistance=50.0
-MaxHealth=10
 IsFireproof=1
+MaxHealth=10
+SightDistance=50.0
 
 [Giant]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=6.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=100
+SightDistance=25.0
 
 [Guardian]
+AttackDamage=9.0
 AttackRange=2.0
 AttackRate=1
-AttackDamage=9.0
-SightDistance=25.0
 MaxHealth=30
+SightDistance=25.0
 
 [Horse]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=6.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=30
+SightDistance=25.0
 
 [IronGolem]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=6.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=100
+SightDistance=25.0
 
 [MagmaCube]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=6.0
-SightDistance=25.0
-MaxHealth=16
+AttackRange=2.0
+AttackRate=1
 IsFireproof=1
+MaxHealth=16
+SightDistance=25.0
 
 [Mooshroom]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=10
+SightDistance=25.0
 
 [Ocelot]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=10
+SightDistance=25.0
 
 [Pig]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=10
+SightDistance=25.0
 
 [Rabbit]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=10
+SightDistance=25.0
 
 [Sheep]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=8
+SightDistance=25.0
 
 [Silverfish]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=1.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=8
+SightDistance=25.0
 
 [Skeleton]
 AttackRange=15.0
-AttackRate=1  
-SightDistance=40.0
+AttackRate=1
 MaxHealth=20
+SightDistance=40.0
 
 [Slime]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=4.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=16
+SightDistance=25.0
 
 [SnowGolem]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=4
+SightDistance=25.0
 
 [Spider]
+AttackDamage=2.0
 AttackRange=2.0
 AttackRate=1
-AttackDamage=2.0
-SightDistance=25.0
 MaxHealth=16
+SightDistance=25.0
 
 [Squid]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=10
+SightDistance=25.0
 
 [Villager]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=20
+SightDistance=25.0
 
 [Witch]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=0.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=26
+SightDistance=25.0
 
 [Wolf]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=4.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=20
+SightDistance=25.0
 
 [Zombie]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=4.0
-SightDistance=25.0
+AttackRange=2.0
+AttackRate=1
 MaxHealth=20
+SightDistance=25.0
 
 [ZombiePigman]
-AttackRange=2.0
-AttackRate=1  
 AttackDamage=7.0
-SightDistance=25.0
-MaxHealth=20
+AttackRange=2.0
+AttackRate=1
 IsFireproof=1
+MaxHealth=20
+SightDistance=25.0