Merge branch 'master' into mcpe-1.0

This commit is contained in:
Dylan K. Taylor
2016-12-29 11:36:14 +00:00
9 changed files with 219 additions and 6 deletions

View File

@ -221,7 +221,8 @@ class Block extends Position implements BlockIds, Metadatable{
self::$list[self::WOOD2] = Wood2::class;
self::$list[self::ACACIA_WOOD_STAIRS] = AcaciaWoodStairs::class;
self::$list[self::DARK_OAK_WOOD_STAIRS] = DarkOakWoodStairs::class;
self::$list[self::PRISMARINE] = Prismarine::class;
self::$list[self::SEA_LANTERN] = SeaLantern::class;
self::$list[self::IRON_TRAPDOOR] = IronTrapdoor::class;
self::$list[self::HAY_BALE] = HayBale::class;
self::$list[self::CARPET] = Carpet::class;