2 files changed, 46 insertions, 9 deletions
diff --git a/crafting.txt b/crafting.txt
index dd94556f9..f8e6d4e61 100644
--- a/crafting.txt
+++ b/crafting.txt
@@ -40,15 +40,15 @@
 #
 
 # Need to list each of the four log types, otherwise all logs would get converted into apple planks (^0)
-Planks ^0, 4 = Log ^0, * 
-Planks ^1, 4 = Log ^1, *
-Planks ^2, 4 = Log ^2, *
-Planks ^3, 4 = Log ^3, *
-Stick, 4     = Planks, 2:2, 2:3
-Workbench    = Planks, 1:1, 1:2, 2:1, 2:2
-Chest        = Planks,      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
-Torch, 4     = Stick, 1:2 | Coal, 1:1
+ApplePlanks, 4   = AppleLog, * 
+ConiferPlanks, 4 = ConiferLog, *
+BirchPlanks, 4   = BirchLog, *
+JunglePlanks, 4  = JungleLog, *
+Stick, 4         = Planks, 2:2, 2:3
+Workbench        = Planks, 1:1, 1:2, 2:1, 2:2
+Chest            = Planks,      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
+Torch, 4         = Stick, 1:2 | Coal, 1:1
 
 
 
diff --git a/items.ini b/items.ini
index 9135a5573..852254214 100644
--- a/items.ini
+++ b/items.ini
@@ -6,8 +6,28 @@ dirt=3
 cobblestone=4
 cobble=4
 planks=5
+appleplanks=5:0
+oakplanks=5:0
+coniferplanks=5:1
+pineplanks=5:1
+spruceplanks=5:1
+darkplanks=5:1
+birchplanks=5:2
+lightplanks=5:2
+jungleplanks=5:3
+redplanks=5:3
+
+; Obsolete: do not use "wood", as it's meaning is not clear - wiki uses log as wood, we use planks as wood.
 wood=5
+
 sapling=6
+applesapling=6:0
+oaksapling=6:0
+conifersapling=6:1
+pinesapling=6:1
+sprucesapling=6:1
+birchsapling=6:2
+junglesapling=6:3
 adminium=7
 bedrock=7
 water=8
@@ -23,7 +43,23 @@ ironore=15
 coalore=16
 tree=17
 log=17
+applelog=17:0
+oaklog=17:0
+coniferlog=17:1
+pinelog=17:1
+sprucelog=17:1
+darklog=17:1
+birchlog=17:2
+whitelog=17:2
+junglelog=17:3
 leaves=18
+appleleaves=18:0
+oakleaves=18:0
+coniferleaves=18:1
+pineleaves=18:1
+spruceleaves=18:1
+birchleaves=18:2
+jungleleaves=18:3
 sponge=19
 glass=20
 lapisore=21
@@ -190,6 +226,7 @@ redapple=260
 bow=261
 arrow=262
 coal=263
+charcoal=263:1
 diamond=264
 ironingot=265
 ironbar=265