summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-06-10 10:21:40 -0700
committerKHobbits <rob@khobbits.co.uk>2012-06-10 10:21:40 -0700
commit2b083f7e2f646bd1f0cd46ec7d9339c6d14f82af (patch)
tree54b0cee6154bbfbabbf8779ecf17f3daa98f542a
parentf13df076b9990c8778e484f301f15652ab326f26 (diff)
parentccaea65a804e522f8db3149f37fe60f016a60b80 (diff)
downloadEssentials-2b083f7e2f646bd1f0cd46ec7d9339c6d14f82af.tar
Essentials-2b083f7e2f646bd1f0cd46ec7d9339c6d14f82af.tar.gz
Essentials-2b083f7e2f646bd1f0cd46ec7d9339c6d14f82af.tar.lz
Essentials-2b083f7e2f646bd1f0cd46ec7d9339c6d14f82af.tar.xz
Essentials-2b083f7e2f646bd1f0cd46ec7d9339c6d14f82af.zip
Merge pull request #75 from necrodoom/patch-1
updating items.csv with newest pastebin, fixes duplicates and wrong alia...
-rw-r--r--Essentials/src/items.csv104
1 files changed, 94 insertions, 10 deletions
diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index 7f20e1048..84a499c02 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -1,4 +1,4 @@
-#version: TeamCity
+#version: teamcity
#If you change this file, it will not be automatically updated after the next release,
#item,id,metadata
stone,1,0
@@ -6,6 +6,7 @@ sstone,1,0
smoothstone,1,0
rock,1,0
grass,2,0
+greendirt,2,0
dirt,3,0
cobblestone,4,0
cstone,4,0
@@ -1309,6 +1310,12 @@ blockbamboo,83,0
jukebox,84,0
jbox,84,0
fence,85,0
+woodenfence,85,0
+woodfence,85,0
+wfence,85,0
+fencewooden,85,0
+fencewood,85,0
+fencew,85,0
pumpkin,86,0
netherrack,87,0
netherrock,87,0
@@ -1434,6 +1441,14 @@ metalbars,101,0
jailbarsblock,101,0
jailbarsb,101,0
jailbars,101,0
+mbarsblock,101,0
+mbarsb,101,0
+mbars,101,0
+jbarsblock,101,0
+jbarsb,101,0
+jbars,101,0
+ibarsb,101,0
+ibarsblock,101,0
glasspane,102,0
glassp,102,0
paneglass,102,0
@@ -1473,34 +1488,65 @@ vinesgreen,106,0
vinegreen,106,0
vinesgarden,106,0
vinegarden,106,0
-fencegate,107,0
-woodenfence,107,0
+vinesg,106,0
+vineg,106,0
+gvines,106,0
+gvine,106,0
+wfencegate,107,0
+woodfencegate,107,0
woodenfencegate,107,0
-gatefence,107,0
woodengate,107,0
woodgate,107,0
+wgate,107,0
+gate,107,0
gardengate,107,0
+ggate,107,0
+fencegate,107,0
+fencegatewooden,107,0
+fencegatewood,107,0
brickstairs,108,0
redbrickstairs,108,0
+redbstairs,108,0
+rbrickstairs,108,0
bstairs,108,0
-stairsbrick,108,0
-brickstair,108,0
redstairs,108,0
+brickstair,108,0
+redbrickstair,108,0
+redbstair,108,0
+rbrickstair,108,0
+bstair,108,0
+redstair,108,0
+stairsbrick,108,0
+stairsredbrick,108,0
+stairsredb,108,0
+stairsrbrick,108,0
+stairsb,108,0
+stairsred,108,0
+stairbrick,108,0
+stairredbrick,108,0
+stairredb,108,0
+stairrbrick,108,0
+stairb,108,0
+stairred,108,0
+stairsstonebrick,109,0
stonebrickstairs,109,0
stonebstairs,109,0
sbstairs,109,0
-stairsstonebrick,109,0
cementbrickstairs,109,0
cementstairs,109,0
cementbstairs,109,0
+cbstairs,109,0
greybrickstairs,109,0
greybstairs,109,0
+greystairs,109,0
purplegrass,110,0
pinkgrass,110,0
mycel,110,0
mycelium,110,0
swampgrass,110,0
sgrass,110,0
+mushroomgrass,110,0
+mushgrass,110,0
waterlily,111,0
lilypad,111,0
lily,111,0
@@ -1524,7 +1570,37 @@ nbrickstairs,114,0
hellbrickstairs,114,0
deathbrickstairs,114,0
dbrickstairs,114,0
-hbrickstais,114,0
+hbrickstairs,114,0
+dstairs,114,0
+hstairs,114,0
+hellstairs,114,0
+deathstairs,114,0
+nstairs,114,0
+netherstairs,114,0
+dbstairs,114,0
+hbstairs,114,0
+hellbstairs,114,0
+deathbstairs,114,0
+nbstairs,114,0
+netherbstairs,114,0
+netherbrickstair,114,0
+nbrickstair,114,0
+hellbrickstair,114,0
+deathbrickstair,114,0
+dbrickstair,114,0
+hbrickstair,114,0
+dstair,114,0
+hstair,114,0
+hellstair,114,0
+deathstair,114,0
+nstair,114,0
+netherstair,114,0
+dbstair,114,0
+hbstair,114,0
+hellbstair,114,0
+deathbstair,114,0
+nbstair,114,0
+netherbstair,114,0
netherwarts,115,0
netherwart,115,0
netherplant,115,0
@@ -1556,6 +1632,7 @@ booktable,116,0
magicdesk,116,0
enchantmentdesk,116,0
edesk,116,0
+bookdesk,116,0
btable,116,0
bdesk,116,0
mtable,116,0
@@ -2409,8 +2486,13 @@ whitecolor,351,15
whitedye,351,15
bone,352,0
sugar,353,0
+whitedust,353,0
cake,354,0
bed,355,0
+sleepingtable,355,0
+sleeptable,355,0
+tablesleeping,355,0
+tablesleep,355,0
repeater,356,0
repeat,356,0
delayer,356,0
@@ -2424,6 +2506,10 @@ shears,359,0
shear,359,0
sheers,359,0
sheer,359,0
+woolcutters,359,0
+woolcutter,359,0
+cutterswool,359,0
+cutterwool,359,0
melonslice,360,0
mslice,360,0
slicemelon,360,0
@@ -2585,13 +2671,11 @@ icauldronitem,380,0
scauldronitem,380,0
eyeofender,381,0
endereye,381,0
-enderpearl,381,0
evilendereye,381,0
evileyeofender,381,0
evilenderpearl,381,0
eeye,381,0
eofender,381,0
-epearl,381,0
speckledmelon,382,0
goldmelon,382,0
sparklymelon,382,0