summaryrefslogtreecommitdiffstats
path: root/src/BlockID.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-07-17 16:33:09 +0200
committermadmaxoft <github@xoft.cz>2014-07-17 16:33:09 +0200
commit993fd14ddfc881cf5be951df77da0338124d68cc (patch)
tree828cd0c784698ca4533aeaf2592d9fed75fe55a3 /src/BlockID.h
parentMerge pull request #1183 from Howaner/Sounds (diff)
downloadcuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.gz
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.bz2
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.lz
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.xz
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.zst
cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.zip
Diffstat (limited to 'src/BlockID.h')
-rw-r--r--src/BlockID.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index ba05e9e1a..43f911ce3 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -176,7 +176,7 @@ enum ENUM_BLOCK_ID
E_BLOCK_ACACIA_WOOD_STAIRS = 163,
E_BLOCK_DARK_OAK_WOOD_STAIRS = 164,
E_BLOCK_HAY_BALE = 170,
- E_BLOCK_CARPET = 171,
+ E_BLOCK_CARPET = 171,
E_BLOCK_HARDENED_CLAY = 172,
E_BLOCK_BLOCK_OF_COAL = 173,
E_BLOCK_PACKED_ICE = 174,
@@ -187,7 +187,7 @@ enum ENUM_BLOCK_ID
E_BLOCK_NUMBER_OF_TYPES, ///< Number of individual (different) blocktypes
E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1, ///< Maximum BlockType number used
- // Synonym or ID compatibility
+ // Synonym or ID compatibility
E_BLOCK_YELLOW_FLOWER = E_BLOCK_DANDELION,
E_BLOCK_RED_ROSE = E_BLOCK_FLOWER,
E_BLOCK_LOCKED_CHEST = E_BLOCK_STAINED_GLASS,