3 files changed, 59 insertions, 7 deletions

diff --git a/src/BlockID.h b/src/BlockID.h
index 03a7f63e6..014b02fa8 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -186,6 +186,9 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_BLOCK_OF_COAL = 173,
 	E_BLOCK_PACKED_ICE = 174,
 	E_BLOCK_BIG_FLOWER = 175,
+	E_BLOCK_STANDING_BANNER = 176,
+	E_BLOCK_WALL_BANNER = 177,
+	E_BLOCK_INVERTED_DAYLIGHT_SENSOR = 178,
 	E_BLOCK_RED_SANDSTONE = 179,
 	E_BLOCK_RED_SANDSTONE_STAIRS = 180,
 	E_BLOCK_DOUBLE_NEW_STONE_SLAB= 181,
@@ -541,15 +544,22 @@ enum
 	E_META_NEW_LOG_DARK_OAK_WOOD  = 1,
 	
 	// E_BLOCK_PLANKS metas:
-	E_META_PLANKS_APPLE   = 0,
-	E_META_PLANKS_CONIFER = 1,
-	E_META_PLANKS_BIRCH   = 2,
-	E_META_PLANKS_JUNGLE  = 3,
+	E_META_PLANKS_APPLE    = 0,
+	E_META_PLANKS_CONIFER  = 1,
+	E_META_PLANKS_BIRCH    = 2,
+	E_META_PLANKS_JUNGLE   = 3,
+	E_META_PLANKS_ACACIA   = 4,
+	E_META_PLANKS_DARK_OAK = 5,
 
 	// E_BLOCK_(XXX_WEIGHTED)_PRESSURE_PLATE metas:
 	E_META_PRESSURE_PLATE_RAISED = 0,
 	E_META_PRESSURE_PLATE_DEPRESSED = 1,
 	
+	// E_BLOCK_PRISMARINE
+	E_META_PRISMRAINE_ROUGH  = 0,
+	E_META_PRISMARINE_BRICKS = 1,
+	E_META_PRISMARINE_DARK   = 2,
+	
 	// E_BLOCK_QUARTZ_BLOCK metas:
 	E_META_QUARTZ_NORMAL = 0,
 	E_META_QUARTZ_CHISELLED = 1,
@@ -567,6 +577,11 @@ enum
 	E_META_RAIL_CURVED_ZM_XM       = 8,
 	E_META_RAIL_CURVED_ZM_XP       = 9,
 	
+	// E_BLOCK_RED_SANDSTONE
+	E_META_RED_SANDSTONE_NORMAL   = 0,
+	E_META_RED_SANDSTONE_ORNAMENT = 1,
+	E_META_RED_SANDSTONE_SMOOTH   = 2,
+	
 	// E_BLOCK_SAND metas:
 	E_META_SAND_NORMAL = 0,
 	E_META_SAND_RED    = 1,
@@ -656,8 +671,11 @@ enum
 	// E_BLOCK_STONE metas:
 	E_META_STONE                   = 0,
 	E_META_STONE_GRANITE           = 1,
+	E_META_STONE_POLISHED_GRANITE  = 2,
 	E_META_STONE_DIORITE           = 3,
+	E_META_STONE_POLISHED_DIORITE  = 4,
 	E_META_STONE_ANDESITE          = 5,
+	E_META_STONE_POLISHED_ANDESITE = 6,
 
 	// E_BLOCK_STONE_SLAB metas:
 	E_META_STONE_SLAB_STONE        = 0,
@@ -728,6 +746,24 @@ enum
 	////////////////////////////////////////////////////////////////////////////////
 	// Item metas:
 	
+	// E_ITEM_BANNER:
+	E_META_BANNER_BLACK      = 0,
+	E_META_BANNER_RED        = 1,
+	E_META_BANNER_GREEN      = 2,
+	E_META_BANNER_BROWN      = 3,
+	E_META_BANNER_BLUE       = 4,
+	E_META_BANNER_PURPLE     = 5,
+	E_META_BANNER_CYAN       = 6,
+	E_META_BANNER_LIGHTGRAY  = 7,
+	E_META_BANNER_GRAY       = 8,
+	E_META_BANNER_PINK       = 9,
+	E_META_BANNER_LIGHTGREEN = 10,
+	E_META_BANNER_YELLOW     = 11,
+	E_META_BANNER_LIGHTBLUE  = 12,
+	E_META_BANNER_MAGENTA    = 13,
+	E_META_BANNER_ORANGE     = 14,
+	E_META_BANNER_WHITE      = 15,
+	
 	// E_ITEM_COAL metas:
 	E_META_COAL_NORMAL    = 0,
 	E_META_COAL_CHARCOAL  = 1,
@@ -754,6 +790,13 @@ enum
 	E_META_GOLDEN_APPLE_NORMAL = 0,
 	E_META_GOLDEN_APPLE_ENCHANTED = 1,
 	
+	// E_ITEM_HEAD:
+	E_META_HEAD_SKELETON = 0,
+	E_META_HEAD_WITHER   = 1,
+	E_META_HEAD_ZOMBIE   = 2,
+	E_META_HEAD_PLAYER   = 3,
+	E_META_HEAD_CREEPER  = 4,
+	
 	// E_ITEM_RAW_FISH metas:
 	E_META_RAW_FISH_FISH       = 0,
 	E_META_RAW_FISH_SALMON     = 1,
@@ -763,8 +806,6 @@ enum
 	// E_ITEM_COOKED_FISH metas:
 	E_META_COOKED_FISH_FISH       = 0,
 	E_META_COOKED_FISH_SALMON     = 1,
-	E_META_COOKED_FISH_CLOWNFISH  = 2,
-	E_META_COOKED_FISH_PUFFERFISH = 3,
 
 	// E_ITEM_MINECART_TRACKS metas:
 	E_META_TRACKS_X = 1,
diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp
index 719ba0550..5e30514e2 100644
--- a/src/BlockInfo.cpp
+++ b/src/BlockInfo.cpp
@@ -99,6 +99,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_HOPPER              ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_ICE                 ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_INACTIVE_COMPARATOR ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_INVERTED_DAYLIGHT_SENSOR ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_IRON_BARS           ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_IRON_DOOR           ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_IRON_TRAPDOOR       ].m_SpreadLightFalloff = 1;
@@ -137,6 +138,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_SPRUCE_FENCE_GATE   ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_STAINED_GLASS       ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_STAINED_GLASS_PANE  ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_STANDING_BANNER     ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_STICKY_PISTON       ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_STONE_BUTTON        ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_STONE_PRESSURE_PLATE].m_SpreadLightFalloff = 1;
@@ -149,6 +151,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_TRIPWIRE            ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_TRIPWIRE_HOOK       ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_VINES               ].m_SpreadLightFalloff = 1;
+	a_Info[E_BLOCK_WALL_BANNER         ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_WALLSIGN            ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_WOODEN_BUTTON       ].m_SpreadLightFalloff = 1;
 	a_Info[E_BLOCK_WOODEN_DOOR         ].m_SpreadLightFalloff = 1;
@@ -256,6 +259,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_STAINED_GLASS_PANE  ].m_Transparent = true;
 	a_Info[E_BLOCK_STATIONARY_LAVA     ].m_Transparent = true;
 	a_Info[E_BLOCK_STATIONARY_WATER    ].m_Transparent = true;
+	a_Info[E_BLOCK_STANDING_BANNER     ].m_Transparent = true;
 	a_Info[E_BLOCK_STICKY_PISTON       ].m_Transparent = true;
 	a_Info[E_BLOCK_STONE_BUTTON        ].m_Transparent = true;
 	a_Info[E_BLOCK_STONE_PRESSURE_PLATE].m_Transparent = true;
@@ -268,6 +272,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_TRIPWIRE            ].m_Transparent = true;
 	a_Info[E_BLOCK_TRIPWIRE_HOOK       ].m_Transparent = true;
 	a_Info[E_BLOCK_VINES               ].m_Transparent = true;
+	a_Info[E_BLOCK_WALL_BANNER         ].m_Transparent = true;
 	a_Info[E_BLOCK_WALLSIGN            ].m_Transparent = true;
 	a_Info[E_BLOCK_WATER               ].m_Transparent = true;
 	a_Info[E_BLOCK_WOODEN_BUTTON       ].m_Transparent = true;
@@ -475,12 +480,14 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_SNOW                ].m_IsSolid = false;
 	a_Info[E_BLOCK_STATIONARY_LAVA     ].m_IsSolid = false;
 	a_Info[E_BLOCK_STATIONARY_WATER    ].m_IsSolid = false;
+	a_Info[E_BLOCK_STANDING_BANNER     ].m_IsSolid = false;
 	a_Info[E_BLOCK_STONE_BUTTON        ].m_IsSolid = false;
 	a_Info[E_BLOCK_STONE_PRESSURE_PLATE].m_IsSolid = false;
 	a_Info[E_BLOCK_TALL_GRASS          ].m_IsSolid = false;
 	a_Info[E_BLOCK_TORCH               ].m_IsSolid = false;
 	a_Info[E_BLOCK_TRIPWIRE            ].m_IsSolid = false;
 	a_Info[E_BLOCK_VINES               ].m_IsSolid = false;
+	a_Info[E_BLOCK_WALL_BANNER         ].m_IsSolid = false;
 	a_Info[E_BLOCK_WALLSIGN            ].m_IsSolid = false;
 	a_Info[E_BLOCK_WATER               ].m_IsSolid = false;
 	a_Info[E_BLOCK_WOODEN_BUTTON       ].m_IsSolid = false;
@@ -735,7 +742,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_NEW_LOG             ].m_PlaceSound = "dig.wood";
 	a_Info[E_BLOCK_ACACIA_WOOD_STAIRS  ].m_PlaceSound = "dig.wood";
 	a_Info[E_BLOCK_DARK_OAK_WOOD_STAIRS ].m_PlaceSound = "dig.wood";
-	a_Info[E_BLOCK_SLIME_BLOCK         ].m_PlaceSound = "dig.slime";  // TODO: Check that this is the correct name
+	a_Info[E_BLOCK_SLIME_BLOCK         ].m_PlaceSound = "mob.slime.big";
 	a_Info[E_BLOCK_BARRIER             ].m_PlaceSound = "dig.stone";
 	a_Info[E_BLOCK_IRON_TRAPDOOR       ].m_PlaceSound = "dig.metal";
 	a_Info[E_BLOCK_PRISMARINE_BLOCK    ].m_PlaceSound = "dig.stone";
@@ -746,6 +753,8 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_BLOCK_OF_COAL       ].m_PlaceSound = "dig.stone";
 	a_Info[E_BLOCK_PACKED_ICE          ].m_PlaceSound = "dig.stone";
 	a_Info[E_BLOCK_BIG_FLOWER          ].m_PlaceSound = "dig.grass";
+	a_Info[E_BLOCK_STANDING_BANNER     ].m_PlaceSound = "dig.wood";
+	a_Info[E_BLOCK_WALL_BANNER         ].m_PlaceSound = "dig.wood";
 	a_Info[E_BLOCK_RED_SANDSTONE       ].m_PlaceSound = "dig.stone";
 	a_Info[E_BLOCK_RED_SANDSTONE_STAIRS ].m_PlaceSound = "dig.stone";
 	a_Info[E_BLOCK_NEW_STONE_SLAB      ].m_PlaceSound = "dig.stone";
diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h
index 3a3fc7224..05bc3d3f9 100644
--- a/src/Blocks/BlockPiston.h
+++ b/src/Blocks/BlockPiston.h
@@ -115,7 +115,9 @@ private:
 			case E_BLOCK_NOTE_BLOCK:
 			case E_BLOCK_OBSIDIAN:
 			case E_BLOCK_PISTON_EXTENSION:
+			case E_BLOCK_STANDING_BANNER:
 			case E_BLOCK_TRAPPED_CHEST:
+			case E_BLOCK_WALL_BANNER:
 			{
 				return false;
 			}