summaryrefslogtreecommitdiffstats
path: root/source/BlockID.h
diff options
context:
space:
mode:
authoradmin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2011-11-07 19:19:38 +0100
committeradmin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2011-11-07 19:19:38 +0100
commit907ba15fe208f6a8ad37f35652ae3ceac6bb39e9 (patch)
tree545147a563083cedd2c8a029bdb2ba579cc8ec8e /source/BlockID.h
parentPistons now generate noise and animate when moving. (diff)
downloadcuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.gz
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.bz2
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.lz
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.xz
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.zst
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.zip
Diffstat (limited to 'source/BlockID.h')
-rw-r--r--source/BlockID.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/BlockID.h b/source/BlockID.h
index 01a491555..3bdc65cac 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -35,7 +35,7 @@ enum ENUM_BLOCK_ID
E_BLOCK_STICKY_PISTON = 29,
E_BLOCK_COBWEB = 30,
E_BLOCK_TALL_GRASS = 31,
- E_BLOCK_DEAD_BRUSH = 32,
+ E_BLOCK_DEAD_BUSH = 32,
E_BLOCK_PISTON = 33,
E_BLOCK_PISTON_EXTENSION = 34,
E_BLOCK_WHITE_CLOTH = 35,
@@ -358,7 +358,7 @@ enum ENUM_ITEM_ID
E_ITEM_COOKIE = 357,
E_ITEM_MAP = 358,
E_ITEM_SHEARS = 359,
- E_ITEM_MELON_SLICES = 360,
+ E_ITEM_MELON_SLICE = 360,
E_ITEM_PUMPKIN_SEEDS = 361,
E_ITEM_MELON_SEEDS = 362,
E_ITEM_RAW_BEEF = 363,