Merge branch '2.9' of github.com:essentials/Essentials into 2.9

This commit is contained in:
KHobbits 2012-08-19 23:42:05 +01:00
commit 1ad8c95e3e

View file

@ -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

1 #version: teamcity
2974 flinttinder,259,0
2975 lighter,259,0
2976 apple,260,0
2977 normalapple,260,0
2978 redapple,260,0
2979 bow,261,0
2980 arrow,262,0
2981 coal,263,0
3360 goldenapple,322,0
3361 goldapple,322,0
3362 gapple,322,0
3363 enchantedgoldenapple,322,1
3364 enchantedgoldapple,322,1
3365 enchantedgapple,322,1
3366 supergoldenapple,322,1
3367 supergoldapple,322,1
3368 supergapple,322,1
3369 magicalgoldenapple,322,1
3370 magicalgoldapple,322,1
3371 magicalgapple,322,1
3372 magicgoldenapple,322,1
3373 magicgoldapple,322,1
3374 magicgapple,322,1
3375 egoldenapple,322,1
3376 egoldapple,322,1
3377 egapple,322,1
3378 sgoldenapple,322,1
3379 sgoldapple,322,1
3380 sgapple,322,1
3381 mgoldenapple,322,1
3382 mgoldapple,322,1
3383 mgapple,322,1
3384 sign,323,0
3385 woodendoor,324,0
3386 wooddoor,324,0