mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 10:53:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-27 16:09:23 +01:00
parent 5433a3f964 a5f5502380
commit c7fd3eb725
205 changed files with 1131 additions and 1493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/block/BlockIds.php
View File

@ -137,7 +137,7 @@ interface BlockIds{
const STONE_BRICK_STAIRS = 109;
const MYCELIUM = 110;
const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111;
const NETHER_BRICK = 112, NETHER_BRICK_BLOCK = 112;
const NETHER_BRICK_BLOCK = 112;
const NETHER_BRICK_FENCE = 113;
const NETHER_BRICK_STAIRS = 114;
const NETHER_WART_PLANT = 115;