summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornesco <emmanuel@federbusch.fr>2013-11-15 14:18:53 +0100
committernesco <emmanuel@federbusch.fr>2013-11-15 14:18:53 +0100
commitd3269f37fa3e582dc6cd82c296e6997d196ebab8 (patch)
tree469b0c752a0c842c1c5632c0984396a938cde186
parentUpdate Giant.cpp (diff)
downloadcuberite-d3269f37fa3e582dc6cd82c296e6997d196ebab8.tar
cuberite-d3269f37fa3e582dc6cd82c296e6997d196ebab8.tar.gz
cuberite-d3269f37fa3e582dc6cd82c296e6997d196ebab8.tar.bz2
cuberite-d3269f37fa3e582dc6cd82c296e6997d196ebab8.tar.lz
cuberite-d3269f37fa3e582dc6cd82c296e6997d196ebab8.tar.xz
cuberite-d3269f37fa3e582dc6cd82c296e6997d196ebab8.tar.zst
cuberite-d3269f37fa3e582dc6cd82c296e6997d196ebab8.zip
-rw-r--r--MCServer/items.ini16
1 files changed, 15 insertions, 1 deletions
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 7eb8f56b4..bc19467a7 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -118,7 +118,21 @@ dkgreenwool=35:13
redwool=35:14
blackwool=35:15
dandelion=37
-flower=38
+
+; Obsolete, use "dandelion" instead (kept for compatibility, will be removed)
+flower=37
+
+; Obselete, use a specific flower name instead
+rose=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