21 files changed, 59 insertions, 330 deletions

diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index 084e58de7..8abc8af0a 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 02/15/13 12:20:59.
+** Generated automatically by tolua++-1.0.92 on 02/16/13 12:08:29.
 */
 
 #ifndef __cplusplus
@@ -21405,7 +21405,6 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_BLOCK_DEAD_BUSH",E_BLOCK_DEAD_BUSH);
   tolua_constant(tolua_S,"E_BLOCK_PISTON",E_BLOCK_PISTON);
   tolua_constant(tolua_S,"E_BLOCK_PISTON_EXTENSION",E_BLOCK_PISTON_EXTENSION);
-  tolua_constant(tolua_S,"E_BLOCK_WHITE_CLOTH",E_BLOCK_WHITE_CLOTH);
   tolua_constant(tolua_S,"E_BLOCK_WOOL",E_BLOCK_WOOL);
   tolua_constant(tolua_S,"E_BLOCK_PISTON_MOVED_BLOCK",E_BLOCK_PISTON_MOVED_BLOCK);
   tolua_constant(tolua_S,"E_BLOCK_YELLOW_FLOWER",E_BLOCK_YELLOW_FLOWER);
@@ -21415,9 +21414,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_BLOCK_GOLD_BLOCK",E_BLOCK_GOLD_BLOCK);
   tolua_constant(tolua_S,"E_BLOCK_IRON_BLOCK",E_BLOCK_IRON_BLOCK);
   tolua_constant(tolua_S,"E_BLOCK_DOUBLE_STONE_SLAB",E_BLOCK_DOUBLE_STONE_SLAB);
-  tolua_constant(tolua_S,"E_BLOCK_DOUBLE_STEP",E_BLOCK_DOUBLE_STEP);
   tolua_constant(tolua_S,"E_BLOCK_STONE_SLAB",E_BLOCK_STONE_SLAB);
-  tolua_constant(tolua_S,"E_BLOCK_STEP",E_BLOCK_STEP);
   tolua_constant(tolua_S,"E_BLOCK_BRICK",E_BLOCK_BRICK);
   tolua_constant(tolua_S,"E_BLOCK_TNT",E_BLOCK_TNT);
   tolua_constant(tolua_S,"E_BLOCK_BOOKCASE",E_BLOCK_BOOKCASE);
@@ -21434,7 +21431,6 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_BLOCK_CRAFTING_TABLE",E_BLOCK_CRAFTING_TABLE);
   tolua_constant(tolua_S,"E_BLOCK_WORKBENCH",E_BLOCK_WORKBENCH);
   tolua_constant(tolua_S,"E_BLOCK_CROPS",E_BLOCK_CROPS);
-  tolua_constant(tolua_S,"E_BLOCK_SOIL",E_BLOCK_SOIL);
   tolua_constant(tolua_S,"E_BLOCK_FARMLAND",E_BLOCK_FARMLAND);
   tolua_constant(tolua_S,"E_BLOCK_FURNACE",E_BLOCK_FURNACE);
   tolua_constant(tolua_S,"E_BLOCK_LIT_FURNACE",E_BLOCK_LIT_FURNACE);
@@ -21465,11 +21461,9 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_BLOCK_JUKEBOX",E_BLOCK_JUKEBOX);
   tolua_constant(tolua_S,"E_BLOCK_FENCE",E_BLOCK_FENCE);
   tolua_constant(tolua_S,"E_BLOCK_PUMPKIN",E_BLOCK_PUMPKIN);
-  tolua_constant(tolua_S,"E_BLOCK_BLOODSTONE",E_BLOCK_BLOODSTONE);
   tolua_constant(tolua_S,"E_BLOCK_NETHERRACK",E_BLOCK_NETHERRACK);
   tolua_constant(tolua_S,"E_BLOCK_SOULSAND",E_BLOCK_SOULSAND);
   tolua_constant(tolua_S,"E_BLOCK_GLOWSTONE",E_BLOCK_GLOWSTONE);
-  tolua_constant(tolua_S,"E_BLOCK_PORT",E_BLOCK_PORT);
   tolua_constant(tolua_S,"E_BLOCK_NETHER_PORTAL",E_BLOCK_NETHER_PORTAL);
   tolua_constant(tolua_S,"E_BLOCK_JACK_O_LANTERN",E_BLOCK_JACK_O_LANTERN);
   tolua_constant(tolua_S,"E_BLOCK_CAKE",E_BLOCK_CAKE);
@@ -21482,9 +21476,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_BLOCK_HUGE_BROWN_MUSHROOM",E_BLOCK_HUGE_BROWN_MUSHROOM);
   tolua_constant(tolua_S,"E_BLOCK_HUGE_RED_MUSHROOM",E_BLOCK_HUGE_RED_MUSHROOM);
   tolua_constant(tolua_S,"E_BLOCK_IRON_BARS",E_BLOCK_IRON_BARS);
-  tolua_constant(tolua_S,"E_BLOCK_IRON_BAR",E_BLOCK_IRON_BAR);
   tolua_constant(tolua_S,"E_BLOCK_GLASS_PANE",E_BLOCK_GLASS_PANE);
-  tolua_constant(tolua_S,"E_BLOCK_GLASS_PLANE",E_BLOCK_GLASS_PLANE);
   tolua_constant(tolua_S,"E_BLOCK_MELON",E_BLOCK_MELON);
   tolua_constant(tolua_S,"E_BLOCK_PUMPKIN_STEM",E_BLOCK_PUMPKIN_STEM);
   tolua_constant(tolua_S,"E_BLOCK_MELON_STEM",E_BLOCK_MELON_STEM);
@@ -21510,7 +21502,6 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_BLOCK_DOUBLE_WOODEN_SLAB",E_BLOCK_DOUBLE_WOODEN_SLAB);
   tolua_constant(tolua_S,"E_BLOCK_WOODEN_SLAB",E_BLOCK_WOODEN_SLAB);
   tolua_constant(tolua_S,"E_BLOCK_COCOA_POD",E_BLOCK_COCOA_POD);
-  tolua_constant(tolua_S,"E_BLOCK_COCA_PLANT",E_BLOCK_COCA_PLANT);
   tolua_constant(tolua_S,"E_BLOCK_SANDSTONE_STAIRS",E_BLOCK_SANDSTONE_STAIRS);
   tolua_constant(tolua_S,"E_BLOCK_EMERALD_ORE",E_BLOCK_EMERALD_ORE);
   tolua_constant(tolua_S,"E_BLOCK_ENDER_CHEST",E_BLOCK_ENDER_CHEST);
@@ -21528,142 +21519,26 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_BLOCK_POTATOES",E_BLOCK_POTATOES);
   tolua_constant(tolua_S,"E_BLOCK_WOODEN_BUTTON",E_BLOCK_WOODEN_BUTTON);
   tolua_constant(tolua_S,"E_BLOCK_HEAD",E_BLOCK_HEAD);
+  tolua_constant(tolua_S,"E_BLOCK_TRAPPED_CHEST",E_BLOCK_TRAPPED_CHEST);
+  tolua_constant(tolua_S,"E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE",E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE);
+  tolua_constant(tolua_S,"E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE",E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE);
+  tolua_constant(tolua_S,"E_BLOCK_INACTIVE_COMPARATOR",E_BLOCK_INACTIVE_COMPARATOR);
+  tolua_constant(tolua_S,"E_BLOCK_ACTIVE_COMPARATOR",E_BLOCK_ACTIVE_COMPARATOR);
+  tolua_constant(tolua_S,"E_BLOCK_DAYLIGHT_SENSOR",E_BLOCK_DAYLIGHT_SENSOR);
+  tolua_constant(tolua_S,"E_BLOCK_BLOCK_OF_REDSTONE",E_BLOCK_BLOCK_OF_REDSTONE);
+  tolua_constant(tolua_S,"E_BLOCK_NETHER_QUARTZ_ORE",E_BLOCK_NETHER_QUARTZ_ORE);
+  tolua_constant(tolua_S,"E_BLOCK_HOPPER",E_BLOCK_HOPPER);
+  tolua_constant(tolua_S,"E_BLOCK_QUARTZ_BLOCK",E_BLOCK_QUARTZ_BLOCK);
+  tolua_constant(tolua_S,"E_BLOCK_ACTIVATOR_RAIL",E_BLOCK_ACTIVATOR_RAIL);
   tolua_constant(tolua_S,"E_BLOCK_NUMBER_OF_TYPES",E_BLOCK_NUMBER_OF_TYPES);
   tolua_constant(tolua_S,"E_BLOCK_MAX_TYPE_ID",E_BLOCK_MAX_TYPE_ID);
   tolua_constant(tolua_S,"E_ITEM_EMPTY",E_ITEM_EMPTY);
-  tolua_constant(tolua_S,"E_ITEM_STONE",E_ITEM_STONE);
-  tolua_constant(tolua_S,"E_ITEM_GRASS",E_ITEM_GRASS);
-  tolua_constant(tolua_S,"E_ITEM_DIRT",E_ITEM_DIRT);
-  tolua_constant(tolua_S,"E_ITEM_COBBLESTONE",E_ITEM_COBBLESTONE);
-  tolua_constant(tolua_S,"E_ITEM_PLANKS",E_ITEM_PLANKS);
-  tolua_constant(tolua_S,"E_ITEM_WOOD",E_ITEM_WOOD);
-  tolua_constant(tolua_S,"E_ITEM_SAPLING",E_ITEM_SAPLING);
-  tolua_constant(tolua_S,"E_ITEM_BEDROCK",E_ITEM_BEDROCK);
-  tolua_constant(tolua_S,"E_ITEM_WATER",E_ITEM_WATER);
-  tolua_constant(tolua_S,"E_ITEM_STATIONARY_WATER",E_ITEM_STATIONARY_WATER);
-  tolua_constant(tolua_S,"E_ITEM_LAVA",E_ITEM_LAVA);
-  tolua_constant(tolua_S,"E_ITEM_STATIONARY_LAVA",E_ITEM_STATIONARY_LAVA);
-  tolua_constant(tolua_S,"E_ITEM_SAND",E_ITEM_SAND);
-  tolua_constant(tolua_S,"E_ITEM_GRAVEL",E_ITEM_GRAVEL);
-  tolua_constant(tolua_S,"E_ITEM_GOLD_ORE",E_ITEM_GOLD_ORE);
-  tolua_constant(tolua_S,"E_ITEM_IRON_ORE",E_ITEM_IRON_ORE);
-  tolua_constant(tolua_S,"E_ITEM_COAL_ORE",E_ITEM_COAL_ORE);
-  tolua_constant(tolua_S,"E_ITEM_LOG",E_ITEM_LOG);
-  tolua_constant(tolua_S,"E_ITEM_LEAVES",E_ITEM_LEAVES);
-  tolua_constant(tolua_S,"E_ITEM_SPONGE",E_ITEM_SPONGE);
-  tolua_constant(tolua_S,"E_ITEM_GLASS",E_ITEM_GLASS);
-  tolua_constant(tolua_S,"E_ITEM_LAPIS_ORE",E_ITEM_LAPIS_ORE);
-  tolua_constant(tolua_S,"E_ITEM_LAPIS_BLOCK",E_ITEM_LAPIS_BLOCK);
-  tolua_constant(tolua_S,"E_ITEM_DISPENSER",E_ITEM_DISPENSER);
-  tolua_constant(tolua_S,"E_ITEM_SANDSTONE",E_ITEM_SANDSTONE);
-  tolua_constant(tolua_S,"E_ITEM_NOTE_ITEM",E_ITEM_NOTE_ITEM);
-  tolua_constant(tolua_S,"E_ITEM_POWERED_RAIL",E_ITEM_POWERED_RAIL);
-  tolua_constant(tolua_S,"E_ITEM_DETECTOR_RAIL",E_ITEM_DETECTOR_RAIL);
-  tolua_constant(tolua_S,"E_ITEM_STICKY_PISTON",E_ITEM_STICKY_PISTON);
-  tolua_constant(tolua_S,"E_ITEM_COBWEB",E_ITEM_COBWEB);
-  tolua_constant(tolua_S,"E_ITEM_TALL_GRASS",E_ITEM_TALL_GRASS);
-  tolua_constant(tolua_S,"E_ITEM_DEAD_BRUSH",E_ITEM_DEAD_BRUSH);
-  tolua_constant(tolua_S,"E_ITEM_PISTON",E_ITEM_PISTON);
-  tolua_constant(tolua_S,"E_ITEM_PISTON_EXTENSION",E_ITEM_PISTON_EXTENSION);
-  tolua_constant(tolua_S,"E_ITEM_WOOL",E_ITEM_WOOL);
-  tolua_constant(tolua_S,"E_ITEM_WHITE_CLOTH",E_ITEM_WHITE_CLOTH);
-  tolua_constant(tolua_S,"E_ITEM_PISTON_MOVED_BLOCK",E_ITEM_PISTON_MOVED_BLOCK);
-  tolua_constant(tolua_S,"E_ITEM_YELLOW_FLOWER",E_ITEM_YELLOW_FLOWER);
-  tolua_constant(tolua_S,"E_ITEM_RED_ROSE",E_ITEM_RED_ROSE);
-  tolua_constant(tolua_S,"E_ITEM_BROWN_MUSHROOM",E_ITEM_BROWN_MUSHROOM);
-  tolua_constant(tolua_S,"E_ITEM_RED_MUSHROOM",E_ITEM_RED_MUSHROOM);
-  tolua_constant(tolua_S,"E_ITEM_GOLD_BLOCK",E_ITEM_GOLD_BLOCK);
-  tolua_constant(tolua_S,"E_ITEM_IRON_BLOCK",E_ITEM_IRON_BLOCK);
-  tolua_constant(tolua_S,"E_ITEM_DOUBLE_STONE_SLAB",E_ITEM_DOUBLE_STONE_SLAB);
-  tolua_constant(tolua_S,"E_ITEM_DOUBLE_STEP",E_ITEM_DOUBLE_STEP);
-  tolua_constant(tolua_S,"E_ITEM_STONE_SLAB",E_ITEM_STONE_SLAB);
-  tolua_constant(tolua_S,"E_ITEM_STEP",E_ITEM_STEP);
-  tolua_constant(tolua_S,"E_ITEM_BRICK",E_ITEM_BRICK);
-  tolua_constant(tolua_S,"E_ITEM_TNT",E_ITEM_TNT);
-  tolua_constant(tolua_S,"E_ITEM_BOOKCASE",E_ITEM_BOOKCASE);
-  tolua_constant(tolua_S,"E_ITEM_MOSSY_COBBLESTONE",E_ITEM_MOSSY_COBBLESTONE);
-  tolua_constant(tolua_S,"E_ITEM_OBSIDIAN",E_ITEM_OBSIDIAN);
-  tolua_constant(tolua_S,"E_ITEM_TORCH",E_ITEM_TORCH);
-  tolua_constant(tolua_S,"E_ITEM_FIRE",E_ITEM_FIRE);
-  tolua_constant(tolua_S,"E_ITEM_MOB_SPAWNER",E_ITEM_MOB_SPAWNER);
-  tolua_constant(tolua_S,"E_ITEM_WOODEN_STAIRS",E_ITEM_WOODEN_STAIRS);
-  tolua_constant(tolua_S,"E_ITEM_CHEST",E_ITEM_CHEST);
-  tolua_constant(tolua_S,"E_ITEM_REDSTONE_WIRE",E_ITEM_REDSTONE_WIRE);
-  tolua_constant(tolua_S,"E_ITEM_DIAMOND_ORE",E_ITEM_DIAMOND_ORE);
-  tolua_constant(tolua_S,"E_ITEM_DIAMOND_BLOCK",E_ITEM_DIAMOND_BLOCK);
-  tolua_constant(tolua_S,"E_ITEM_WORKBENCH",E_ITEM_WORKBENCH);
-  tolua_constant(tolua_S,"E_ITEM_CROPS",E_ITEM_CROPS);
-  tolua_constant(tolua_S,"E_ITEM_SOIL",E_ITEM_SOIL);
-  tolua_constant(tolua_S,"E_ITEM_FURNACE",E_ITEM_FURNACE);
-  tolua_constant(tolua_S,"E_ITEM_BURNING_FURNACE",E_ITEM_BURNING_FURNACE);
-  tolua_constant(tolua_S,"E_ITEM_SIGN_POST",E_ITEM_SIGN_POST);
-  tolua_constant(tolua_S,"E_ITEM_LADDER",E_ITEM_LADDER);
-  tolua_constant(tolua_S,"E_ITEM_MINECART_TRACKS",E_ITEM_MINECART_TRACKS);
-  tolua_constant(tolua_S,"E_ITEM_COBBLESTONE_STAIRS",E_ITEM_COBBLESTONE_STAIRS);
-  tolua_constant(tolua_S,"E_ITEM_WALLSIGN",E_ITEM_WALLSIGN);
-  tolua_constant(tolua_S,"E_ITEM_LEVER",E_ITEM_LEVER);
-  tolua_constant(tolua_S,"E_ITEM_STONE_PRESSURE_PLATE",E_ITEM_STONE_PRESSURE_PLATE);
-  tolua_constant(tolua_S,"E_ITEM_WOODEN_PRESSURE_PLATE",E_ITEM_WOODEN_PRESSURE_PLATE);
-  tolua_constant(tolua_S,"E_ITEM_REDSTONE_ORE",E_ITEM_REDSTONE_ORE);
-  tolua_constant(tolua_S,"E_ITEM_REDSTONE_ORE_GLOWING",E_ITEM_REDSTONE_ORE_GLOWING);
-  tolua_constant(tolua_S,"E_ITEM_REDSTONE_TORCH_OFF",E_ITEM_REDSTONE_TORCH_OFF);
-  tolua_constant(tolua_S,"E_ITEM_REDSTONE_TORCH_ON",E_ITEM_REDSTONE_TORCH_ON);
-  tolua_constant(tolua_S,"E_ITEM_STONE_BUTTON",E_ITEM_STONE_BUTTON);
-  tolua_constant(tolua_S,"E_ITEM_SNOW",E_ITEM_SNOW);
-  tolua_constant(tolua_S,"E_ITEM_ICE",E_ITEM_ICE);
-  tolua_constant(tolua_S,"E_ITEM_SNOW_BLOCK",E_ITEM_SNOW_BLOCK);
-  tolua_constant(tolua_S,"E_ITEM_CACTUS",E_ITEM_CACTUS);
-  tolua_constant(tolua_S,"E_ITEM_REEDS",E_ITEM_REEDS);
-  tolua_constant(tolua_S,"E_ITEM_JUKEBOX",E_ITEM_JUKEBOX);
-  tolua_constant(tolua_S,"E_ITEM_FENCE",E_ITEM_FENCE);
-  tolua_constant(tolua_S,"E_ITEM_PUMPKIN",E_ITEM_PUMPKIN);
-  tolua_constant(tolua_S,"E_ITEM_BLOODSTONE",E_ITEM_BLOODSTONE);
-  tolua_constant(tolua_S,"E_ITEM_SOULSAND",E_ITEM_SOULSAND);
-  tolua_constant(tolua_S,"E_ITEM_GLOWSTONE",E_ITEM_GLOWSTONE);
-  tolua_constant(tolua_S,"E_ITEM_PORT",E_ITEM_PORT);
-  tolua_constant(tolua_S,"E_ITEM_JACK_O_LANTERN",E_ITEM_JACK_O_LANTERN);
-  tolua_constant(tolua_S,"E_ITEM_REDSTONE_REPEATER_OFF",E_ITEM_REDSTONE_REPEATER_OFF);
-  tolua_constant(tolua_S,"E_ITEM_REDSTONE_REPEATER_ON",E_ITEM_REDSTONE_REPEATER_ON);
-  tolua_constant(tolua_S,"E_ITEM_LOCKED_CHEST",E_ITEM_LOCKED_CHEST);
-  tolua_constant(tolua_S,"E_ITEM_TRAPDOOR",E_ITEM_TRAPDOOR);
-  tolua_constant(tolua_S,"E_ITEM_SILVERFISH_EGG",E_ITEM_SILVERFISH_EGG);
-  tolua_constant(tolua_S,"E_ITEM_STONE_BRICKS",E_ITEM_STONE_BRICKS);
-  tolua_constant(tolua_S,"E_ITEM_HUGE_BROWN_MUSHROOM",E_ITEM_HUGE_BROWN_MUSHROOM);
-  tolua_constant(tolua_S,"E_ITEM_HUGE_RED_MUSHROOM",E_ITEM_HUGE_RED_MUSHROOM);
-  tolua_constant(tolua_S,"E_ITEM_IRON_BAR",E_ITEM_IRON_BAR);
-  tolua_constant(tolua_S,"E_ITEM_GLASS_PLANE",E_ITEM_GLASS_PLANE);
-  tolua_constant(tolua_S,"E_ITEM_MELON",E_ITEM_MELON);
-  tolua_constant(tolua_S,"E_ITEM_PUMPKIN_STEM",E_ITEM_PUMPKIN_STEM);
-  tolua_constant(tolua_S,"E_ITEM_MELON_STEM",E_ITEM_MELON_STEM);
-  tolua_constant(tolua_S,"E_ITEM_VINES",E_ITEM_VINES);
-  tolua_constant(tolua_S,"E_ITEM_FENCE_GATE",E_ITEM_FENCE_GATE);
-  tolua_constant(tolua_S,"E_ITEM_BRICK_STAIRS",E_ITEM_BRICK_STAIRS);
-  tolua_constant(tolua_S,"E_ITEM_STONE_BRICK_STAIRS",E_ITEM_STONE_BRICK_STAIRS);
-  tolua_constant(tolua_S,"E_ITEM_MYCELIUM",E_ITEM_MYCELIUM);
-  tolua_constant(tolua_S,"E_ITEM_LILY_PAD",E_ITEM_LILY_PAD);
-  tolua_constant(tolua_S,"E_ITEM_NETHER_BRICK",E_ITEM_NETHER_BRICK);
-  tolua_constant(tolua_S,"E_ITEM_NETHER_BRICK_FENCE",E_ITEM_NETHER_BRICK_FENCE);
-  tolua_constant(tolua_S,"E_ITEM_NETHER_BRICK_STAIRS",E_ITEM_NETHER_BRICK_STAIRS);
-  tolua_constant(tolua_S,"E_ITEM_ENCHANTMENT_TABLE",E_ITEM_ENCHANTMENT_TABLE);
-  tolua_constant(tolua_S,"E_ITEM_END_PORTAL",E_ITEM_END_PORTAL);
-  tolua_constant(tolua_S,"E_ITEM_END_PORTAL_FRAME",E_ITEM_END_PORTAL_FRAME);
-  tolua_constant(tolua_S,"E_ITEM_END_STONE",E_ITEM_END_STONE);
-  tolua_constant(tolua_S,"E_ITEM_DOUBLE_WOODEN_SLAB",E_ITEM_DOUBLE_WOODEN_SLAB);
-  tolua_constant(tolua_S,"E_ITEM_WOODEN_SLAB",E_ITEM_WOODEN_SLAB);
-  tolua_constant(tolua_S,"E_ITEM_COCA_PLANT",E_ITEM_COCA_PLANT);
-  tolua_constant(tolua_S,"E_ITEM_SANDSTONE_STAIRS",E_ITEM_SANDSTONE_STAIRS);
-  tolua_constant(tolua_S,"E_ITEM_EMERALD_ORE",E_ITEM_EMERALD_ORE);
-  tolua_constant(tolua_S,"E_ITEM_ENDER_CHEST",E_ITEM_ENDER_CHEST);
-  tolua_constant(tolua_S,"E_ITEM_TRIPWIRE_HOOK",E_ITEM_TRIPWIRE_HOOK);
-  tolua_constant(tolua_S,"E_ITEM_TRIPWIRE",E_ITEM_TRIPWIRE);
-  tolua_constant(tolua_S,"E_ITEM_EMERALD_BLOCK",E_ITEM_EMERALD_BLOCK);
   tolua_constant(tolua_S,"E_ITEM_FIRST",E_ITEM_FIRST);
   tolua_constant(tolua_S,"E_ITEM_IRON_SHOVEL",E_ITEM_IRON_SHOVEL);
   tolua_constant(tolua_S,"E_ITEM_IRON_PICKAXE",E_ITEM_IRON_PICKAXE);
   tolua_constant(tolua_S,"E_ITEM_IRON_AXE",E_ITEM_IRON_AXE);
   tolua_constant(tolua_S,"E_ITEM_FLINT_AND_STEEL",E_ITEM_FLINT_AND_STEEL);
   tolua_constant(tolua_S,"E_ITEM_RED_APPLE",E_ITEM_RED_APPLE);
-  tolua_constant(tolua_S,"E_ITEM_APPLE",E_ITEM_APPLE);
   tolua_constant(tolua_S,"E_ITEM_BOW",E_ITEM_BOW);
   tolua_constant(tolua_S,"E_ITEM_ARROW",E_ITEM_ARROW);
   tolua_constant(tolua_S,"E_ITEM_COAL",E_ITEM_COAL);
@@ -21723,9 +21598,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_ITEM_GOLD_BOOTS",E_ITEM_GOLD_BOOTS);
   tolua_constant(tolua_S,"E_ITEM_FLINT",E_ITEM_FLINT);
   tolua_constant(tolua_S,"E_ITEM_RAW_PORKCHOP",E_ITEM_RAW_PORKCHOP);
-  tolua_constant(tolua_S,"E_ITEM_RAW_MEAT",E_ITEM_RAW_MEAT);
   tolua_constant(tolua_S,"E_ITEM_COOKED_PORKCHOP",E_ITEM_COOKED_PORKCHOP);
-  tolua_constant(tolua_S,"E_ITEM_COOKED_MEAT",E_ITEM_COOKED_MEAT);
   tolua_constant(tolua_S,"E_ITEM_PAINTINGS",E_ITEM_PAINTINGS);
   tolua_constant(tolua_S,"E_ITEM_GOLDEN_APPLE",E_ITEM_GOLDEN_APPLE);
   tolua_constant(tolua_S,"E_ITEM_SIGN",E_ITEM_SIGN);
@@ -21799,6 +21672,9 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_ITEM_FIREWORK_ROCKET",E_ITEM_FIREWORK_ROCKET);
   tolua_constant(tolua_S,"E_ITEM_FIREWORK_STAR",E_ITEM_FIREWORK_STAR);
   tolua_constant(tolua_S,"E_ITEM_ENCHANTED_BOOK",E_ITEM_ENCHANTED_BOOK);
+  tolua_constant(tolua_S,"E_ITEM_COMPARATOR",E_ITEM_COMPARATOR);
+  tolua_constant(tolua_S,"E_ITEM_NETHER_BRICK",E_ITEM_NETHER_BRICK);
+  tolua_constant(tolua_S,"E_ITEM_NETHER_QUARTZ",E_ITEM_NETHER_QUARTZ);
   tolua_constant(tolua_S,"E_ITEM_NUMBER_OF_CONSECUTIVE_TYPES",E_ITEM_NUMBER_OF_CONSECUTIVE_TYPES);
   tolua_constant(tolua_S,"E_ITEM_MAX_CONSECUTIVE_TYPE_ID",E_ITEM_MAX_CONSECUTIVE_TYPE_ID);
   tolua_constant(tolua_S,"E_ITEM_FIRST_DISC",E_ITEM_FIRST_DISC);
diff --git a/source/Bindings.h b/source/Bindings.h
index fcaeb2242..b073923f0 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 02/15/13 12:21:00.
+** Generated automatically by tolua++-1.0.92 on 02/16/13 12:08:29.
 */
 
 /* Exported function */
diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index 0cb0967ad..e5b21379a 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -372,7 +372,7 @@ public:
 		g_BlockSpreadLightFalloff[E_BLOCK_FENCE_GATE]       = 1;
 		g_BlockSpreadLightFalloff[E_BLOCK_FIRE]             = 1;
 		g_BlockSpreadLightFalloff[E_BLOCK_GLASS]            = 1;
-		g_BlockSpreadLightFalloff[E_BLOCK_GLASS_PLANE]      = 1;
+		g_BlockSpreadLightFalloff[E_BLOCK_GLASS_PANE]       = 1;
 		g_BlockSpreadLightFalloff[E_BLOCK_GLOWSTONE]        = 1;
 		g_BlockSpreadLightFalloff[E_BLOCK_IRON_BARS]        = 1;
 		g_BlockSpreadLightFalloff[E_BLOCK_IRON_DOOR]        = 1;
diff --git a/source/BlockID.h b/source/BlockID.h
index 4cdad6e03..bf6aa1076 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -9,7 +9,6 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_DIRT	= 3,
 	E_BLOCK_COBBLESTONE = 4,
 	E_BLOCK_PLANKS = 5,
-	// E_BLOCK_WOOD = E_BLOCK_PLANKS,  // Obsolete - was confused too often: wood = logs or planks?
 	E_BLOCK_SAPLING = 6,
 	E_BLOCK_BEDROCK = 7,
 	E_BLOCK_WATER = 8,
@@ -39,7 +38,6 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_DEAD_BUSH = 32,
 	E_BLOCK_PISTON = 33,
 	E_BLOCK_PISTON_EXTENSION = 34,
-	E_BLOCK_WHITE_CLOTH = 35,  // Deprecated, use E_BLOCK_WOOL instead
 	E_BLOCK_WOOL = 35,
 	E_BLOCK_PISTON_MOVED_BLOCK = 36,
 	E_BLOCK_YELLOW_FLOWER = 37,
@@ -49,9 +47,7 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_GOLD_BLOCK = 41,
 	E_BLOCK_IRON_BLOCK = 42,
 	E_BLOCK_DOUBLE_STONE_SLAB = 43,
-	E_BLOCK_DOUBLE_STEP = 43,  /// OBSOLETE, use E_BLOCK_DOUBLE_STONE_SLAB instead
 	E_BLOCK_STONE_SLAB = 44,
-	E_BLOCK_STEP = 44,  /// OBSOLETE, use E_BLOCK_STONE_SLAB instead
 	E_BLOCK_BRICK = 45,
 	E_BLOCK_TNT = 46,
 	E_BLOCK_BOOKCASE = 47,
@@ -68,7 +64,6 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_CRAFTING_TABLE = 58,
 	E_BLOCK_WORKBENCH = 58,
 	E_BLOCK_CROPS = 59,
-	E_BLOCK_SOIL = 60,  // Deprecated, use E_BLOCK_FARMLAND instead
 	E_BLOCK_FARMLAND = 60,
 	E_BLOCK_FURNACE = 61,
 	E_BLOCK_LIT_FURNACE = 62,
@@ -99,11 +94,9 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_JUKEBOX = 84,
 	E_BLOCK_FENCE = 85,
 	E_BLOCK_PUMPKIN = 86,
-	E_BLOCK_BLOODSTONE = 87,  // Deprecated, use E_BLOCK_NETHERRACK
 	E_BLOCK_NETHERRACK = 87,
 	E_BLOCK_SOULSAND = 88,
 	E_BLOCK_GLOWSTONE = 89,
-	E_BLOCK_PORT = 90,  // Deprecated, use E_BLOCK_NETHER_PORTAL instead
 	E_BLOCK_NETHER_PORTAL = 90,
 	E_BLOCK_JACK_O_LANTERN = 91,
 	E_BLOCK_CAKE = 92,
@@ -116,9 +109,7 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_HUGE_BROWN_MUSHROOM = 99,
 	E_BLOCK_HUGE_RED_MUSHROOM = 100,
 	E_BLOCK_IRON_BARS = 101,
-	E_BLOCK_IRON_BAR = 101,  // Deprecated, use E_BLOCK_IRON_BARS instead
 	E_BLOCK_GLASS_PANE = 102,
-	E_BLOCK_GLASS_PLANE = 102,  // Deprecated, use E_BLOCK_GLASS_PANE instead
 	E_BLOCK_MELON = 103,
 	E_BLOCK_PUMPKIN_STEM = 104,
 	E_BLOCK_MELON_STEM = 105,
@@ -144,7 +135,6 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_DOUBLE_WOODEN_SLAB = 125,
 	E_BLOCK_WOODEN_SLAB = 126,
 	E_BLOCK_COCOA_POD = 127,
-	E_BLOCK_COCA_PLANT = E_BLOCK_COCOA_POD,  // OBSOLETE!
 	E_BLOCK_SANDSTONE_STAIRS = 128,
 	E_BLOCK_EMERALD_ORE = 129,
 	E_BLOCK_ENDER_CHEST = 130,
@@ -187,140 +177,6 @@ enum ENUM_BLOCK_ID
 enum ENUM_ITEM_ID
 {
 	E_ITEM_EMPTY	= -1,
-	E_ITEM_STONE = 1,
-	E_ITEM_GRASS = 2,
-	E_ITEM_DIRT	= 3,
-	E_ITEM_COBBLESTONE = 4,
-	E_ITEM_PLANKS = 5,
-	E_ITEM_WOOD = 5,  // obsolete, use E_ITEM_PLANKS instead
-	E_ITEM_SAPLING = 6,
-	E_ITEM_BEDROCK = 7,
-	E_ITEM_WATER = 8,
-	E_ITEM_STATIONARY_WATER = 9,
-	E_ITEM_LAVA = 10,
-	E_ITEM_STATIONARY_LAVA = 11,
-	E_ITEM_SAND = 12,
-	E_ITEM_GRAVEL = 13,
-	E_ITEM_GOLD_ORE = 14,
-	E_ITEM_IRON_ORE = 15,
-	E_ITEM_COAL_ORE = 16,
-	E_ITEM_LOG = 17,
-	E_ITEM_LEAVES = 18,
-	E_ITEM_SPONGE = 19,
-	E_ITEM_GLASS = 20,
-	E_ITEM_LAPIS_ORE = 21,
-	E_ITEM_LAPIS_BLOCK = 22,
-	E_ITEM_DISPENSER = 23,
-	E_ITEM_SANDSTONE = 24,
-	E_ITEM_NOTE_ITEM = 25,
-
-	E_ITEM_POWERED_RAIL = 27,
-	E_ITEM_DETECTOR_RAIL = 28,
-	E_ITEM_STICKY_PISTON = 29,
-	E_ITEM_COBWEB = 30,
-	E_ITEM_TALL_GRASS = 31,
-	E_ITEM_DEAD_BRUSH = 32,
-	E_ITEM_PISTON = 33,
-	E_ITEM_PISTON_EXTENSION = 34,
-	E_ITEM_WOOL = 35,
-	E_ITEM_WHITE_CLOTH = 35,  /// OBSOLETE, use E_ITEM_WOOL
-	E_ITEM_PISTON_MOVED_BLOCK = 36,
-	E_ITEM_YELLOW_FLOWER = 37,
-	E_ITEM_RED_ROSE = 38,
-	E_ITEM_BROWN_MUSHROOM = 39,
-	E_ITEM_RED_MUSHROOM = 40,
-	E_ITEM_GOLD_BLOCK = 41,
-	E_ITEM_IRON_BLOCK = 42,
-	E_ITEM_DOUBLE_STONE_SLAB = 43,
-	E_ITEM_DOUBLE_STEP = 43,   /// OBSOLETE, use E_ITEM_DOUBLE_STONE_SLAB
-	E_ITEM_STONE_SLAB = 44,
-	E_ITEM_STEP = 44,  /// OBSOLETE, use E_ITEM_STONE_SLAB
-	E_ITEM_BRICK = 45,
-	E_ITEM_TNT = 46,
-	E_ITEM_BOOKCASE = 47,
-	E_ITEM_MOSSY_COBBLESTONE = 48,
-	E_ITEM_OBSIDIAN = 49,
-	E_ITEM_TORCH = 50,
-	E_ITEM_FIRE = 51,
-	E_ITEM_MOB_SPAWNER = 52,
-	E_ITEM_WOODEN_STAIRS = 53,
-	E_ITEM_CHEST = 54,
-	E_ITEM_REDSTONE_WIRE = 55,
-	E_ITEM_DIAMOND_ORE = 56,
-	E_ITEM_DIAMOND_BLOCK = 57,
-	E_ITEM_WORKBENCH = 58,
-	E_ITEM_CROPS = 59,
-	E_ITEM_SOIL = 60,
-	E_ITEM_FURNACE = 61,
-	E_ITEM_BURNING_FURNACE = 62,
-	E_ITEM_SIGN_POST = 63,
-
-	E_ITEM_LADDER = 65,
-	E_ITEM_MINECART_TRACKS = 66,
-	E_ITEM_COBBLESTONE_STAIRS = 67,
-	E_ITEM_WALLSIGN = 68,
-	E_ITEM_LEVER = 69,
-	E_ITEM_STONE_PRESSURE_PLATE = 70,
-
-	E_ITEM_WOODEN_PRESSURE_PLATE = 72,
-	E_ITEM_REDSTONE_ORE = 73,
-	E_ITEM_REDSTONE_ORE_GLOWING = 74,
-	E_ITEM_REDSTONE_TORCH_OFF = 75,
-	E_ITEM_REDSTONE_TORCH_ON = 76,
-	E_ITEM_STONE_BUTTON = 77,
-	E_ITEM_SNOW = 78,
-	E_ITEM_ICE = 79,
-	E_ITEM_SNOW_BLOCK = 80,
-	E_ITEM_CACTUS = 81,
-
-	E_ITEM_REEDS = 83,
-	E_ITEM_JUKEBOX = 84,
-	E_ITEM_FENCE = 85,
-	E_ITEM_PUMPKIN = 86,
-	E_ITEM_BLOODSTONE = 87,
-	E_ITEM_SOULSAND = 88,
-	E_ITEM_GLOWSTONE = 89,
-	E_ITEM_PORT = 90,
-	E_ITEM_JACK_O_LANTERN = 91,
-
-	E_ITEM_REDSTONE_REPEATER_OFF = 93,
-	E_ITEM_REDSTONE_REPEATER_ON = 94,
-	E_ITEM_LOCKED_CHEST = 95,
-	E_ITEM_TRAPDOOR = 96,
-	E_ITEM_SILVERFISH_EGG = 97,
-	E_ITEM_STONE_BRICKS = 98,
-	E_ITEM_HUGE_BROWN_MUSHROOM = 99,
-	E_ITEM_HUGE_RED_MUSHROOM = 100,
-	E_ITEM_IRON_BAR = 101,
-	E_ITEM_GLASS_PLANE = 102,
-	E_ITEM_MELON = 103,
-	E_ITEM_PUMPKIN_STEM = 104,
-	E_ITEM_MELON_STEM = 105,
-	E_ITEM_VINES = 106,
-	E_ITEM_FENCE_GATE = 107,
-	E_ITEM_BRICK_STAIRS = 108,
-	E_ITEM_STONE_BRICK_STAIRS = 109,
-	E_ITEM_MYCELIUM = 110,
-	E_ITEM_LILY_PAD = 111,
-	E_ITEM_NETHER_BRICK = 112,
-	E_ITEM_NETHER_BRICK_FENCE = 113,
-	E_ITEM_NETHER_BRICK_STAIRS = 114,
-
-	E_ITEM_ENCHANTMENT_TABLE = 116,
-
-	E_ITEM_END_PORTAL = 119,
-	E_ITEM_END_PORTAL_FRAME = 120,
-	E_ITEM_END_STONE = 121,
-	
-	E_ITEM_DOUBLE_WOODEN_SLAB = 125,
-	E_ITEM_WOODEN_SLAB = 126,
-	E_ITEM_COCA_PLANT = 127,
-	E_ITEM_SANDSTONE_STAIRS = 128,
-	E_ITEM_EMERALD_ORE = 129,
-	E_ITEM_ENDER_CHEST = 130,
-	E_ITEM_TRIPWIRE_HOOK = 131,
-	E_ITEM_TRIPWIRE = 132,
-	E_ITEM_EMERALD_BLOCK = 133,
 
 	E_ITEM_FIRST = 256,  // First true item type
 	
@@ -329,7 +185,6 @@ enum ENUM_ITEM_ID
 	E_ITEM_IRON_AXE = 258,
 	E_ITEM_FLINT_AND_STEEL = 259,
 	E_ITEM_RED_APPLE = 260,
-	E_ITEM_APPLE = 260,    // OBSOLETE, use E_ITEM_RED_APPLE instead
 	E_ITEM_BOW = 261,
 	E_ITEM_ARROW = 262,
 	E_ITEM_COAL = 263,
@@ -389,9 +244,7 @@ enum ENUM_ITEM_ID
 	E_ITEM_GOLD_BOOTS = 317,
 	E_ITEM_FLINT = 318,
 	E_ITEM_RAW_PORKCHOP = 319,
-	E_ITEM_RAW_MEAT = 319,  // OBSOLETE, use E_ITEM_RAW_PORKCHOP instead
 	E_ITEM_COOKED_PORKCHOP = 320,
-	E_ITEM_COOKED_MEAT = 320,  // OBSOLETE, use E_ITEM_COOKED_PORKCHOP instead
 	E_ITEM_PAINTINGS = 321,
 	E_ITEM_GOLDEN_APPLE = 322,
 	E_ITEM_SIGN = 323,
@@ -467,7 +320,7 @@ enum ENUM_ITEM_ID
 	E_ITEM_FIREWORK_STAR = 402,
 	E_ITEM_ENCHANTED_BOOK = 403,
 	E_ITEM_COMPARATOR = 404,
-	// E_ITEM_NETHER_BRICK = 405, // TODO: E_ITEM_NETHER_BRICK is already used for the nether brick block (as an item, #112). What name to use?
+	E_ITEM_NETHER_BRICK = 405,
 	E_ITEM_NETHER_QUARTZ = 406,
 	
 	// Keep these two as the last values of the consecutive list, without a number - they will get their correct number assigned automagically by C++
diff --git a/source/Blocks/BlockCloth.h b/source/Blocks/BlockCloth.h
index 82c0a0e29..a95f12500 100644
--- a/source/Blocks/BlockCloth.h
+++ b/source/Blocks/BlockCloth.h
@@ -19,7 +19,7 @@ public:
 

 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override

 	{

-		a_Pickups.push_back(cItem(E_ITEM_WOOL, 1, a_BlockMeta));

+		a_Pickups.push_back(cItem(E_BLOCK_WOOL, 1, a_BlockMeta));

 	}

 

 

diff --git a/source/Blocks/BlockDirt.h b/source/Blocks/BlockDirt.h
index 9617a47da..73bc28dc5 100644
--- a/source/Blocks/BlockDirt.h
+++ b/source/Blocks/BlockDirt.h
@@ -22,7 +22,7 @@ public:
 	

 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override

 	{

-		a_Pickups.push_back(cItem(E_ITEM_DIRT, 1, 0));

+		a_Pickups.push_back(cItem(E_BLOCK_DIRT, 1, 0));

 	}

 	

 	

diff --git a/source/Blocks/BlockFlowerPot.h b/source/Blocks/BlockFlowerPot.h
index ba93430f8..1c02126df 100644
--- a/source/Blocks/BlockFlowerPot.h
+++ b/source/Blocks/BlockFlowerPot.h
@@ -27,15 +27,15 @@ public:
 		cItem Plant;

 		switch (a_BlockMeta)

 		{

-			case 1: Plant = cItem(E_ITEM_RED_ROSE, 1, 0); break;

-			case 2: Plant = cItem(E_ITEM_YELLOW_FLOWER, 1, 0); break;

-			case 3: Plant = cItem(E_ITEM_SAPLING, 1, E_META_SAPLING_APPLE); break;

-			case 4: Plant = cItem(E_ITEM_SAPLING, 1, E_META_SAPLING_CONIFER); break;

-			case 5: Plant = cItem(E_ITEM_SAPLING, 1, E_META_SAPLING_BIRCH); break;

-			case 6: Plant = cItem(E_ITEM_SAPLING, 1, E_META_SAPLING_JUNGLE); break;

-			case 7: Plant = cItem(E_ITEM_RED_MUSHROOM, 1, 0); break;

-			case 8: Plant = cItem(E_ITEM_BROWN_MUSHROOM, 1, 0); break;

-			case 9: Plant = cItem(E_ITEM_CACTUS, 1, 0); break;

+			case 1:  Plant = cItem(E_BLOCK_RED_ROSE, 1, 0); break;

+			case 2:  Plant = cItem(E_BLOCK_YELLOW_FLOWER, 1, 0); break;

+			case 3:  Plant = cItem(E_BLOCK_SAPLING, 1, E_META_SAPLING_APPLE); break;

+			case 4:  Plant = cItem(E_BLOCK_SAPLING, 1, E_META_SAPLING_CONIFER); break;

+			case 5:  Plant = cItem(E_BLOCK_SAPLING, 1, E_META_SAPLING_BIRCH); break;

+			case 6:  Plant = cItem(E_BLOCK_SAPLING, 1, E_META_SAPLING_JUNGLE); break;

+			case 7:  Plant = cItem(E_BLOCK_RED_MUSHROOM, 1, 0); break;

+			case 8:  Plant = cItem(E_BLOCK_BROWN_MUSHROOM, 1, 0); break;

+			case 9:  Plant = cItem(E_BLOCK_CACTUS, 1, 0); break;

 			case 10: Plant = cItem(E_BLOCK_DEAD_BUSH, 1, 0); break;

 			case 11: Plant = cItem(E_BLOCK_TALL_GRASS, 1, E_META_TALL_GRASS_FERN); break;

 			default: return;

@@ -55,9 +55,9 @@ public:
 		

 		switch (a_Player->GetEquippedItem().m_ItemType)

 		{

-			case E_ITEM_RED_ROSE: Meta = 1; break;

-			case E_ITEM_YELLOW_FLOWER: Meta = 2; break;

-			case E_ITEM_SAPLING:

+			case E_BLOCK_RED_ROSE: Meta = 1; break;

+			case E_BLOCK_YELLOW_FLOWER: Meta = 2; break;

+			case E_BLOCK_SAPLING:

 			{

 				switch (a_Player->GetEquippedItem().m_ItemDamage)

 				{

@@ -68,9 +68,9 @@ public:
 				}

 				break;

 			}

-			case E_ITEM_RED_MUSHROOM: Meta = 7; break;

-			case E_ITEM_BROWN_MUSHROOM: Meta = 8; break;

-			case E_ITEM_CACTUS: Meta = 9; break;

+			case E_BLOCK_RED_MUSHROOM: Meta = 7; break;

+			case E_BLOCK_BROWN_MUSHROOM: Meta = 8; break;

+			case E_BLOCK_CACTUS: Meta = 9; break;

 			case E_BLOCK_DEAD_BUSH: Meta = 10; break;

 			case E_BLOCK_TALL_GRASS:

 			{

diff --git a/source/Blocks/BlockFurnace.h b/source/Blocks/BlockFurnace.h
index e50641258..a163c9483 100644
--- a/source/Blocks/BlockFurnace.h
+++ b/source/Blocks/BlockFurnace.h
@@ -22,7 +22,7 @@ public:
 

 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override

 	{

-		a_Pickups.push_back(cItem(E_ITEM_FURNACE, 1, 0));

+		a_Pickups.push_back(cItem(E_BLOCK_FURNACE, 1, 0));

 	}

 

 	

diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
index 5c535e052..cde85fce8 100644
--- a/source/Blocks/BlockHandler.cpp
+++ b/source/Blocks/BlockHandler.cpp
@@ -154,7 +154,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
 		case E_BLOCK_RED_MUSHROOM:          return new cBlockMushroomHandler        (a_BlockType);

 		case E_BLOCK_RED_ROSE:              return new cBlockFlowerHandler          (a_BlockType);

 		case E_BLOCK_SAND:                  return new cBlockSandHandler            (a_BlockType);

-		case E_ITEM_SANDSTONE_STAIRS:       return new cBlockStairsHandler          (a_BlockType);

+		case E_BLOCK_SANDSTONE_STAIRS:      return new cBlockStairsHandler          (a_BlockType);

 		case E_BLOCK_SAPLING:               return new cBlockSaplingHandler         (a_BlockType);

 		case E_BLOCK_SIGN_POST:             return new cBlockSignHandler            (a_BlockType);

 		case E_BLOCK_SNOW:                  return new cBlockSnowHandler            (a_BlockType);

diff --git a/source/Blocks/BlockLeaves.h b/source/Blocks/BlockLeaves.h
index 101f7c087..3563babcf 100644
--- a/source/Blocks/BlockLeaves.h
+++ b/source/Blocks/BlockLeaves.h
@@ -41,7 +41,7 @@ public:
 		// Only the first 2 bits contain the display information, the others are for growing

 		if (rand.randInt(5) == 0)

 		{

-			a_Pickups.push_back(cItem(E_ITEM_SAPLING, 1, a_BlockMeta & 3));

+			a_Pickups.push_back(cItem(E_BLOCK_SAPLING, 1, a_BlockMeta & 3));

 		}

 		if ((a_BlockMeta & 3) == E_META_SAPLING_APPLE)

 		{

diff --git a/source/Blocks/BlockLever.h b/source/Blocks/BlockLever.h
index d03443abd..42a16fd9b 100644
--- a/source/Blocks/BlockLever.h
+++ b/source/Blocks/BlockLever.h
@@ -21,7 +21,7 @@ public:
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override

 	{

 		// Reset meta to 0

-		a_Pickups.push_back(cItem(E_ITEM_LEVER, 1, 0));

+		a_Pickups.push_back(cItem(E_BLOCK_LEVER, 1, 0));

 	}

 

 

diff --git a/source/Blocks/BlockRedstoneTorch.h b/source/Blocks/BlockRedstoneTorch.h
index ef4efaaab..0127dc082 100644
--- a/source/Blocks/BlockRedstoneTorch.h
+++ b/source/Blocks/BlockRedstoneTorch.h
@@ -22,7 +22,7 @@ public:
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override

 	{

 		// Always drop the ON torch, meta 0

-		a_Pickups.push_back(cItem(E_ITEM_REDSTONE_TORCH_ON, 1, 0));

+		a_Pickups.push_back(cItem(E_BLOCK_REDSTONE_TORCH_ON, 1, 0));

 	}

 

 

diff --git a/source/Blocks/BlockSapling.h b/source/Blocks/BlockSapling.h
index 447774f85..18fdb9d05 100644
--- a/source/Blocks/BlockSapling.h
+++ b/source/Blocks/BlockSapling.h
@@ -21,7 +21,7 @@ public:
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override

 	{

 		// Only the first 2 bits contain the display information, the others are for growing

-		a_Pickups.push_back(cItem(E_ITEM_SAPLING, 1, a_BlockMeta & 3));

+		a_Pickups.push_back(cItem(E_BLOCK_SAPLING, 1, a_BlockMeta & 3));

 	}

 

 

diff --git a/source/Generating/CompoGen.cpp b/source/Generating/CompoGen.cpp
index 9983a6d57..53d10c674 100644
--- a/source/Generating/CompoGen.cpp
+++ b/source/Generating/CompoGen.cpp
@@ -76,7 +76,7 @@ void cCompoGenDebugBiomes::ComposeTerrain(
 		E_BLOCK_LOG,
 		E_BLOCK_PLANKS,
 		E_BLOCK_SANDSTONE,
-		E_BLOCK_WHITE_CLOTH,
+		E_BLOCK_WOOL,
 		E_BLOCK_COAL_ORE,
 		E_BLOCK_IRON_ORE,
 		E_BLOCK_GOLD_ORE,
diff --git a/source/Generating/StructGen.cpp b/source/Generating/StructGen.cpp
index 30d7b48a7..b0828f15a 100644
--- a/source/Generating/StructGen.cpp
+++ b/source/Generating/StructGen.cpp
@@ -178,7 +178,7 @@ void cStructGenTrees::GenerateSingleTree(
 
 	// Check the block underneath the tree:
 	BLOCKTYPE TopBlock = cChunkDef::GetBlock(a_BlockTypes, x, Height, z);
-	if ((TopBlock != E_BLOCK_DIRT) && (TopBlock != E_BLOCK_GRASS) && (TopBlock != E_BLOCK_SOIL))
+	if ((TopBlock != E_BLOCK_DIRT) && (TopBlock != E_BLOCK_GRASS) && (TopBlock != E_BLOCK_FARMLAND))
 	{
 		return;
 	}
diff --git a/source/Items/ItemFood.h b/source/Items/ItemFood.h
index 8faed1d05..d4c0a012a 100644
--- a/source/Items/ItemFood.h
+++ b/source/Items/ItemFood.h
@@ -32,10 +32,10 @@ public:
 		case E_ITEM_COOKED_CHICKEN:

 			return FoodInfo(6, 7.2f);

 		case E_ITEM_RAW_BEEF:

-		case E_ITEM_RAW_MEAT:

+		case E_ITEM_RAW_PORKCHOP:

 			return FoodInfo(3, 1.8f);

 		case E_ITEM_STEAK:

-		case E_ITEM_COOKED_MEAT:

+		case E_ITEM_COOKED_PORKCHOP:

 			return FoodInfo(8, 12.8f);

 		case E_ITEM_RAW_FISH:

 			return FoodInfo(2, 1.2f);

diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp
index 4a465c272..6cb98706b 100644
--- a/source/Items/ItemHandler.cpp
+++ b/source/Items/ItemHandler.cpp
@@ -71,21 +71,21 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 		default:                       return new cItemHandler(a_ItemType);

 		

 		// Single item per handler, alphabetically sorted:

+		case E_BLOCK_LEAVES:           return new cItemLeavesHandler(a_ItemType);

+		case E_BLOCK_SAPLING:          return new cItemSaplingHandler(a_ItemType);

+		case E_BLOCK_WOOL:             return new cItemClothHandler(a_ItemType);

 		case E_ITEM_BED:               return new cItemBedHandler(a_ItemType);

 		case E_ITEM_BREWING_STAND:     return new cItemBrewingStandHandler(a_ItemType);

 		case E_ITEM_CAULDRON:          return new cItemCauldronHandler(a_ItemType);

 		case E_ITEM_DYE:               return new cItemDyeHandler(a_ItemType);

 		case E_ITEM_FLINT_AND_STEEL:   return new cItemLighterHandler(a_ItemType);

 		case E_ITEM_FLOWER_POT:        return new cItemFlowerPotHandler(a_ItemType);

-		case E_ITEM_LEAVES:            return new cItemLeavesHandler(a_ItemType);

 		case E_ITEM_REDSTONE_DUST:     return new cItemRedstoneDustHandler(a_ItemType);

 		case E_ITEM_REDSTONE_REPEATER: return new cItemRedstoneRepeaterHandler(a_ItemType);

-		case E_ITEM_SAPLING:           return new cItemSaplingHandler(a_ItemType);

 		case E_ITEM_SHEARS:            return new cItemShearsHandler(a_ItemType);

 		case E_ITEM_SIGN:              return new cItemSignHandler(a_ItemType);

 		case E_ITEM_SPAWN_EGG:         return new cItemSpawnEggHandler(a_ItemType);

 		case E_ITEM_SUGARCANE:         return new cItemSugarcaneHandler(a_ItemType);

-		case E_ITEM_WOOL:              return new cItemClothHandler(a_ItemType);

 		

 		case E_ITEM_WOODEN_HOE:

 		case E_ITEM_STONE_HOE:

@@ -123,14 +123,14 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 			return new cItemSwordHandler(a_ItemType);

 		}

 		

-		case E_ITEM_STONE_SLAB:

-		case E_ITEM_WOODEN_SLAB:

+		case E_BLOCK_STONE_SLAB:

+		case E_BLOCK_WOODEN_SLAB:

 		{

 			return new cItemSlabHandler(a_ItemType);

 		}

 		

-		case E_ITEM_LOG:

-		case E_ITEM_PLANKS:

+		case E_BLOCK_LOG:

+		case E_BLOCK_PLANKS:

 		{

 			return new cItemWoodHandler(a_ItemType);

 		}

@@ -162,9 +162,9 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 		case E_ITEM_RAW_CHICKEN:

 		case E_ITEM_COOKED_CHICKEN:

 		case E_ITEM_RAW_BEEF:

-		case E_ITEM_RAW_MEAT:

+		case E_ITEM_RAW_PORKCHOP:

 		case E_ITEM_STEAK:

-		case E_ITEM_COOKED_MEAT:

+		case E_ITEM_COOKED_PORKCHOP:

 		case E_ITEM_RAW_FISH:

 		case E_ITEM_COOKED_FISH:

 		case E_ITEM_RED_APPLE:

@@ -261,7 +261,6 @@ char cItemHandler::GetMaxStackSize(void)
 	

 	switch (m_ItemType) //sorted by id

 	{

-		case E_ITEM_APPLE:                return 64;

 		case E_ITEM_ARROW:                return 64;

 		case E_ITEM_BLAZE_POWDER:         return 64;

 		case E_ITEM_BLAZE_ROD:            return 64;

@@ -311,6 +310,7 @@ char cItemHandler::GetMaxStackSize(void)
 		case E_ITEM_RAW_CHICKEN:          return 64;

 		case E_ITEM_RAW_FISH:             return 64;

 		case E_ITEM_RAW_PORKCHOP:         return 64;

+		case E_ITEM_RED_APPLE:            return 64;

 		case E_ITEM_REDSTONE_DUST:        return 64;

 		case E_ITEM_REDSTONE_REPEATER:    return 64;

 		case E_ITEM_ROTTEN_FLESH:         return 64;

diff --git a/source/Items/ItemShears.h b/source/Items/ItemShears.h
index 743cbeaec..f1424ee2e 100644
--- a/source/Items/ItemShears.h
+++ b/source/Items/ItemShears.h
@@ -31,7 +31,7 @@ public:
 		if (Block == E_BLOCK_LEAVES)

 		{

 			cItems Drops;

-			Drops.push_back(cItem(E_ITEM_LEAVES, 1, a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ)));

+			Drops.push_back(cItem(E_BLOCK_LEAVES, 1, a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ)));

 			a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);

 

 			a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);

diff --git a/source/Mobs/Pig.cpp b/source/Mobs/Pig.cpp
index 15be0001f..a71476e00 100644
--- a/source/Mobs/Pig.cpp
+++ b/source/Mobs/Pig.cpp
@@ -18,7 +18,7 @@ cPig::cPig(void) :
 
 void cPig::GetDrops(cItems & a_Drops, cPawn * a_Killer)
 {
-	AddRandomDropItem(a_Drops, 1, 3, (GetMetaData() == BURNING) ? E_ITEM_COOKED_PORKCHOP : E_ITEM_RAW_MEAT);
+	AddRandomDropItem(a_Drops, 1, 3, (GetMetaData() == BURNING) ? E_ITEM_COOKED_PORKCHOP : E_ITEM_RAW_PORKCHOP);
 }
 
 
diff --git a/source/Mobs/Sheep.cpp b/source/Mobs/Sheep.cpp
index c860e25d9..174c8a9d3 100644
--- a/source/Mobs/Sheep.cpp
+++ b/source/Mobs/Sheep.cpp
@@ -23,7 +23,7 @@ void cSheep::GetDrops(cItems & a_Drops, cPawn * a_Killer)
 {
 	if (!m_IsSheared)
 	{
-		a_Drops.push_back(cItem(E_ITEM_WHITE_CLOTH, 1, m_WoolColor));
+		a_Drops.push_back(cItem(E_BLOCK_WOOL, 1, m_WoolColor));
 	}
 }
 
diff --git a/source/Simulator/FireSimulator.cpp b/source/Simulator/FireSimulator.cpp
index 1f20b0497..8579c2c17 100644
--- a/source/Simulator/FireSimulator.cpp
+++ b/source/Simulator/FireSimulator.cpp
@@ -99,7 +99,7 @@ void cFireSimulator::AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ)
 
 bool cFireSimulator::IsForeverBurnable( BLOCKTYPE a_BlockType )
 {
-	return a_BlockType == E_BLOCK_BLOODSTONE;
+	return a_BlockType == E_BLOCK_NETHERRACK;
 }