summaryrefslogtreecommitdiffstats
path: root/MCServer
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-11-19 10:01:25 +0100
committermadmaxoft <github@xoft.cz>2013-11-19 10:01:25 +0100
commit7567f19052cf34c58c05550695b94fde88d19093 (patch)
treee605b363092c9132fadfb256b50acf9a13927c3a /MCServer
parentAPIDump: Slight performance improvement. (diff)
parentflower=38 (diff)
downloadcuberite-7567f19052cf34c58c05550695b94fde88d19093.tar
cuberite-7567f19052cf34c58c05550695b94fde88d19093.tar.gz
cuberite-7567f19052cf34c58c05550695b94fde88d19093.tar.bz2
cuberite-7567f19052cf34c58c05550695b94fde88d19093.tar.lz
cuberite-7567f19052cf34c58c05550695b94fde88d19093.tar.xz
cuberite-7567f19052cf34c58c05550695b94fde88d19093.tar.zst
cuberite-7567f19052cf34c58c05550695b94fde88d19093.zip
Diffstat (limited to 'MCServer')
-rw-r--r--MCServer/items.ini14
1 files changed, 11 insertions, 3 deletions
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 812168297..c09b32f17 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -119,10 +119,18 @@ redwool=35:14
blackwool=35:15
dandelion=37
-; Obsolete, use "dandelion" instead (kept for compatibility, will be removed)
-flower=37
-
+; Renamed in 1.7, use "poppy" instead; kept for compatibility reasons, will be removed later on.
rose=38
+
+flower=38
+poppy=38
+blueorchid=38:1
+allium=38:2
+redtulip=38:4
+orangetulip=38:5
+whitetulip=38:6
+pinktulip=38:7
+oxeyedaisy=38:8
brownmushroom=39
redmushroom=40
gold=41