2 files changed, 82 insertions, 16 deletions

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 684294bb3..5bb0569f3 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
@@ -74,11 +76,25 @@ 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
 
 # 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
@@ -86,9 +102,20 @@ 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
 
+
 # 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 +128,6 @@ 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
 
 # Other
 Carpet             = Wool, 1:3, 2:3
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 7b8fcf4ee..4f4df220e 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -17,6 +17,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
@@ -169,6 +174,7 @@ torch=50
 fire=51
 mobspawner=52
 woodstairs=53
+oakwoodstairs=53
 chest=54
 redstonedust=55
 redstonewire=55
@@ -274,13 +280,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,10 +383,18 @@ 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
 haybale=170
 carpet=171
 ironshovel=256