Merge pull request #453 from necrodoom/patch-20

[FIX] ID 18, 29, 33 invalid damage values and more

1 files changed, 264 insertions, 221 deletions

diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index 412b56fec..7227bd507 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -360,196 +360,196 @@ ftree,17,3
 flog,17,3
 ftrunk,17,3
 fwood,17,3
-leaves,18,4
-leaf,18,4
-treeleaves,18,4
-logleaves,18,4
-trunkleaves,18,4
-woodleaves,18,4
-oakleaves,18,4
-oakleaf,18,4
-oleaves,18,4
-oleaf,18,4
-oaktreeleaves,18,4
-oaklogleaves,18,4
-oaktrunkleaves,18,4
-oakwoodleaves,18,4
-otreeleaves,18,4
-ologleaves,18,4
-otrunkleaves,18,4
-owoodleaves,18,4
-treeleaf,18,4
-logleaf,18,4
-trunkleaf,18,4
-woodleaf,18,4
-oaktreeleaf,18,4
-oaklogleaf,18,4
-oaktrunkleaf,18,4
-oakwoodleaf,18,4
-otreeleaf,18,4
-ologleaf,18,4
-otrunkleaf,18,4
-owoodleaf,18,4
-spruceleaves,18,5
-spruceleaf,18,5
-sleaves,18,5
-sleaf,18,5
-sprucetreeleaves,18,5
-sprucelogleaves,18,5
-sprucetrunkleaves,18,5
-sprucewoodleaves,18,5
-streeleaves,18,5
-slogleaves,18,5
-strunkleaves,18,5
-swoodleaves,18,5
-pineleaves,18,5
-pineleaf,18,5
-pleaves,18,5
-pleaf,18,5
-pinetreeleaves,18,5
-pinelogleaves,18,5
-pinetrunkleaves,18,5
-pinewoodleaves,18,5
-ptreeleaves,18,5
-plogleaves,18,5
-ptrunkleaves,18,5
-pwoodleaves,18,5
-darkleaves,18,5
-darkleaf,18,5
-dleaves,18,5
-dleaf,18,5
-darktreeleaves,18,5
-darklogleaves,18,5
-darktrunkleaves,18,5
-darkwoodleaves,18,5
-dtreeleaves,18,5
-dlogleaves,18,5
-dtrunkleaves,18,5
-dwoodleaves,18,5
-sprucetreeleaf,18,5
-sprucelogleaf,18,5
-sprucetrunkleaf,18,5
-sprucewoodleaf,18,5
-streeleaf,18,5
-slogleaf,18,5
-strunkleaf,18,5
-swoodleaf,18,5
-pinetreeleaf,18,5
-pinelogleaf,18,5
-pinetrunkleaf,18,5
-pinewoodleaf,18,5
-ptreeleaf,18,5
-plogleaf,18,5
-ptrunkleaf,18,5
-pwoodleaf,18,5
-darktreeleaf,18,5
-darklogleaf,18,5
-darktrunkleaf,18,5
-darkwoodleaf,18,5
-dtreeleaf,18,5
-dlogleaf,18,5
-dtrunkleaf,18,5
-dwoodleaf,18,5
-birchleaves,18,6
-birchleaf,18,6
-bleaves,18,6
-bleaf,18,6
-birchtreeleaves,18,6
-birchlogleaves,18,6
-birchtrunkleaves,18,6
-birchwoodleaves,18,6
-btreeleaves,18,6
-blogleaves,18,6
-btrunkleaves,18,6
-bwoodleaves,18,6
-lightleaves,18,6
-lightleaf,18,6
-lleaves,18,6
-lleaf,18,6
-lighttreeleaves,18,6
-lightlogleaves,18,6
-lighttrunkleaves,18,6
-lightwoodleaves,18,6
-ltreeleaves,18,6
-llogleaves,18,6
-ltrunkleaves,18,6
-lwoodleaves,18,6
-whiteleaves,18,6
-whiteleaf,18,6
-wleaves,18,6
-wleaf,18,6
-whitetreeleaves,18,6
-whitelogleaves,18,6
-whitetrunkleaves,18,6
-whitewoodleaves,18,6
-wtreeleaves,18,6
-wlogleaves,18,6
-wtrunkleaves,18,6
-wwoodleaves,18,6
-birchtreeleaf,18,6
-birchlogleaf,18,6
-birchtrunkleaf,18,6
-birchwoodleaf,18,6
-btreeleaf,18,6
-blogleaf,18,6
-btrunkleaf,18,6
-bwoodleaf,18,6
-lighttreeleaf,18,6
-lightlogleaf,18,6
-lighttrunkleaf,18,6
-lightwoodleaf,18,6
-ltreeleaf,18,6
-llogleaf,18,6
-ltrunkleaf,18,6
-lwoodleaf,18,6
-whitetreeleaf,18,6
-whitelogleaf,18,6
-whitetrunkleaf,18,6
-whitewoodleaf,18,6
-wtreeleaf,18,6
-wlogleaf,18,6
-wtrunkleaf,18,6
-wwoodleaf,18,6
-jungleleaves,18,7
-jungleleaf,18,7
-jleaves,18,7
-jleaf,18,7
-jungletreeleaves,18,7
-junglelogleaves,18,7
-jungletrunkleaves,18,7
-junglewoodleaves,18,7
-jtreeleaves,18,7
-jlogleaves,18,7
-jtrunkleaves,18,7
-jwoodleaves,18,7
-forestleaves,18,7
-forestleaf,18,7
-fleaves,18,7
-fleaf,18,7
-foresttreeleaves,18,7
-forestlogleaves,18,7
-foresttrunkleaves,18,7
-forestwoodleaves,18,7
-ftreeleaves,18,7
-flogleaves,18,7
-ftrunkleaves,18,7
-fwoodleaves,18,7
-jungletreeleaf,18,7
-junglelogleaf,18,7
-jungletrunkleaf,18,7
-junglewoodleaf,18,7
-jtreeleaf,18,7
-jlogleaf,18,7
-jtrunkleaf,18,7
-jwoodleaf,18,7
-foresttreeleaf,18,7
-forestlogleaf,18,7
-foresttrunkleaf,18,7
-forestwoodleaf,18,7
-ftreeleaf,18,7
-flogleaf,18,7
-ftrunkleaf,18,7
-fwoodleaf,18,7
+leaves,18,0
+leaf,18,0
+treeleaves,18,0
+logleaves,18,0
+trunkleaves,18,0
+woodleaves,18,0
+oakleaves,18,0
+oakleaf,18,0
+oleaves,18,0
+oleaf,18,0
+oaktreeleaves,18,0
+oaklogleaves,18,0
+oaktrunkleaves,18,0
+oakwoodleaves,18,0
+otreeleaves,18,0
+ologleaves,18,0
+otrunkleaves,18,0
+owoodleaves,18,0
+treeleaf,18,0
+logleaf,18,0
+trunkleaf,18,0
+woodleaf,18,0
+oaktreeleaf,18,0
+oaklogleaf,18,0
+oaktrunkleaf,18,0
+oakwoodleaf,18,0
+otreeleaf,18,0
+ologleaf,18,0
+otrunkleaf,18,0
+owoodleaf,18,0
+spruceleaves,18,1
+spruceleaf,18,1
+sleaves,18,1
+sleaf,18,1
+sprucetreeleaves,18,1
+sprucelogleaves,18,1
+sprucetrunkleaves,18,1
+sprucewoodleaves,18,1
+streeleaves,18,1
+slogleaves,18,1
+strunkleaves,18,1
+swoodleaves,18,1
+pineleaves,18,1
+pineleaf,18,1
+pleaves,18,1
+pleaf,18,1
+pinetreeleaves,18,1
+pinelogleaves,18,1
+pinetrunkleaves,18,1
+pinewoodleaves,18,1
+ptreeleaves,18,1
+plogleaves,18,1
+ptrunkleaves,18,1
+pwoodleaves,18,1
+darkleaves,18,1
+darkleaf,18,1
+dleaves,18,1
+dleaf,18,1
+darktreeleaves,18,1
+darklogleaves,18,1
+darktrunkleaves,18,1
+darkwoodleaves,18,1
+dtreeleaves,18,1
+dlogleaves,18,1
+dtrunkleaves,18,1
+dwoodleaves,18,1
+sprucetreeleaf,18,1
+sprucelogleaf,18,1
+sprucetrunkleaf,18,1
+sprucewoodleaf,18,1
+streeleaf,18,1
+slogleaf,18,1
+strunkleaf,18,1
+swoodleaf,18,1
+pinetreeleaf,18,1
+pinelogleaf,18,1
+pinetrunkleaf,18,1
+pinewoodleaf,18,1
+ptreeleaf,18,1
+plogleaf,18,1
+ptrunkleaf,18,1
+pwoodleaf,18,1
+darktreeleaf,18,1
+darklogleaf,18,1
+darktrunkleaf,18,1
+darkwoodleaf,18,1
+dtreeleaf,18,1
+dlogleaf,18,1
+dtrunkleaf,18,1
+dwoodleaf,18,1
+birchleaves,18,2
+birchleaf,18,2
+bleaves,18,2
+bleaf,18,2
+birchtreeleaves,18,2
+birchlogleaves,18,2
+birchtrunkleaves,18,2
+birchwoodleaves,18,2
+btreeleaves,18,2
+blogleaves,18,2
+btrunkleaves,18,2
+bwoodleaves,18,2
+lightleaves,18,2
+lightleaf,18,2
+lleaves,18,2
+lleaf,18,2
+lighttreeleaves,18,2
+lightlogleaves,18,2
+lighttrunkleaves,18,2
+lightwoodleaves,18,2
+ltreeleaves,18,2
+llogleaves,18,2
+ltrunkleaves,18,2
+lwoodleaves,18,2
+whiteleaves,18,2
+whiteleaf,18,2
+wleaves,18,2
+wleaf,18,2
+whitetreeleaves,18,2
+whitelogleaves,18,2
+whitetrunkleaves,18,2
+whitewoodleaves,18,2
+wtreeleaves,18,2
+wlogleaves,18,2
+wtrunkleaves,18,2
+wwoodleaves,18,2
+birchtreeleaf,18,2
+birchlogleaf,18,2
+birchtrunkleaf,18,2
+birchwoodleaf,18,2
+btreeleaf,18,2
+blogleaf,18,2
+btrunkleaf,18,2
+bwoodleaf,18,2
+lighttreeleaf,18,2
+lightlogleaf,18,2
+lighttrunkleaf,18,2
+lightwoodleaf,18,2
+ltreeleaf,18,2
+llogleaf,18,2
+ltrunkleaf,18,2
+lwoodleaf,18,2
+whitetreeleaf,18,2
+whitelogleaf,18,2
+whitetrunkleaf,18,2
+whitewoodleaf,18,2
+wtreeleaf,18,2
+wlogleaf,18,2
+wtrunkleaf,18,2
+wwoodleaf,18,2
+jungleleaves,18,3
+jungleleaf,18,3
+jleaves,18,3
+jleaf,18,3
+jungletreeleaves,18,3
+junglelogleaves,18,3
+jungletrunkleaves,18,3
+junglewoodleaves,18,3
+jtreeleaves,18,3
+jlogleaves,18,3
+jtrunkleaves,18,3
+jwoodleaves,18,3
+forestleaves,18,3
+forestleaf,18,3
+fleaves,18,3
+fleaf,18,3
+foresttreeleaves,18,3
+forestlogleaves,18,3
+foresttrunkleaves,18,3
+forestwoodleaves,18,3
+ftreeleaves,18,3
+flogleaves,18,3
+ftrunkleaves,18,3
+fwoodleaves,18,3
+jungletreeleaf,18,3
+junglelogleaf,18,3
+jungletrunkleaf,18,3
+junglewoodleaf,18,3
+jtreeleaf,18,3
+jlogleaf,18,3
+jtrunkleaf,18,3
+jwoodleaf,18,3
+foresttreeleaf,18,3
+forestlogleaf,18,3
+foresttrunkleaf,18,3
+forestwoodleaf,18,3
+ftreeleaf,18,3
+flogleaf,18,3
+ftrunkleaf,18,3
+fwoodleaf,18,3
 sponge,19,0
 glass,20,0
 lapislazuliore,21,0
@@ -628,21 +628,21 @@ detectrail,28,0
 dtrack,28,0
 drails,28,0
 drail,28,0
-stickypistonbase,29,7
-stickypiston,29,7
-stickpistonbase,29,7
-stickpiston,29,7
-stickyp,29,7
-spistonbase,29,7
-spiston,29,7
-pistonstickybase,29,7
-pistonsticky,29,7
-pistonstickbase,29,7
-pistonstick,29,7
-pistonsbase,29,7
-pistons,29,7
-psticky,29,7
-pstick,29,7
+stickypistonbase,29,0
+stickypiston,29,0
+stickpistonbase,29,0
+stickpiston,29,0
+stickyp,29,0
+spistonbase,29,0
+spiston,29,0
+pistonstickybase,29,0
+pistonsticky,29,0
+pistonstickbase,29,0
+pistonstick,29,0
+pistonsbase,29,0
+pistons,29,0
+psticky,29,0
+pstick,29,0
 spiderweb,30,0
 sweb,30,0
 web,30,0
@@ -662,21 +662,21 @@ dshrub,32,0
 deadbush,32,0
 dbush,32,0
 deadsapling,32,0
-normalpistonbase,33,7
-normalpiston,33,7
-normpistonbase,33,7
-normpiston,33,7
-npistonbase,33,7
-npiston,33,7
-pistonnormalbase,33,7
-pistonnormal,33,7
-pistonnormbase,33,7
-pistonnorm,33,7
-pistonnbase,33,7
-pistonn,33,7
-pistonbase,33,7
-piston,33,7
-pistonblock,33,7
+normalpistonbase,33,0
+normalpiston,33,0
+normpistonbase,33,0
+normpiston,33,0
+npistonbase,33,0
+npiston,33,0
+pistonnormalbase,33,0
+pistonnormal,33,0
+pistonnormbase,33,0
+pistonnorm,33,0
+pistonnbase,33,0
+pistonn,33,0
+pistonbase,33,0
+piston,33,0
+pistonblock,33,0
 pistonextensionnormal,34,0
 pistonextension,34,0
 pistonextnormal,34,0
@@ -2040,14 +2040,57 @@ mossystonebrick,98,1
 mossystonebricks,98,1
 mossystonebrickblock,98,1
 mossystonebb,98,1
+mossstonebrick,98,1
+mossstonebricks,98,1
+mossstonebrickblock,98,1
+mossstonebb,98,1
+mstonebrick,98,1
+mstonebricks,98,1
+mstonebrickblock,98,1
+mstonebb,98,1
+mosssbrick,98,1
+mosssbricks,98,1
+mosssbrickblock,98,1
+mosssbb,98,1
+msbrick,98,1
+msbricks,98,1
+msbrickblock,98,1
+crackedstone,98,2
 crackedstonebrick,98,2
 crackedstonebricks,98,2
 crackedstonebrickblock,98,2
 crackedstonebb,98,2
+crackstonebrick,98,2
+crackstonebricks,98,2
+crackstonebrickblock,98,2
+crackstonebb,98,2
+crstonebrick,98,2
+crstonebricks,98,2
+crstonebrickblock,98,2
+crstonebb,98,2
+cracksbrick,98,2
+cracksbricks,98,2
+cracksbrickblock,98,2
+cracksbb,98,2
+crsbrick,98,2
+crsbricks,98,2
+crsbrickblock,98,2
+circlestone,98,3
 circlestonebrick,98,3
+circlestonebricks,98,3
+circlestonebrickblock,98,3
 circlestonebb,98,3
-circlestone,98,3
+cistonebrick,98,3
+cistonebricks,98,3
+cistonebrickblock,98,3
+cistonebb,98,3
+circlesbrick,98,3
+circlesbricks,98,3
+circlesbrickblock,98,3
 circlesbb,98,3
+cisbrick,98,3
+cisbricks,98,3
+cisbrickblock,98,3
 giantredmushroom,99,0
 hugeredmushroom,99,0
 bigredmushroom,99,0