summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2015-05-24 10:27:02 +0200
committerAlexander Harkness <me@bearbin.net>2015-05-24 10:27:02 +0200
commit028cfe660a5cfe9bd1674fb3baeed7d26a1abd4c (patch)
tree0ceabde312822346379ad1bfac0eb3a5aa314a13
parentMerge pull request #2118 from mc-server/login-gamemode (diff)
parentAdd Seadragon91 to contributors (diff)
downloadcuberite-028cfe660a5cfe9bd1674fb3baeed7d26a1abd4c.tar
cuberite-028cfe660a5cfe9bd1674fb3baeed7d26a1abd4c.tar.gz
cuberite-028cfe660a5cfe9bd1674fb3baeed7d26a1abd4c.tar.bz2
cuberite-028cfe660a5cfe9bd1674fb3baeed7d26a1abd4c.tar.lz
cuberite-028cfe660a5cfe9bd1674fb3baeed7d26a1abd4c.tar.xz
cuberite-028cfe660a5cfe9bd1674fb3baeed7d26a1abd4c.tar.zst
cuberite-028cfe660a5cfe9bd1674fb3baeed7d26a1abd4c.zip
Diffstat (limited to '')
-rw-r--r--CONTRIBUTORS1
-rw-r--r--MCServer/items.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9cc7f19fc..6f1d7878f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -24,6 +24,7 @@ p-mcgowan
rs2k
SafwatHalaby (Safwat Halaby)
SamJBarney
+Seadragon91 (Lukas Pioch)
Sofapriester
SphinxC0re
STR_Warrior
diff --git a/MCServer/items.ini b/MCServer/items.ini
index daf366654..5eb04619c 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -815,7 +815,7 @@ rawrabbit=411
cookedrabbit=412
rabbitstew=413
rabbitsoup=413
-rabbitsfood=414
+rabbitsfoot=414
rabbithide=415
armorstand=416
ironhorsearmor=417