Updated according to necrodoom

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1161 e251c2fe-e539-e718-e476-b85c1f46cddb

1 files changed, 143 insertions, 7 deletions

diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index 559bab2e4..0b2468246 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -174,6 +174,7 @@ yflower,37,0
 flower,37,0

 redrose,38,0

 rrose,38,0

+rose,38,0

 redflower,38,0

 rflower,38,0

 brownmushroom,39,0

@@ -193,13 +194,13 @@ stonedoublestep,43,0
 sdoublestep,43,0

 sdstep,43,0

 doublestep,43,0

-step,43,0

+dstep,43,0

 smoothstonedoubleslab,43,0

 stonedoubleslab,43,0

 sdoubleslab,43,0

 sdslab,43,0

 doubleslab,43,0

-slab,43,0

+dslab,43,0

 sanddstonedoublestep,43,1

 sstonedoublestep,43,1

 ssdoublestep,43,1

@@ -465,12 +466,24 @@ delayeroff,93,0
 delayoff,93,0

 dioderoff,93,0

 diodeoff,93,0

+repeaterblockoff,93,0

+repeatblockoff,93,0

+delayerblockoff,93,0

+delayblockoff,93,0

+dioderblockoff,93,0

+diodeblockoff,93,0

 repeateron,94,0

 repeaton,94,0

 delayeron,94,0

 delayon,94,0

 dioderon,94,0

 diodeon,94,0

+repeaterblockon,94,0

+repeatblockon,94,0

+delayerblockon,94,0

+delayblockon,94,0

+dioderblockon,94,0

+diodeblockon,94,0

 lockedchest,95,0

 lockchest,95,0

 jokechest,95,0

@@ -541,8 +554,8 @@ sshovel,273,0
 sspade,273,0

 smoothstonepickaxe,274,0

 smoothstonepick,274,0

-sstoneshovel,274,0

-sstonespade,274,0

+sstonepickaxe,274,0

+sstonepick,274,0

 stonepickaxe,274,0

 stonepick,274,0

 sspickaxe,274,0

@@ -777,7 +790,10 @@ gshoes,317,0
 flint,318,0

 pork,319,0

 rawpork,319,0

+rpork,319,0

 grilledpork,320,0

+grillpork,320,0

+gpork,320,0

 cookedpork,320,0

 bacon,320,0

 painting,321,0

@@ -872,29 +888,77 @@ glowstonedust,348,0
 lsdust,348,0

 gsdust,348,0

 rawfish,349,0

-rfish,349,0

+rafish,349,0

 fish,349,0

 cookedfish,350,0

 cookfish,350,0

 cfish,350,0

+grilledfish,350,0

+grillfish,350,0

+gfish,350,0

 roastedfish,350,0

 roastfish,350,0

-rfish,350,0

+rofish,350,0

 inksack,351,0

 inksac,351,0

 isack,351,0

 isac,351,0

 sack,351,0

 sac,351,0

+blackinksack,351,0

+blackinksac,351,0

+blackisack,351,0

+blackisac,351,0

+blacksack,351,0

+blacksac,351,0

+inksackblack,351,0

+inksacblack,351,0

+isackblack,351,0

+isacclack,351,0

+sackblack,351,0

+sacblack,351,0

+blackinksackcolor,351,0

+blackinksaccolor,351,0

+blackisackcolor,351,0

+blackisaccolor,351,0

+blacksackcolor,351,0

+blacksaccolor,351,0

+inksackblackcolor,351,0

+inksacblackcolor,351,0

+isackblackcolor,351,0

+isacclackcolor,351,0

+sackblackcolor,351,0

+sacblackcolor,351,0

+blackinksackdye,351,0

+blackinksacdye,351,0

+blackisackdye,351,0

+blackisacdye,351,0

+blacksackdye,351,0

+blacksacdye,351,0

+inksackblackdye,351,0

+inksacblackdye,351,0

+isackblackdye,351,0

+isacclackdye,351,0

+sackblackdye,351,0

+sacblackdye,351,0

 blackcolor,351,0

 blackdye,351,0

 rosered,351,1

-redrose,351,1

+roseredcolor,351,1

+rosereddye,351,1

+redrosecolor,351,1

+redrosedye,351,1

 redr,351,1

+redrcolor,351,1

+redrdye,351,1

 redcolor,351,1

 reddye,351,1

 cactusgreen,351,2

 greencactus,351,2

+cactusgreencolor,351,2

+greencactuscolor,351,2

+cactusgreendye,351,2

+greencactusdye,351,2

 greencolor,351,2

 greendye,351,2

 cocobeans,351,3

@@ -910,15 +974,67 @@ browncbean,351,3
 brownbeans,351,3

 brownbean,351,3

 brownb,351,3

+cocobeanscolor,351,3

+cocobeancolor,351,3

+cbeanscolor,351,3

+cbeancolor,351,3

+beanscolor,351,3

+beancolor,351,3

+browncocobeanscolor,351,3

+browncocobeancolor,351,3

+browncbeanscolor,351,3

+browncbeancolor,351,3

+brownbeanscolor,351,3

+brownbeancolor,351,3

+brownbcolor,351,3

+cocobeansdye,351,3

+cocobeandye,351,3

+cbeansdye,351,3

+cbeandye,351,3

+beansdye,351,3

+beandye,351,3

+browncocobeansdye,351,3

+browncocobeandye,351,3

+browncbeansdye,351,3

+browncbeandye,351,3

+brownbeansdye,351,3

+brownbeandye,351,3

+brownbdye,351,3

 browncolor,351,3

 browndye,351,3

 bluelapislzuli,351,4

 bluelapisl,351,4

 bluelapis,351,4

 bluel,351,4

+lapislzuliblue,351,4

+lapislblue,351,4

+lapisblue,351,4

+lblue,351,4

 lapislzuli,351,4

 lapisl,351,4

 lapis,351,4

+bluelapislzulicolor,351,4

+bluelapislcolor,351,4

+bluelapiscolor,351,4

+bluelcolor,351,4

+lapislzulibluecolor,351,4

+lapislbluecolor,351,4

+lapisbluecolor,351,4

+lbluecolor,351,4

+lapislzulicolor,351,4

+lapislcolor,351,4

+lapiscolor,351,4

+bluelapislzulidye,351,4

+bluelapisldye,351,4

+bluelapisdye,351,4

+blueldye,351,4

+lapislzulibluedye,351,4

+lapislbluedye,351,4

+lapisbluedye,351,4

+lbluedye,351,4

+lapislzulidye,351,4

+lapisldye,351,4

+lapisdye,351,4

 bluecolor,351,4

 bluedye,351,4

 purplecolor,351,5

@@ -936,8 +1052,14 @@ pinkdye,351,9
 limecolor,351,10

 limedye,351,10

 dandelionyellow,351,11

+dandelionyellowcolor,351,11

+dandelionyellowdye,351,11

 yellowdandelion,351,11

+yellowdandelioncolor,351,11

+yellowdandeliondye,351,11

 yellowd,351,11

+yellowdcolor,351,11

+yellowddye,351,11

 yellowcolor,351,11

 yellowdye,351,11

 lightbluecolor,351,12

@@ -949,9 +1071,23 @@ magentadye,351,13
 orangecolor,351,14

 orangedye,351,14

 whitebonemeal,351,15

+whitebonemealcolor,351,15

+whitebonemealdye,351,15

+bonemealwhite,351,15

+bonemealwhitecolor,351,15

+bonemealwhitedye,351,15

 whitebonem,351,15

+whitebonemcolor,351,15

+whitebonemdye,351,15

+bonemwhite,351,15

+bonemwhitecolor,351,15

+bonemwhitedye,351,15

 bonemeal,351,15

+bonemealcolor,351,15

+bonemealdye,351,15

 bonem,351,15

+bonemcolor,351,15

+bonemdye,351,15

 whitecolor,351,15

 whitedye,351,15

 bone,352,0