summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-08-19 23:42:05 +0100
committerKHobbits <rob@khobbits.co.uk>2012-08-19 23:42:05 +0100
commit1ad8c95e3e670ef33973efe9aca0eba967cd8951 (patch)
tree80788a83e300406dc1b5736e1ff8dbbe336a60dd
parent2dff343c10ee8805ae637517cb4dffb8e9a64f61 (diff)
parent86f8f9c83f19e791ce0560405f11ba59841ddcf1 (diff)
downloadEssentials-1ad8c95e3e670ef33973efe9aca0eba967cd8951.tar
Essentials-1ad8c95e3e670ef33973efe9aca0eba967cd8951.tar.gz
Essentials-1ad8c95e3e670ef33973efe9aca0eba967cd8951.tar.lz
Essentials-1ad8c95e3e670ef33973efe9aca0eba967cd8951.tar.xz
Essentials-1ad8c95e3e670ef33973efe9aca0eba967cd8951.zip
Merge branch '2.9' of github.com:essentials/Essentials into 2.9
-rw-r--r--Essentials/src/items.csv23
1 files changed, 23 insertions, 0 deletions
diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index d0f0e2053..d38b471af 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -2974,6 +2974,8 @@ flintiron,259,0
flinttinder,259,0
lighter,259,0
apple,260,0
+normalapple,260,0
+redapple,260,0
bow,261,0
arrow,262,0
coal,263,0
@@ -3358,6 +3360,27 @@ picture,321,0
goldenapple,322,0
goldapple,322,0
gapple,322,0
+enchantedgoldenapple,322,1
+enchantedgoldapple,322,1
+enchantedgapple,322,1
+supergoldenapple,322,1
+supergoldapple,322,1
+supergapple,322,1
+magicalgoldenapple,322,1
+magicalgoldapple,322,1
+magicalgapple,322,1
+magicgoldenapple,322,1
+magicgoldapple,322,1
+magicgapple,322,1
+egoldenapple,322,1
+egoldapple,322,1
+egapple,322,1
+sgoldenapple,322,1
+sgoldapple,322,1
+sgapple,322,1
+mgoldenapple,322,1
+mgoldapple,322,1
+mgapple,322,1
sign,323,0
woodendoor,324,0
wooddoor,324,0