Merge pull request #122 from necrodoom/patch-8

update IDs: 5,6,17,18 - erase unused and add new

1 files changed, 260 insertions, 136 deletions

diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index bcc784f6d..30171d880 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -22,6 +22,20 @@ wplank,5,0
 plankwooden,5,0
 plankwood,5,0
 plankw,5,0
+oakplank,5,0
+oakwoodenplank,5,0
+oakwoodplank,5,0
+oakwplank,5,0
+oakplankwooden,5,0
+oakplankwood,5,0
+oakplankw,5,0
+oplank,5,0
+owoodenplank,5,0
+owoodplank,5,0
+owplank,5,0
+oplankwooden,5,0
+oplankwood,5,0
+oplankw,5,0
 darkplank,5,1
 darkwoodenplank,5,1
 darkwoodplank,5,1
@@ -50,6 +64,20 @@ swplank,5,1
 splankwooden,5,1
 splankwood,5,1
 splankw,5,1
+pineplank,5,1
+pinewoodenplank,5,1
+pinewoodplank,5,1
+pinewplank,5,1
+pineplankwooden,5,1
+pineplankwood,5,1
+pineplankw,5,1
+pplank,5,1
+pwoodenplank,5,1
+pwoodplank,5,1
+pwplank,5,1
+pplankwooden,5,1
+pplankwood,5,1
+pplankw,5,1
 lightplank,5,2
 lightwoodenplank,5,2
 lightwoodplank,5,2
@@ -57,6 +85,13 @@ lightwplank,5,2
 lightplankwooden,5,2
 lightplankwood,5,2
 lightplankw,5,2
+lplank,5,2
+lwoodenplank,5,2
+lwoodplank,5,2
+lwplank,5,2
+lplankwooden,5,2
+lplankwood,5,2
+lplankw,5,2
 birchplank,5,2
 birchwoodenplank,5,2
 birchwoodplank,5,2
@@ -71,6 +106,19 @@ bwplank,5,2
 bplankwooden,5,2
 bplankwood,5,2
 bplankw,5,2
+whiteplank,5,2
+whitewoodenplank,5,2
+whitewoodplank,5,2
+whitewplank,5,2
+whiteplankwooden,5,2
+whiteplankwood,5,2
+whiteplankw,5,2
+wwoodenplank,5,2
+wwoodplank,5,2
+wwplank,5,2
+wplankwooden,5,2
+wplankwood,5,2
+wplankw,5,2
 jungleplank,5,3
 junglewoodenplank,5,3
 junglewoodplank,5,3
@@ -85,6 +133,20 @@ jwplank,5,3
 jplankwooden,5,3
 jplankwood,5,3
 jplankw,5,3
+forestplank,5,3
+forestwoodenplank,5,3
+forestwoodplank,5,3
+forestwplank,5,3
+forestplankwooden,5,3
+forestplankwood,5,3
+forestplankw,5,3
+fplank,5,3
+fwoodenplank,5,3
+fwoodplank,5,3
+fwplank,5,3
+fplankwooden,5,3
+fplankwood,5,3
+fplankw,5,3
 sapling,6,0
 treesapling,6,0
 logsapling,6,0
@@ -94,162 +156,91 @@ oaktreesapling,6,0
 oaklogsapling,6,0
 oaktrunksapling,6,0
 oakwoodsapling,6,0
-normaltreesapling,6,0
-normallogsapling,6,0
-normaltrunksapling,6,0
-normalwoodsapling,6,0
 osapling,6,0
 otreesapling,6,0
 ologsapling,6,0
 otrunksapling,6,0
 owoodsapling,6,0
-nsapling,6,0
-ntreesapling,6,0
-nlogsapling,6,0
-ntrunksapling,6,0
-nwoodsapling,6,0
-treesap,6,0
-logsap,6,0
-trunksap,6,0
-woodsap,6,0
-oaktreesap,6,0
-oaklogsap,6,0
-oaktrunksap,6,0
-oakwoodsap,6,0
-osap,6,0
-otreesap,6,0
-ologsap,6,0
-otrunksap,6,0
-owoodsap,6,0
 darksapling,6,1
 darktreesapling,6,1
 darklogsapling,6,1
 darktrunksapling,6,1
 darkwoodsapling,6,1
-blacksapling,6,1
-blacktreesapling,6,1
-blacklogsapling,6,1
-blacktrunksapling,6,1
-blackwoodsapling,6,1
 sprucesapling,6,1
 sprucetreesapling,6,1
 sprucelogsapling,6,1
 sprucetrunksapling,6,1
 sprucewoodsapling,6,1
+pinesapling,6,1
+pinetreesapling,6,1
+pinelogsapling,6,1
+pinetrunksapling,6,1
+pinewoodsapling,6,1
 dsapling,6,1
 dtreesapling,6,1
 dlogsapling,6,1
 dtrunksapling,6,1
 dwoodsapling,6,1
-blsapling,6,1
-bltreesapling,6,1
-bllogsapling,6,1
-bltrunksapling,6,1
-blwoodsapling,6,1
 ssapling,6,1
 streesapling,6,1
 slogsapling,6,1
 strunksapling,6,1
 swoodsapling,6,1
-darksap,6,1
-darktreesap,6,1
-darklogsap,6,1
-darktrunksap,6,1
-darkwoodsap,6,1
-blacksap,6,1
-blacktreesap,6,1
-blacklogsap,6,1
-blacktrunksap,6,1
-blackwoodsap,6,1
-pinesap,6,1
-pinetreesap,6,1
-pinelogsap,6,1
-pinetrunksap,6,1
-pinewoodsap,6,1
-sprucesap,6,1
-sprucetreesap,6,1
-sprucelogsap,6,1
-sprucetrunksap,6,1
-sprucewoodsap,6,1
-dsap,6,1
-dtreesap,6,1
-dlogsap,6,1
-dtrunksap,6,1
-dwoodsap,6,1
-blsap,6,1
-bltreesap,6,1
-bllogsap,6,1
-bltrunksap,6,1
-blwoodsap,6,1
-ssap,6,1
-streesap,6,1
-slogsap,6,1
-strunksap,6,1
-swoodsap,6,1
+psapling,6,1
+ptreesapling,6,1
+plogsapling,6,1
+ptrunksapling,6,1
+pwoodsapling,6,1
 birchsapling,6,2
 birchtreesapling,6,2
 birchlogsapling,6,2
 birchtrunksapling,6,2
 birchwoodsapling,6,2
+lightsapling,6,2
+lighttreesapling,6,2
+lightlogsapling,6,2
+lighttrunksapling,6,2
+lightwoodsapling,6,2
 whitesapling,6,2
 whitetreesapling,6,2
 whitelogsapling,6,2
 whitetrunksapling,6,2
 whitewoodsapling,6,2
-bisapling,6,2
-bitreesapling,6,2
-bilogsapling,6,2
-bitrunksapling,6,2
-biwoodsapling,6,2
 bsapling,6,2
 btreesapling,6,2
 blogsapling,6,2
 btrunksapling,6,2
 bwoodsapling,6,2
-pasapling,6,2
-patreesapling,6,2
-palogsapling,6,2
-patrunksapling,6,2
-pawoodsapling,6,2
+lsapling,6,2
+ltreesapling,6,2
+llogsapling,6,2
+ltrunksapling,6,2
+lwoodsapling,6,2
 wsapling,6,2
 wtreesapling,6,2
 wlogsapling,6,2
 wtrunksapling,6,2
 wwoodsapling,6,2
-birchsap,6,2
-birchtreesap,6,2
-birchlogsap,6,2
-birchtrunksap,6,2
-birchwoodsap,6,2
-whitesap,6,2
-whitetreesap,6,2
-whitelogsap,6,2
-whitetrunksap,6,2
-whitewoodsap,6,2
-bisap,6,2
-bitreesap,6,2
-bilogsap,6,2
-bitrunksap,6,2
-biwoodsap,6,2
-bsap,6,2
-btreesap,6,2
-blogsap,6,2
-btrunksap,6,2
-bwoodsap,6,2
-pasap,6,2
-patreesap,6,2
-palogsap,6,2
-patrunksap,6,2
-pawoodsap,6,2
-wsap,6,2
-wtreesap,6,2
-wlogsap,6,2
-wtrunksap,6,2
-wwoodsap,6,2
 junglesapling,6,3
+jungletreesapling,6,3
+junglelogsapling,6,3
+jungletrunksapling,6,3
+junglewoodsapling,6,3
+forestsapling,6,3
+foresttreesapling,6,3
+forestlogsapling,6,3
+foresttrunksapling,6,3
+forestwoodsapling,6,3
 jsapling,6,3
-junglesap,6,3
-jsap,6,3
+jtreesapling,6,3
+jlogsapling,6,3
+jtrunksapling,6,3
+jwoodsapling,6,3
+fsapling,6,3
+ftreesapling,6,3
+flogsapling,6,3
+ftrunksapling,6,3
+fwoodsapling,6,3
 bedrock,7,0
 oprock,7,0
 opblock,7,0
@@ -291,6 +282,7 @@ tree,17,0
 log,17,0
 trunk,17,0
 wood,17,0
+oak,17,0
 oaktree,17,0
 oaklog,17,0
 oaktrunk,17,0
@@ -299,44 +291,48 @@ otree,17,0
 olog,17,0
 otrunk,17,0
 owood,17,0
+dark,17,1
 darktree,17,1
 darklog,17,1
 darktrunk,17,1
 darkwood,17,1
-blacktree,17,1
-blacklog,17,1
-blacktrunk,17,1
-blackwood,17,1
 spruce,17,1
 sprucetree,17,1
 sprucelog,17,1
 sprucetrunk,17,1
 sprucewood,17,1
+pine,17,1
+pinetree,17,1
+pinelog,17,1
+pinetrunk,17,1
+pinewood,17,1
 dtree,17,1
 dlog,17,1
 dtrunk,17,1
 dwood,17,1
-bltree,17,1
-bllog,17,1
-bltrunk,17,1
-blwood,17,1
 stree,17,1
 slog,17,1
 strunk,17,1
 swood,17,1
+ptree,17,1
+plog,17,1
+ptrunk,17,1
+pwood,17,1
 birch,17,2
 birchtree,17,2
 birchlog,17,2
 birchtrunk,17,2
 birchwood,17,2
+white,17,2
 whitetree,17,2
 whitelog,17,2
 whitetrunk,17,2
 whitewood,17,2
-bitree,17,2
-bilog,17,2
-bitrunk,17,2
-biwood,17,2
+light,17,2
+lighttree,17,2
+lightlog,17,2
+lighttrunk,17,2
+lightwood,17,2
 btree,17,2
 blog,17,2
 btrunk,17,2
@@ -345,18 +341,38 @@ wtree,17,2
 wlog,17,2
 wtrunk,17,2
 wwood,17,2
-junglewood,17,3
-jwood,17,3
+ltree,17,2
+llog,17,2
+ltrunk,17,2
+lwood,17,2
+jungle,17,3
+jungletree,17,3
 junglelog,17,3
+jungletrunk,17,3
+junglewood,17,3
+forest,17,3
+foresttree,17,3
+forestlog,17,3
+foresttrunk,17,3
+forestwood,17,3
+jtree,17,3
 jlog,17,3
-monkeytree,17,3
-monkeylog,17,3
+jtrunk,17,3
+jwood,17,3
+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
@@ -379,6 +395,8 @@ 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
@@ -389,6 +407,8 @@ 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
@@ -397,8 +417,46 @@ 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
@@ -407,10 +465,30 @@ btreeleaves,18,6
 blogleaves,18,6
 btrunkleaves,18,6
 bwoodleaves,18,6
-bitreeleaves,18,6
-bilogleaves,18,6
-bitrunkleaves,18,6
-biwoodleaves,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
@@ -419,16 +497,62 @@ btreeleaf,18,6
 blogleaf,18,6
 btrunkleaf,18,6
 bwoodleaf,18,6
-bitreeleaf,18,6
-bilogleaf,18,6
-bitrunkleaf,18,6
-biwoodleaf,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
-jungleleaf,18,7
-monkeyleaf,18,7
-monkeyleaves,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
 sponge,19,0
 glass,20,0
 lapislazuliore,21,0