summaryrefslogtreecommitdiff
path: root/mcmap
diff options
context:
space:
mode:
authorKevin Chabowski <kevin@kch42.de>2013-09-20 13:21:17 +0200
committerKevin Chabowski <kevin@kch42.de>2013-09-20 13:21:17 +0200
commitadbb5e30cb07360c2f11694cc5bea69ddeb7529b (patch)
tree10043fc0f623640e54cba74fc1dae4f812490c3d /mcmap
parent8b3d36227baa6ce6da9033cd65e4a26679fdd2c2 (diff)
parenta2c146329536d1813e66372dc5bf71c754440ccf (diff)
downloadgomcmap-adbb5e30cb07360c2f11694cc5bea69ddeb7529b.tar.gz
gomcmap-adbb5e30cb07360c2f11694cc5bea69ddeb7529b.tar.bz2
gomcmap-adbb5e30cb07360c2f11694cc5bea69ddeb7529b.zip
Merge branch 'master' of git@github.com:kch42/gomcmap.git
Diffstat (limited to 'mcmap')
-rw-r--r--mcmap/block.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/mcmap/block.go b/mcmap/block.go
index 449e25f..87bea3a 100644
--- a/mcmap/block.go
+++ b/mcmap/block.go
@@ -73,7 +73,7 @@ const (
BlkWool = 35
BlkBlockMovedByPiston = 36
BlkDandelion = 37
- BlkRose = 38
+ BlkFlower = 38
BlkBrownMushroom = 39
BlkRedMushroom = 40
BlkBlockOfGold = 41
@@ -199,6 +199,12 @@ const (
BlkCarpet = 171
BlkHardenedClay = 172
BlkBlockOfCoal = 173
+ BlkPackedIce = 174
+ BlkLargeFlower = 175
+
+ // Aliases
+ BlkRose = BlkFlower
+ BlkPoppy = BlkFlower
)
var blockNames = map[BlockID]string{
@@ -240,7 +246,7 @@ var blockNames = map[BlockID]string{
BlkWool: "Wool",
BlkBlockMovedByPiston: "Block moved by Piston",
BlkDandelion: "Dandelion",
- BlkRose: "Rose",
+ BlkFlower: "Flower",
BlkBrownMushroom: "Brown Mushroom",
BlkRedMushroom: "Red Mushroom",
BlkBlockOfGold: "Block of Gold",
@@ -366,6 +372,8 @@ var blockNames = map[BlockID]string{
BlkCarpet: "Carpet",
BlkHardenedClay: "Hardened Clay",
BlkBlockOfCoal: "Block of Coal",
+ BlkPackedIce: "Packed Ice",
+ BlkLargeFlower: "Large Flower",
}
func (b BlockID) String() string {