diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-12-24 23:28:48 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-12-24 23:28:48 +0100 |
| commit | 641c7f868c384b9dd101ddbb2fcadf5dfc1d4554 (patch) | |
| tree | eec02e2f503830b80a145011b15dfb10c4197d4e | |
| parent | ProtoProxy: updated to 1.4.6 (diff) | |
| download | cuberite-641c7f868c384b9dd101ddbb2fcadf5dfc1d4554.tar cuberite-641c7f868c384b9dd101ddbb2fcadf5dfc1d4554.tar.gz cuberite-641c7f868c384b9dd101ddbb2fcadf5dfc1d4554.tar.bz2 cuberite-641c7f868c384b9dd101ddbb2fcadf5dfc1d4554.tar.lz cuberite-641c7f868c384b9dd101ddbb2fcadf5dfc1d4554.tar.xz cuberite-641c7f868c384b9dd101ddbb2fcadf5dfc1d4554.tar.zst cuberite-641c7f868c384b9dd101ddbb2fcadf5dfc1d4554.zip | |
| -rw-r--r-- | MCServer/items.ini | 3 | ||||
| -rw-r--r-- | source/BlockID.h | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/MCServer/items.ini b/MCServer/items.ini index 7dcc43e33..b5ddb8ffd 100644 --- a/MCServer/items.ini +++ b/MCServer/items.ini @@ -502,6 +502,9 @@ creeperhead=397:4 carrotonastick=398
netherstar=399
pumpkinpie=400
+fireworkrocket=401
+fireworkstar=402
+enchantedbook=403
goldrecord=2256
greenrecord=2257
diff --git a/source/BlockID.h b/source/BlockID.h index 11392c509..f6cf5abaa 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -441,6 +441,9 @@ enum ENUM_ITEM_ID E_ITEM_BOOK_AND_QUILL = 386, E_ITEM_WRITTEN_BOOK = 387, E_ITEM_EMERALD = 388, + E_ITEM_FIREWORK_ROCKET = 401, + E_ITEM_FIREWORK_STAR = 402, + E_ITEM_ENCHANTED_BOOK = 403, E_ITEM_13_DISC = 2256, E_ITEM_CAT_DISC = 2257, @@ -528,7 +531,8 @@ enum E_META_DOUBLE_STEP_COBBLESTONE = 3, E_META_DOUBLE_STEP_BRICK = 4, E_META_DOUBLE_STEP_STONE_BRICK = 5, - E_META_DOUBLE_STEP_STONE_SECRET = 6, + E_META_DOUBLE_STEP_NETHER_BRICK = 6, + E_META_DOUBLE_STEP_STONE_SECRET = 7, // E_BLOCK_STEP metas: E_META_STEP_STONE = 0, @@ -537,7 +541,8 @@ enum E_META_STEP_COBBLESTONE = 3, E_META_STEP_BRICK = 4, E_META_STEP_STONE_BRICK = 5, - E_META_STEP_STONE_SECRET = 6, + E_META_STEP_NETHER_BRICK = 6, + E_META_STEP_STONE_SECRET = 7, // E_BLOCK_SILVERFISH_EGG metas: E_META_SILVERFISH_EGG_STONE = 0, |