5 files changed, 312 insertions, 86 deletions

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 434dd8a90..337ce47c3 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2848,7 +2848,7 @@ end
 				MirrorBlockFaceY = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after mirroring it around the Y axis (or rotating 180 degrees around it)." },
 				NoCaseCompare = {Params = "string, string", Return = "number", Notes = "Case-insensitive string comparison; returns 0 if the strings are the same"},
 				NormalizeAngleDegrees = { Params = "AngleDegrees", Return = "AngleDegrees", Notes = "Returns the angle, wrapped into the [-180, +180) range." },
-				ReplaceString = {Params = "full-string, to-be-replaced-string, to-replace-string", Notes = "Replaces *each* occurence of to-be-replaced-string in full-string with to-replace-string"},
+				ReplaceString = {Params = "full-string, to-be-replaced-string, to-replace-string", Return = "string", Notes = "Replaces *each* occurence of to-be-replaced-string in full-string with to-replace-string"},
 				RotateBlockFaceCCW = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after rotating it around the Y axis 90 degrees counter-clockwise." },
 				RotateBlockFaceCW = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after rotating it around the Y axis 90 degrees clockwise." },
 				StringSplit = {Params = "string, SeperatorsString", Return = "array table of strings", Notes = "Seperates string into multiple by splitting every time any of the characters in SeperatorsString is encountered."},
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject 7cc99285ae5117418f657c3b295ca71f2b75b4f
+Subproject bd23915df763b182610c6163c5ff2d64a075656
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 684294bb3..d29344b64 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -44,6 +44,8 @@ ApplePlanks, 4   = AppleLog, *
 ConiferPlanks, 4 = ConiferLog, *
 BirchPlanks, 4   = BirchLog, *
 JunglePlanks, 4  = JungleLog, *
+AcaciaPlanks, 4  = AcaciaLog, *
+DarkOakPlanks, 4 = DarkOakLog, *
 Stick, 4         = Planks, 2:2, 2:3
 Torch, 4         = Stick, 1:2 | Coal, 1:1
 Workbench        = Planks, 1:1, 1:2, 2:1, 2:2
@@ -59,36 +61,77 @@ 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
-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
-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
-QuartzBlock      = NetherQuartz, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-NetherBrick      = netherbrickitem, 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 = QuartzSlab, 1:1, 1:2
-ChiseledQuartzBlock, 2 = QuartzBlock, 1:1, 1:2
-CoalBlock        = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-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
+GoldBlock               = GoldIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+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
+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
+QuartzBlock             = NetherQuartz, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+NetherBrick             = netherbrickitem, 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       = QuartzSlab, 1:1, 1:2
+ChiseledQuartzBlock, 2  = QuartzBlock, 1:1, 1:2
+CoalBlock               = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+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
+StoneBrick, 4           = Stone,     1:1, 1:2, 2:1, 2:2
+BookShelf               = Planks,    1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
+Sandstone, 4            = 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
+JackOLantern            = Pumpkin, 1:1 | Torch, 1: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
+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
+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
+RedSandstone, 4         = RedSand, 1:1, 1:2, 2:1, 2:2
+ChiseledRedSandstone, 4 = RedSandstoneSlab, 1:1, 1:2
+SmoothRedSandstone, 4   = RedSand, 1:1, 1:2, 2:1, 2:2
+MossyStoneBrick         = Stonebrick, * | Vines, *
+Leather                 = RabbitHide, 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
-WoodSlab,        6  = Planks,            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
 BrickSlab,       6  = BrickBlock,        1:1, 2:1, 3:1
 StonebrickSlab,  6  = StoneBrick,        1:1, 2:1, 3:1
 NetherbrickSlab, 6  = NetherBrick,       1:1, 2:1, 3:1
 Quartzslab,      6  = QuartzBlock,       1:1, 2:1, 3:1
 snow,            6  = SnowBlock,         1:1, 2:1, 3:1
+RedSandstoneSlab, 6 = RedSandstone,      1:1, 2:1, 3:1
+
 
 # Stairs:
-WoodStairs, 4    = Planks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-WoodStairs, 4    = Planks, 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
+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
 BrickStairs, 4       = BrickBlock,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
@@ -101,15 +144,8 @@ 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
-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
-StoneBrick, 4      = Stone,     1:1, 1:2, 2:1, 2:2
-BookShelf          = Planks,    1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
-Sandstone, 4       = 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
-JackOLantern       = Pumpkin, 1:1 | Torch, 1:2
+RedSandstoneStairs, 4 = RedSandstone,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+RedSandstoneStairs, 4 = RedSandstone,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 
 # Other
 Carpet             = Wool, 1:3, 2:3
@@ -244,11 +280,19 @@ ActivatorRail, 6 = IronIngot, 1:1, 1:2, 1:3, 3:1, 3:2, 3:3 | Stick, 2:1, 2:3 | R
 #******************************************************#
 # Mechanisms
 #
-WoodenDoor       = Planks,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3
-IronDoor         = IronIngot, 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
+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
+DarkOakDoor, 3   = DarkOakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+IronDoor, 3      = IronIngot, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
 TrapDoor, 2      = Planks,    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, 2:1
 StonePlate       = Stone,   1:1, 2:1
+lightweightedpressureplate = IronIngot, 1:1, 2:1
+heavyweightedpressureplate = GoldIngot, 1:1, 2:1
 StoneButton      = Stone,   1:1
 WoodenButton     = Planks,  1:1
 RedstoneTorchOn  = Stick, 1:2        | RedstoneDust, 1:1
@@ -286,6 +330,8 @@ MelonSeeds           = MelonSlice, *
 PumpkinSeeds, 4      = Pumpkin, *
 PumpkinPie           = Pumpkin, * | Sugar, * | egg, *
 Wheat, 9             = Haybale, *
+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
 
 
 
@@ -314,17 +360,49 @@ 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, *
-Fence, 2            = Stick,       1:1, 2:1, 3:1, 1:2, 2:2, 3:2
+Fence, 3            = OakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+SpruceFence, 3      = SprucePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+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
+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
 Cobblestonewall, 6  = cobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 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
-FenceGate           = Stick,       1:1, 1:2, 3:1, 3:2  | Planks, 2:1, 2:2
+FenceGate           = Stick,       1:1, 1:2, 3:1, 3:2  | OakPlanks, 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
 Bed                 = Planks,            1:2, 2:2, 3:2 | Wool,   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
+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
+LimeBanner          = Stick, 2:3 | LimeWool, 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
 
 
 
diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt
index d6177184b..0c12a798d 100644
--- a/MCServer/furnace.txt
+++ b/MCServer/furnace.txt
@@ -10,25 +10,28 @@
 # An Item is defined by an Item Type, an amount (and damage)
 # The damage is optional, and if not specified it's assumed to be 0
 #
-# -Cactus Green:
-#    351     :   1    ( :   2    )
-#   ItemType : Amount ( : Damage )
+# Cactus Green example:
+#    351     :   2    ( ,   1    )
+#   ItemType : Damage ( , Amount )
+# or simple use the item name (marked in items.ini):
+#   CactusGreen ( , 1 )
 #
 #
 # **** Recipe and result ****
 #
-# 4:1@200=1:1 -> Produces 1 smooth stone from 1 cobblestone in 200 ticks (10 seconds)
+# Cobble @ 200 = Stone -> Produces 1 smooth stone from 1 cobblestone in 200 ticks (10 seconds)
 #
-#   4      :    1   @  200  =   1    :   1
-# ItemType : Amount @ ticks = ItemID : Amount
+# Write in full:
+#    Cobble  :   0    ,   1    @  200  =    1     :   1    ,   1
+#   ItemType : Damage , Amount @ ticks = ItemType : Damage , Amount
 #
 #
 # **** Fuel ****
 #
 # !17:1 = 300 -> 1 Wood burns for 300 ticks (15 s)
 #
-#  !     17   :   1    =  300
-# Fuel ItemType : Amount = ticks
+#  !     Wood   ,   1    =  300
+# Fuel ItemType , Amount = ticks
 #
 #******************************************************#
 
@@ -39,20 +42,24 @@
 #--------------------------
 # Smelting recipes
 
-4:1   @ 200 = 1:1      # 1 Cobblestone  -> 1 Rock
-15:1  @ 200 = 265:1    # 1 Iron Ore     -> 1 Iron Ingot
-14:1  @ 200 = 266:1    # 1 Gold Ore     -> 1 Gold Ingot
-153:1 @ 200 = 406:1    # 1 Quartz Ore   -> 1 Quartz
-12:1  @ 200 = 20:1     # 1 Sand         -> 1 Glass
-319:1 @ 200 = 320:1    # 1 Raw Pork     -> 1 Cooked Pork
-363:1 @ 200 = 364:1    # 1 Raw Beef     -> 1 Cooked Beef (steak)
-365:1 @ 200 = 366:1    # 1 Raw Chicken  -> 1 Cooked Chicken
-337:1 @ 200 = 336:1    # 1 Clay         -> 1 Clay Brick
-82:1  @ 200 = 172:1    # 1 Clay Block   -> 1 Hardened Clay
-87:1  @ 200 = 405:1    # 1 NetherRack   -> 1 NetherBrick
-349:1 @ 200 = 350:1    # 1 Raw Fish     -> 1 Cooked Fish
-17:1  @ 200 = 263:1:1  # 1 Log          -> 1 Charcoal
-81:1  @ 200 = 351:1:2  # 1 Cactus       -> 1 Green Dye
+Cobble           = Stone
+IronOre          = IronIngot
+GoldOre          = GoldIngot
+NetherQuartzOre  = NetherQuartz
+Sand             = Glass
+Pork             = CookedPork
+RawBeef          = Steak
+RawChicken       = CookedChicken
+Clay             = Brick
+ClayBlock        = HardenedClay
+TallGrass        = NetherBrickItem
+RawFish          = CookedFish
+Log              = CharCoal
+Cactus           = GreenDye
+WetSponge        = Sponge
+Stonebrick       = CrackedStonebrick
+RawRabbit        = CookedRabbit
+RawMutton        = CookedMutton
 
 
 
@@ -61,31 +68,41 @@
 #--------------------------
 # Fuels
 
-! 263:1    = 1600   # 1 Coal            -> 80 sec
-! 263:1:1  = 1600   # 1 Charcoal        -> 80 sec
-! 126:1    = 15     # 1 Halfslab        -> 7.5 sec
-! 5:1      = 300    # 1 Planks          -> 15 sec
-! 280:1    = 100    # 1 Stick           -> 5 sec
-! 85:1     = 300    # 1 Fence           -> 15 sec
-! 53:1     = 300    # 1 Wooden Stairs   -> 15 sec
-! 58:1     = 300    # 1 Crafting Table  -> 15 sec
-! 47:1     = 300    # 1 Bookshelf       -> 15 sec
-! 54:1     = 300    # 1 Chest           -> 15 sec
-! 84:1     = 300    # 1 Jukebox         -> 15 sec
-! 327:1    = 20000  # 1 Lava Bucket     -> 1000 sec
-! 17:1     = 300    # 1 Wood            -> 15 sec
-! 6:1      = 100    # 1 Sapling         -> 5 sec
-! 173:1    = 16000  # 1 Coal Block      -> 800 sec
-! 369:1    = 2400   # 1 Blaze Rod       -> 120 sec
-! 25:1     = 300    # 1 Note Block      -> 15 sec
-! 151:1    = 300    # 1 Daylight Sensor -> 15 sec
-! 107:1    = 300    # 1 Fence Gate      -> 15 sec
-! 167:1    = 300    # 1 Trapdoor        -> 15 sec
-! 146:1    = 300    # 1 Trapped Chest   -> 15 sec
-! 72:1     = 300    # 1 Pressure Plate  -> 15 sec
-! 270:1    = 200    # 1 Wooden Pickaxe  -> 10 sec
-! 271:1    = 200    # 1 Wooden Axe      -> 10 sec
-! 269:1    = 200    # 1 Wooden Shovel   -> 10 sec
-! 290:1    = 200    # 1 Wooden Hoe      -> 10 sec
-! 268:1    = 200    # 1 Wooden Sword    -> 10 sec
+! 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
+! Sapling         = 100    # -> 5 sec
+! CoalBlock       = 16000  # -> 800 sec
+! BlazeRod        = 2400   # -> 120 sec
+! NoteBlock       = 300    # -> 15 sec
+! DaylightSensor  = 300    # -> 15 sec
+! FenceGate       = 300    # -> 15 sec
+! SpruceFenceGate = 300    # -> 15 sec
+! BirchFenceGate  = 300    # -> 15 sec
+! JungleFenceGate = 300    # -> 15 sec
+! DarkOakFenceGate = 300   # -> 15 sec
+! Trapdoor        = 300    # -> 15 sec
+! TrappedChest    = 300    # -> 15 sec
+! WoodPlate       = 300    # -> 15 sec
+! WoodPickaxe     = 200    # -> 10 sec
+! WoodAxe         = 200    # -> 10 sec
+! WoodShovel      = 200    # -> 10 sec
+! WoodHoe         = 200    # -> 10 sec
+! WoodSword       = 200    # -> 10 sec
+
 
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 7b8fcf4ee..6eb9eee6e 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -1,9 +1,17 @@
 [Items]
 air=0
 rock=1
+granite=1:1
+polishedgranite=1:2
+diorite=1:3
+polisheddiorite=1:4
+andesite=1:5
+polishedandesite=1:6
 stone=1
 grass=2
 dirt=3
+coarseddirt=3:1
+podzol=3:2
 cobblestone=4
 cobble=4
 planks=5
@@ -17,6 +25,11 @@ birchplanks=5:2
 lightplanks=5:2
 jungleplanks=5:3
 redplanks=5:3
+acaciaplanks=5:4
+darkoakplanks=5:5
+bigoakplanks=5:5
+roofedoakplanks=5:5
+
 
 ; Obsolete: do not use "wood", as its meaning is not clear - wiki uses log as wood, we use planks as wood.
 wood=5
@@ -40,6 +53,7 @@ stilllava=11
 slava=11
 stationarylava=11
 sand=12
+redsand=12:1
 gravel=13
 goldore=14
 ironore=15
@@ -64,6 +78,7 @@ spruceleaves=18:1
 birchleaves=18:2
 jungleleaves=18:3
 sponge=19
+wetsponge=19:1
 glass=20
 lapisore=21
 lapisblock=22
@@ -169,6 +184,7 @@ torch=50
 fire=51
 mobspawner=52
 woodstairs=53
+oakwoodstairs=53
 chest=54
 redstonedust=55
 redstonewire=55
@@ -274,13 +290,47 @@ redstonelamp=123
 redstonelampoff=123
 redstonelampon=124
 woodendoubleslab=125
+appledoublewoodslab=125:0
+oakwooddoubleslab=125:0
+coniferwooddoubleslab=125:1
+pinewooddoubleslab=125:1
+sprucewooddoubleslab=125:1
+darkwooddoubleslab=125:1
+birchwooddoubleslab=125:2
+whitewooddoubleslab=125:2
+junglewooddoubleslab=125:3
+acaciawooddoubleslab=125:4
+bigoakwooddoubleslab=125:5
+darkoakwooddoubleslab=125:5
+roofedwooddoubleslab=125:5
 woodenslab=126
+applewoodslab=126:0
+oakwoodslab=126:0
+coniferwoodslab=126:1
+pinewoodslab=126:1
+sprucewoodslab=126:1
+darkwoodslab=126:1
+birchwoodslab=126:2
+whitewoodslab=126:2
+junglewoodslab=126:3
+acaciawoodslab=126:4
+bigoakwoodslab=126:5
+darkoakwoodslab=126:5
+roofedwoodslab=126:5
+cocoabeans=127
 sandstonestairs=128
 emeraldore=129
 enderchest=130
 tripwirehook=131
 tripwire=132
 emeraldblock=133
+coniferwoodstairs=134
+pinewoodstairs=134
+sprucewoodstairs=134
+darkwoodstairs=134
+birchwoodstairs=135
+whitewoodstairs=135
+junglewoodstairs=136
 commandblock=137
 beacon=138
 cobblestonewall=139
@@ -343,12 +393,54 @@ brownstainedglasspane=160:12
 greenstainedglasspane=160:13
 redstainedglasspane=160:14
 blackstainedglasspane=160:15
-acaciawood=162
-darkoakwood=162:1
-acaciawoodenstairs=163
-darkoakwoodenstairs=164
+acacialeaves=161
+bigoakleaves=161:1
+darkoakleaves=161:1
+roofedoakleaves=161:1
+acacialog=162
+bigoaklog=162:1
+darkoaklog=162:1
+roofedoaklog=162:1
+acaciawoodstairs=163
+bigoakwoodstiars=164
+darkoakwoodstairs=164
+roofedoakwoodstairs=164
+slimeblock=165
+irontrapdoor=167
+prismarine=168
+prismarinebricks=168:1
+darkprismarine=168:2
+sealantern=169
 haybale=170
 carpet=171
+hardenedclay=172
+redsandstone=179
+chiseledredsandstone=179:1
+smoothredsandstone=179:2
+redsandstonestairs=180
+redsandstoneslab=182
+coniferfencegate=183
+pinefencegate=183
+sprucefencegate=183
+darkfencegate=183
+birchfencegate=184
+whitefencegate=184
+junglefencegate=185
+darkoakfencegate=186
+bigoakfencegate=186
+roofedoakfencegate=186
+acaciafencegate=187
+coniferfence=188
+pinefence=188
+sprucefence=188
+darkfence=188
+birchfence=189
+whitefence=189
+junglefence=190
+darkoakfence=191
+bigoakfence=191
+roofedoakfence=191
+acaciafence=192
 ironshovel=256
 ironspade=256
 ironpickaxe=257
@@ -596,13 +688,52 @@ netherbrickitem=405
 netherquartz=406
 tntminecart=407
 hopperminecart=408
+prismarineshard=409
+prismarinecrystals=410
+rawrabbit=411
+cookedrabbit=412
+rabbitstew=413
+rabbitsoup=413
+rabbitsfood=414
+rabbithide=415
+armorstand=416
 ironhorsearmor=417
 goldhorsearmor=418
 diamondhorsearmor=419
 lead=420
 nametag=421
 commandblockminecart=422
-
+rawmutton=423
+cookedmutton=424
+banner=425
+blackbanner=415:0
+redbanner=415:1
+greenbanner=415:2
+brownbanner=415:3
+bluebanner=415:4
+purplebanner=415:5
+cyanbanner=415:6
+silverbanner=415:7
+lightgraybanner=415:7
+graybanner=415:8
+pinkbanner=415:9
+limebanner=415:10
+yellowbanner=415:11
+lightbluebanner=415:12
+magentabanner=415:13
+orangebanner=415:14
+whitebanner=415:15
+coniferdoor=427
+pinedoor=427
+sprucedoor=427
+darkdoor=427
+birchdoor=428
+whitedoor=428
+jungledoor=429
+acaciadoor=430
+bigoakdoor=431
+darkoakdoor=431
+roofedoakdoor=431
 goldrecord=2256
 greenrecord=2257
 blocksrecord=2258