items.csv - try move the most common item alias to top of aliases stack

without ore aliases remove

1 files changed, 383 insertions, 429 deletions

diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index e4f2cb62c..3b836a054 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -37,6 +37,20 @@ owplank,5,0
 oplankwooden,5,0
 oplankwood,5,0
 oplankw,5,0
+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
 darkplank,5,1
 darkwoodenplank,5,1
 darkwoodplank,5,1
@@ -65,34 +79,6 @@ 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
-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
@@ -107,6 +93,20 @@ bwplank,5,2
 bplankwooden,5,2
 bplankwood,5,2
 bplankw,5,2
+lightplank,5,2
+lightwoodenplank,5,2
+lightwoodplank,5,2
+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
 whiteplank,5,2
 whitewoodenplank,5,2
 whitewoodplank,5,2
@@ -258,10 +258,10 @@ sand,12,0
 gravel,13,0
 goldore,14,0
 oregold,14,0
-goldo,14,0
-ogold,14,0
 gore,14,0
 oreg,14,0
+ogold,14,0 
+goldo,14,0
 ironore,15,0
 oreiron,15,0
 irono,15,0
@@ -291,6 +291,11 @@ otree,17,0
 olog,17,0
 otrunk,17,0
 owood,17,0
+pine,17,1
+pinetree,17,1
+pinelog,17,1
+pinetrunk,17,1
+pinewood,17,1
 darktree,17,1
 darklog,17,1
 darktrunk,17,1
@@ -300,11 +305,6 @@ 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
@@ -342,11 +342,11 @@ 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
+jungle,17,3
 forest,17,3
 foresttree,17,3
 forestlog,17,3
@@ -390,18 +390,6 @@ 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
@@ -414,6 +402,18 @@ ptreeleaves,18,1
 plogleaves,18,1
 ptrunkleaves,18,1
 pwoodleaves,18,1
+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
 darkleaves,18,1
 darkleaf,18,1
 dleaves,18,1
@@ -572,11 +572,11 @@ dispenser,23,0
 dispense,23,0
 sandstone,24,0
 sastone,24,0
+creepersandstone,24,1
 csandstone,24,1
 csastone,24,1
 creepsandstone,24,1
 creepsastone,24,1
-creepersandstone,24,1
 creepersastone,24,1
 hieroglyphicsandstone,24,1
 hieroglyphicsastone,24,1
@@ -662,6 +662,7 @@ dshrub,32,0
 deadbush,32,0
 dbush,32,0
 deadsapling,32,0
+piston,33,0
 normalpistonbase,33,0
 normalpiston,33,0
 normpistonbase,33,0
@@ -675,10 +676,9 @@ pistonnorm,33,0
 pistonnbase,33,0
 pistonn,33,0
 pistonbase,33,0
-piston,33,0
 pistonblock,33,0
-pistonextensionnormal,34,0
 pistonextension,34,0
+pistonextensionnormal,34,0
 pistonextnormal,34,0
 pistonext,34,0
 pistonenormal,34,0
@@ -689,8 +689,8 @@ extpistonnormal,34,0
 extpiston,34,0
 epistonnormal,34,0
 episton,34,0
-whitecloth,35,0
 whitewool,35,0
+whitecloth,35,0
 whitecotton,35,0
 wcloth,35,0
 wwool,35,0
@@ -698,20 +698,20 @@ wcotton,35,0
 cloth,35,0
 wool,35,0
 cotton,35,0
-orangecloth,35,1
 orangewool,35,1
+orangecloth,35,1
 orangecotton,35,1
 ocloth,35,1
 owool,35,1
 ocotton,35,1
-magentacloth,35,2
 magentawool,35,2
+magentacloth,35,2
 magentacotton,35,2
 mcloth,35,2
 mwool,35,2
 mcotton,35,2
-lightbluecloth,35,3
 lightbluewool,35,3
+lightbluecloth,35,3
 lightbluecotton,35,3
 lbluecloth,35,3
 lbluewool,35,3
@@ -722,14 +722,14 @@ lightblucotton,35,3
 lblucloth,35,3
 lbluwool,35,3
 lblucotton,35,3
-yellowcloth,35,4
 yellowwool,35,4
+yellowcloth,35,4
 yellowcotton,35,4
 ycloth,35,4
 ywool,35,4
 ycotton,35,4
-lightgreencloth,35,5
 lightgreenwool,35,5
+lightgreencloth,35,5
 lightgreencotton,35,5
 lgreencloth,35,5
 lgreenwool,35,5
@@ -746,14 +746,14 @@ limecotton,35,5
 lcloth,35,5
 lwool,35,5
 lcotton,35,5
-pinkcloth,35,6
 pinkwool,35,6
+pinkcloth,35,6
 pinkcotton,35,6
 picloth,35,6
 piwool,35,6
 picotton,35,6
-darkgraycloth,35,7
 darkgraywool,35,7
+darkgraycloth,35,7
 darkgraycotton,35,7
 dgraycloth,35,7
 dgraywool,35,7
@@ -770,8 +770,8 @@ graycotton,35,7
 gracloth,35,7
 grawool,35,7
 gracotton,35,7
-lightgraycloth,35,8
 lightgraywool,35,8
+lightgraycloth,35,8
 lightgraycotton,35,8
 lgraycloth,35,8
 lgraywool,35,8
@@ -788,32 +788,32 @@ silvercotton,35,8
 sicloth,35,8
 siawool,35,8
 siacotton,35,8
-cyancloth,35,9
 cyanwool,35,9
+cyancloth,35,9
 cyancotton,35,9
 ccloth,35,9
 cwool,35,9
 ccotton,35,9
-purplecloth,35,10
 purplewool,35,10
+purplecloth,35,10
 purplecotton,35,10
 pucloth,35,10
 puwool,35,10
 pucotton,35,10
-bluecloth,35,11
 bluewool,35,11
+bluecloth,35,11
 bluecotton,35,11
 blucloth,35,11
 bluwool,35,11
 blucotton,35,11
-browncloth,35,12
 brownwool,35,12
+browncloth,35,12
 browncotton,35,12
 brocloth,35,12
 browool,35,12
 brocotton,35,12
-darkgreencloth,35,13
 darkgreenwool,35,13
+darkgreencloth,35,13
 darkgreencotton,35,13
 dgreencloth,35,13
 dgreenwool,35,13
@@ -830,14 +830,14 @@ dgrecotton,35,13
 grecloth,35,13
 grewool,35,13
 grecotton,35,13
-redcloth,35,14
 redwool,35,14
+redcloth,35,14
 redcotton,35,14
 rcloth,35,14
 rwool,35,14
 rcotton,35,14
-blackcloth,35,15
 blackwool,35,15
+blackcloth,35,15
 blackcotton,35,15
 blacloth,35,15
 blawool,35,15
@@ -845,12 +845,15 @@ blacotton,35,15
 pistonmovingpiece,36,0
 pistonmp,36,0
 pistontop,36,0
+dandelion,37,0
+yellowdandelion,37,0
+ydandelion,37,0
 yellowflower,37,0
 yflower,37,0
 flower,37,0
+rose,38,0
 redrose,38,0
 rrose,38,0
-rose,38,0
 redflower,38,0
 rflower,38,0
 brownmushroom,39,0
@@ -940,41 +943,13 @@ doublesstonehalfblock,43,1
 dsstonehalfblock,43,1
 doublesshalfblock,43,1
 dsshalfblock,43,1
-woodenplankstonedoublehalfblock,43,2
-woodenplankstonedhalfblock,43,2
-woodplankstonedoublehalfblock,43,2
-woodplankstonedhalfblock,43,2
-wplankstonedoublehalfblock,43,2
-wplankstonedhalfblock,43,2
-plankstonedoublehalfblock,43,2
-planstonekdhalfblock,43,2
-woodenstonedoublehalfblock,43,2
-woodenstonedhalfblock,43,2
-woodstonedoublehalfblock,43,2
-woodstonedhalfblock,43,2
-wstonedoublehalfblock,43,2
-wstonedhalfblock,43,2
-doublewoodenplankstonehalfblock,43,2
-dwoodenplankstonehalfblock,43,2
-doublewoodplankstonehalfblock,43,2
-dwoodplankstonehalfblock,43,2
-doublewplankstonehalfblock,43,2
-dwplankstonehalfblock,43,2
-doubleplankstonehalfblock,43,2
-dplankstonehalfblock,43,2
-doublewoodenstonehalfblock,43,2
-dwoodenstonehalfblock,43,2
-doublewoodstonehalfblock,43,2
-dwoodstonehalfblock,43,2
-doublewstonehalfblock,43,2
-dwstonehalfblock,43,2
+plankstonedoublestep,43,2
 woodenplankstonedoublestep,43,2
 woodenplankstonedstep,43,2
 woodplankstonedoublestep,43,2
 woodplankstonedstep,43,2
 wplankstonedoublestep,43,2
 wplankstonedstep,43,2
-plankstonedoublestep,43,2
 plankstonedstep,43,2
 woodenstonedoublestep,43,2
 woodenstonedstep,43,2
@@ -1024,6 +999,34 @@ doublewoodstoneslab,43,2
 dwoodstoneslab,43,2
 doublewstoneslab,43,2
 dwstoneslab,43,2
+woodenplankstonedoublehalfblock,43,2
+woodenplankstonedhalfblock,43,2
+woodplankstonedoublehalfblock,43,2
+woodplankstonedhalfblock,43,2
+wplankstonedoublehalfblock,43,2
+wplankstonedhalfblock,43,2
+plankstonedoublehalfblock,43,2
+planstonekdhalfblock,43,2
+woodenstonedoublehalfblock,43,2
+woodenstonedhalfblock,43,2
+woodstonedoublehalfblock,43,2
+woodstonedhalfblock,43,2
+wstonedoublehalfblock,43,2
+wstonedhalfblock,43,2
+doublewoodenplankstonehalfblock,43,2
+dwoodenplankstonehalfblock,43,2
+doublewoodplankstonehalfblock,43,2
+dwoodplankstonehalfblock,43,2
+doublewplankstonehalfblock,43,2
+dwplankstonehalfblock,43,2
+doubleplankstonehalfblock,43,2
+dplankstonehalfblock,43,2
+doublewoodenstonehalfblock,43,2
+dwoodenstonehalfblock,43,2
+doublewoodstonehalfblock,43,2
+dwoodstonehalfblock,43,2
+doublewstonehalfblock,43,2
+dwstonehalfblock,43,2
 cobblestonedoublestep,43,3
 cobblestonedstep,43,3
 cobbledoublestep,43,3
@@ -1072,58 +1075,30 @@ doublecstonehalfblock,43,3
 dcstonehalfblock,43,3
 doublecshalfblock,43,3
 dcshalfblock,43,3
-brickblockdoublestep,43,4
-brickblockdstep,43,4
-brickbdoublestep,43,4
-brickbdstep,43,4
 brickdoublestep,43,4
 brickdstep,43,4
 bdoublestep,43,4
 bdstep,43,4
-brickblockdoubleslab,43,4
-brickblockdslab,43,4
-brickbdoubleslab,43,4
-brickbdslab,43,4
 brickdoubleslab,43,4
 brickdslab,43,4
 bdoubleslab,43,4
 bdslab,43,4
-doublebrickblockstep,43,4
-dbrickblockstep,43,4
-doublebrickbstep,43,4
-dbrickbstep,43,4
 doublebrickstep,43,4
 dbrickstep,43,4
 doublebstep,43,4
 dbstep,43,4
-doublebrickblockslab,43,4
-dbrickblockslab,43,4
-doublebrickbslab,43,4
-dbrickbslab,43,4
 doublebrickslab,43,4
 dbrickslab,43,4
 doublebslab,43,4
 dbslab,43,4
-brickblockdoublehalfblock,43,4
-brickblockdhalfblock,43,4
-brickbdoublehalfblock,43,4
-brickbdhalfblock,43,4
 brickdoublehalfblock,43,4
 brickdhalfblock,43,4
 bdoublehalfblock,43,4
 bdhalfblock,43,4
-doublebrickblockhalfblock,43,4
-dbrickblockhalfblock,43,4
-doublebrickbhalfblock,43,4
-dbrickbhalfblock,43,4
 doublebrickhalfblock,43,4
 dbrickhalfblock,43,4
 doublebhalfblock,43,4
 dbhalfblock,43,4
-stonebrickdoublestep,43,5
-stonebrickdstep,43,5
-stonebdoublestep,43,5
-stonebdstep,43,5
 sbrickdoublestep,43,5
 sbrickdstep,43,5
 sbdoublestep,43,5
@@ -1288,17 +1263,6 @@ dnbhalfblock,43,6
 dhbhalfblock,43,6
 dnhalfblock,43,6
 dhhalfblock,43,6
-netherquartzdoubleslab,43,7
-hellquartzdoubleslab,43,7
-deathquartzdoubleslab,43,7
-nquartzdoubleslab,43,7
-hquartzdoubleslab,43,7
-dquartzdoubleslab,43,7
-quartzdoubleslab,43,7
-nqdoubleslab,43,7
-hqdoubleslab,43,7
-dqdoubleslab,43,7
-qdoubleslab,43,7
 netherquartzdoublestep,43,7
 hellquartzdoublestep,43,7
 deathquartzdoublestep,43,7
@@ -1310,6 +1274,17 @@ nqdoublestep,43,7
 hqdoublestep,43,7
 dqdoublestep,43,7
 qdoublestep,43,7
+netherquartzdoubleslab,43,7
+hellquartzdoubleslab,43,7
+deathquartzdoubleslab,43,7
+nquartzdoubleslab,43,7
+hquartzdoubleslab,43,7
+dquartzdoubleslab,43,7
+quartzdoubleslab,43,7
+nqdoubleslab,43,7
+hqdoubleslab,43,7
+dqdoubleslab,43,7
+qdoubleslab,43,7
 netherquartzdoublehalfblock,43,7
 hellquartzdoublehalfblock,43,7
 deathquartzdoublehalfblock,43,7
@@ -1495,10 +1470,10 @@ ssslab,44,1
 sandstonehalfblock,44,1
 sstonehalfblock,44,1
 sshalfblock,44,1
+plankstonestep,44,2
 woodenplankstonestep,44,2
 woodplankstonestep,44,2
 wplankstonestep,44,2
-plankstonestep,44,2
 woodenstonestep,44,2
 woodstonestep,44,2
 wstonestep,44,2
@@ -1528,16 +1503,10 @@ cobblestonehalfblock,44,3
 cobblehalfblock,44,3
 cstonehalfblock,44,3
 cshalfblock,44,3
-brickblockstep,44,4
-brickbstep,44,4
 brickstep,44,4
 bstep,44,4
-brickblockslab,44,4
-brickbslab,44,4
 brickslab,44,4
 bslab,44,4
-brickblockhalfblock,44,4
-brickbhalfblock,44,4
 brickhalfblock,44,4
 bhalfblock,44,4
 stonebrickstep,44,5
@@ -1581,17 +1550,6 @@ nbhalfblock,44,6
 hbhalfblock,44,6
 nhalfblock,44,6
 hhalfblock,44,6
-netherquartzslab,44,7
-hellquartzslab,44,7
-deathquartzslab,44,7
-nquartzslab,44,7
-hquartzslab,44,7
-dquartzslab,44,7
-quartzslab,44,7
-nqslab,44,7
-hqslab,44,7
-dqslab,44,7
-qslab,44,7
 netherquartzstep,44,7
 hellquartzstep,44,7
 deathquartzstep,44,7
@@ -1603,6 +1561,17 @@ nqstep,44,7
 hqstep,44,7
 dqstep,44,7
 qstep,44,7
+netherquartzslab,44,7
+hellquartzslab,44,7
+deathquartzslab,44,7
+nquartzslab,44,7
+hquartzslab,44,7
+dquartzslab,44,7
+quartzslab,44,7
+nqslab,44,7
+hqslab,44,7
+dqslab,44,7
+qslab,44,7
 netherquartzhalfblock,44,7
 hellquartzhalfblock,44,7
 deathquartzhalfblock,44,7
@@ -1618,13 +1587,13 @@ brickblock,45,0
 blockbrick,45,0
 bblock,45,0
 blockb,45,0
+tnt,46,0
 tntblock,46,0
 blocktnt,46,0
 bombblock,46,0
 blockbomb,46,0
 dynamiteblock,46,0
 blockdynamite,46,0
-tnt,46,0
 bomb,46,0
 dynamite,46,0
 bookcase,47,0
@@ -1667,12 +1636,6 @@ woodstair,53,0
 wstair,53,0
 chest,54,0
 container,54,0
-redstonewireblock,55,0
-rstonewireblock,55,0
-redswireblock,55,0
-redwireblock,55,0
-rswireblock,55,0
-rwireblock,55,0
 redstonewire,55,0
 rstonewire,55,0
 redswire,55,0
@@ -1680,14 +1643,16 @@ redwire,55,0
 rswire,55,0
 rwire,55,0
 wire,55,0
+redstonewireblock,55,0
+rstonewireblock,55,0
+redswireblock,55,0
+redwireblock,55,0
+rswireblock,55,0
+rwireblock,55,0
 diamondore,56,0
 crystalore,56,0
-diamondo,56,0
-crystalo,56,0
 orediamond,56,0
-odiamond,56,0
 orecrystal,56,0
-ocrystal,56,0
 dore,56,0
 ored,56,0
 diamondblock,57,0
@@ -1753,14 +1718,6 @@ cstair,67,0
 wallsign,68,0
 wsign,68,0
 lever,69,0
-smoothstonepressureplate,70,0
-smoothstonepressplate,70,0
-smoothstonepplate,70,0
-smoothstoneplate,70,0
-sstonepressureplate,70,0
-sstonepressplate,70,0
-sstonepplate,70,0
-sstoneplate,70,0
 stonepressureplate,70,0
 stonepressplate,70,0
 stonepplate,70,0
@@ -1769,6 +1726,14 @@ spressureplate,70,0
 spressplate,70,0
 spplate,70,0
 splate,70,0
+smoothstonepressureplate,70,0
+smoothstonepressplate,70,0
+smoothstonepplate,70,0
+smoothstoneplate,70,0
+sstonepressureplate,70,0
+sstonepressplate,70,0
+sstonepplate,70,0
+sstoneplate,70,0
 irondoorhalf,71,0
 idoorhalf,71,0
 irondoorbottom,71,0
@@ -1842,8 +1807,8 @@ rstonetorchoff,75,0
 redstorchoff,75,0
 redtorchoff,75,0
 rstorchoff,75,0
-redstonetorchon,76,0
 redstonetorch,76,0
+redstonetorchon,76,0
 rstonetorchon,76,0
 rstonetorch,76,0
 redstorchon,76,0
@@ -1852,13 +1817,13 @@ redtorchon,76,0
 redtorch,76,0
 rstorchon,76,0
 rstorch,76,0
+stonebutton,77,0
 smoothstonebutton,77,0
 sstonebutton,77,0
-stonebutton,77,0
 sbutton,77,0
 button,77,0
-snowcovering,78,0
 snowcover,78,0
+snowcovering,78,0
 scover,78,0
 ice,79,0
 frozenwater,79,0
@@ -1888,8 +1853,8 @@ blockscane,83,0
 blockbamboo,83,0
 jukebox,84,0
 jbox,84,0
-fence,85,0
 woodenfence,85,0
+fence,85,0
 woodfence,85,0
 wfence,85,0
 fencewooden,85,0
@@ -1908,6 +1873,7 @@ slowmud,88,0
 ssand,88,0
 smud,88,0
 mud,88,0
+glowstone,89,0
 glowingstoneblock,89,0
 lightstoneblock,89,0
 glowstoneblock,89,0
@@ -1922,7 +1888,6 @@ blightstone,89,0
 bglowstone,89,0
 glowingstone,89,0
 lightstone,89,0
-glowstone,89,0
 glowingblock,89,0
 lightblock,89,0
 glowblock,89,0
@@ -1977,6 +1942,16 @@ doort,96,0
 trapd,96,0
 dtrap,96,0
 silverfish,97,0
+silverfishcobblestone,97,1
+silverfishcstone,97,1
+sfishcobblestone,97,1
+sfishcstone,97,1
+fishcobblestone,97,1
+fishcstone,97,1
+sfcobblestone,97,1
+sfcstone,97,1
+trapcobblestone,97,1
+trapcstone,97,1
 monsteregg,97,0
 monstereggsmoothstone,97,0
 monstereggsstone,97,0
@@ -1984,18 +1959,6 @@ meggsmoothstone,97,0
 meggsstone,97,0
 mesmoothstone,97,0
 messtone,97,0
-silverfishsmoothstone,97,0
-silverfishsstone,97,0
-silverfishstone,97,0
-sfishsmoothstone,97,0
-sfishsstone,97,0
-sfishstone,97,0
-fishsmoothstone,97,0
-fishsstone,97,0
-fishstone,97,0
-sfsmoothstone,97,0
-sfsstone,97,0
-sfstone,97,0
 trapsmoothstone,97,0
 trapsstone,97,0
 trapstone,97,0
@@ -2005,22 +1968,6 @@ meggcobblestone,97,1
 meggcstone,97,1
 mecobblestone,97,1
 mecstone,97,1
-silverfishcobblestone,97,1
-silverfishcstone,97,1
-sfishcobblestone,97,1
-sfishcstone,97,1
-fishcobblestone,97,1
-fishcstone,97,1
-sfcobblestone,97,1
-sfcstone,97,1
-trapcobblestone,97,1
-trapcstone,97,1
-monstereggstonebrick,97,2
-monstereggsbrick,97,2
-meggstonebrick,97,2
-meggsbrick,97,2
-mestonebrick,97,2
-mesbrick,97,2
 silverfishstonebrick,97,2
 silverfishsbrick,97,2
 sfishstonebrick,97,2
@@ -2031,6 +1978,12 @@ sfstonebrick,97,2
 sfsbrick,97,2
 trapstonebrick,97,2
 trapsbrick,97,2
+monstereggstonebrick,97,2
+monstereggsbrick,97,2
+meggstonebrick,97,2
+meggsbrick,97,2
+mestonebrick,97,2
+mesbrick,97,2
 stonebrick,98,0
 stonebricks,98,0
 stonebrickblock,98,0
@@ -2182,9 +2135,9 @@ vinesg,106,0
 vineg,106,0
 gvines,106,0
 gvine,106,0
+woodenfencegate,107,0
 wfencegate,107,0
 woodfencegate,107,0
-woodenfencegate,107,0
 woodengate,107,0
 woodgate,107,0
 wgate,107,0
@@ -2216,16 +2169,16 @@ cbstairs,109,0
 greybrickstairs,109,0
 greybstairs,109,0
 greystairs,109,0
+mycelium,110,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
+waterlily,111,0
 lily,111,0
 swamppad,111,0
 lpad,111,0
@@ -2369,34 +2322,6 @@ rslampoff,123,0
 redstonelampon,124,0
 redlampon,124,0
 rslampon,124,0
-woodenplankdoublehalfblock,125,0
-woodenplankdhalfblock,125,0
-woodplankdoublehalfblock,125,0
-woodplankdhalfblock,125,0
-wplankdoublehalfblock,125,0
-wplankdhalfblock,125,0
-plankdoublehalfblock,125,0
-plankdhalfblock,125,0
-woodendoublehalfblock,125,0
-woodendhalfblock,125,0
-wooddoublehalfblock,125,0
-wooddhalfblock,125,0
-wdoublehalfblock,125,0
-wdhalfblock,125,0
-doublewoodenplankhalfblock,125,0
-dwoodenplankhalfblock,125,0
-doublewoodplankhalfblock,125,0
-dwoodplankhalfblock,125,0
-doublewplankhalfblock,125,0
-dwplankhalfblock,125,0
-doubleplankhalfblock,125,0
-dplankhalfblock,125,0
-doublewoodenhalfblock,125,0
-dwoodenhalfblock,125,0
-doublewoodhalfblock,125,0
-dwoodhalfblock,125,0
-doublewhalfblock,125,0
-dwhalfblock,125,0
 woodenplankdoublestep,125,0
 woodenplankdstep,125,0
 woodplankdoublestep,125,0
@@ -2453,6 +2378,34 @@ doublewoodslab,125,0
 dwoodslab,125,0
 doublewslab,125,0
 dwslab,125,0
+woodenplankdoublehalfblock,125,0
+woodenplankdhalfblock,125,0
+woodplankdoublehalfblock,125,0
+woodplankdhalfblock,125,0
+wplankdoublehalfblock,125,0
+wplankdhalfblock,125,0
+plankdoublehalfblock,125,0
+plankdhalfblock,125,0
+woodendoublehalfblock,125,0
+woodendhalfblock,125,0
+wooddoublehalfblock,125,0
+wooddhalfblock,125,0
+wdoublehalfblock,125,0
+wdhalfblock,125,0
+doublewoodenplankhalfblock,125,0
+dwoodenplankhalfblock,125,0
+doublewoodplankhalfblock,125,0
+dwoodplankhalfblock,125,0
+doublewplankhalfblock,125,0
+dwplankhalfblock,125,0
+doubleplankhalfblock,125,0
+dplankhalfblock,125,0
+doublewoodenhalfblock,125,0
+dwoodenhalfblock,125,0
+doublewoodhalfblock,125,0
+dwoodhalfblock,125,0
+doublewhalfblock,125,0
+dwhalfblock,125,0
 oakwoodenplankdoublehalfblock,125,0
 oakwoodenplankdhalfblock,125,0
 oakwoodplankdoublehalfblock,125,0
@@ -2543,36 +2496,6 @@ oakdoublewslab,125,0
 oakdwslab,125,0
 oakdoubleslab,125,0
 oakdslab,125,0
-sprucewoodenplankdoublehalfblock,125,1
-sprucewoodenplankdhalfblock,125,1
-sprucewoodplankdoublehalfblock,125,1
-sprucewoodplankdhalfblock,125,1
-sprucewplankdoublehalfblock,125,1
-sprucewplankdhalfblock,125,1
-spruceplankdoublehalfblock,125,1
-spruceplankdhalfblock,125,1
-sprucewoodendoublehalfblock,125,1
-sprucewoodendhalfblock,125,1
-sprucewooddoublehalfblock,125,1
-sprucewooddhalfblock,125,1
-sprucewdoublehalfblock,125,1
-sprucewdhalfblock,125,1
-sprucedoublewoodenplankhalfblock,125,1
-sprucedwoodenplankhalfblock,125,1
-sprucedoublewoodplankhalfblock,125,1
-sprucedwoodplankhalfblock,125,1
-sprucedoublewplankhalfblock,125,1
-sprucedwplankhalfblock,125,1
-sprucedoubleplankhalfblock,125,1
-sprucedplankhalfblock,125,1
-sprucedoublewoodenhalfblock,125,1
-sprucedwoodenhalfblock,125,1
-sprucedoublewoodhalfblock,125,1
-sprucedwoodhalfblock,125,1
-sprucedoublewhalfblock,125,1
-sprucedwhalfblock,125,1
-sprucedoublehalfblock,125,1
-sprucedhalfblock,125,1
 sprucewoodenplankdoublestep,125,1
 sprucewoodenplankdstep,125,1
 sprucewoodplankdoublestep,125,1
@@ -2633,36 +2556,36 @@ sprucedoublewslab,125,1
 sprucedwslab,125,1
 sprucedoubleslab,125,1
 sprucedslab,125,1
-darkwoodenplankdoublehalfblock,125,1
-darkwoodenplankdhalfblock,125,1
-darkwoodplankdoublehalfblock,125,1
-darkwoodplankdhalfblock,125,1
-darkwplankdoublehalfblock,125,1
-darkwplankdhalfblock,125,1
-darkplankdoublehalfblock,125,1
-darkplankdhalfblock,125,1
-darkwoodendoublehalfblock,125,1
-darkwoodendhalfblock,125,1
-darkwooddoublehalfblock,125,1
-darkwooddhalfblock,125,1
-darkwdoublehalfblock,125,1
-darkwdhalfblock,125,1
-darkdoublewoodenplankhalfblock,125,1
-darkdwoodenplankhalfblock,125,1
-darkdoublewoodplankhalfblock,125,1
-darkdwoodplankhalfblock,125,1
-darkdoublewplankhalfblock,125,1
-darkdwplankhalfblock,125,1
-darkdoubleplankhalfblock,125,1
-darkdplankhalfblock,125,1
-darkdoublewoodenhalfblock,125,1
-darkdwoodenhalfblock,125,1
-darkdoublewoodhalfblock,125,1
-darkdwoodhalfblock,125,1
-darkdoublewhalfblock,125,1
-darkdwhalfblock,125,1
-darkdoublehalfblock,125,1
-darkdhalfblock,125,1
+sprucewoodenplankdoublehalfblock,125,1
+sprucewoodenplankdhalfblock,125,1
+sprucewoodplankdoublehalfblock,125,1
+sprucewoodplankdhalfblock,125,1
+sprucewplankdoublehalfblock,125,1
+sprucewplankdhalfblock,125,1
+spruceplankdoublehalfblock,125,1
+spruceplankdhalfblock,125,1
+sprucewoodendoublehalfblock,125,1
+sprucewoodendhalfblock,125,1
+sprucewooddoublehalfblock,125,1
+sprucewooddhalfblock,125,1
+sprucewdoublehalfblock,125,1
+sprucewdhalfblock,125,1
+sprucedoublewoodenplankhalfblock,125,1
+sprucedwoodenplankhalfblock,125,1
+sprucedoublewoodplankhalfblock,125,1
+sprucedwoodplankhalfblock,125,1
+sprucedoublewplankhalfblock,125,1
+sprucedwplankhalfblock,125,1
+sprucedoubleplankhalfblock,125,1
+sprucedplankhalfblock,125,1
+sprucedoublewoodenhalfblock,125,1
+sprucedwoodenhalfblock,125,1
+sprucedoublewoodhalfblock,125,1
+sprucedwoodhalfblock,125,1
+sprucedoublewhalfblock,125,1
+sprucedwhalfblock,125,1
+sprucedoublehalfblock,125,1
+sprucedhalfblock,125,1
 darkwoodenplankdoublestep,125,1
 darkwoodenplankdstep,125,1
 darkwoodplankdoublestep,125,1
@@ -2723,36 +2646,36 @@ darkdoublewslab,125,1
 darkdwslab,125,1
 darkdoubleslab,125,1
 darkdslab,125,1
-birchwoodenplankdoublehalfblock,125,2
-birchwoodenplankdhalfblock,125,2
-birchwoodplankdoublehalfblock,125,2
-birchwoodplankdhalfblock,125,2
-birchwplankdoublehalfblock,125,2
-birchwplankdhalfblock,125,2
-birchplankdoublehalfblock,125,2
-birchplankdhalfblock,125,2
-birchwoodendoublehalfblock,125,2
-birchwoodendhalfblock,125,2
-birchwooddoublehalfblock,125,2
-birchwooddhalfblock,125,2
-birchwdoublehalfblock,125,2
-birchwdhalfblock,125,2
-birchdoublewoodenplankhalfblock,125,2
-birchdwoodenplankhalfblock,125,2
-birchdoublewoodplankhalfblock,125,2
-birchdwoodplankhalfblock,125,2
-birchdoublewplankhalfblock,125,2
-birchdwplankhalfblock,125,2
-birchdoubleplankhalfblock,125,2
-birchdplankhalfblock,125,2
-birchdoublewoodenhalfblock,125,2
-birchdwoodenhalfblock,125,2
-birchdoublewoodhalfblock,125,2
-birchdwoodhalfblock,125,2
-birchdoublewhalfblock,125,2
-birchdwhalfblock,125,2
-birchdoublehalfblock,125,2
-birchdhalfblock,125,2
+darkwoodenplankdoublehalfblock,125,1
+darkwoodenplankdhalfblock,125,1
+darkwoodplankdoublehalfblock,125,1
+darkwoodplankdhalfblock,125,1
+darkwplankdoublehalfblock,125,1
+darkwplankdhalfblock,125,1
+darkplankdoublehalfblock,125,1
+darkplankdhalfblock,125,1
+darkwoodendoublehalfblock,125,1
+darkwoodendhalfblock,125,1
+darkwooddoublehalfblock,125,1
+darkwooddhalfblock,125,1
+darkwdoublehalfblock,125,1
+darkwdhalfblock,125,1
+darkdoublewoodenplankhalfblock,125,1
+darkdwoodenplankhalfblock,125,1
+darkdoublewoodplankhalfblock,125,1
+darkdwoodplankhalfblock,125,1
+darkdoublewplankhalfblock,125,1
+darkdwplankhalfblock,125,1
+darkdoubleplankhalfblock,125,1
+darkdplankhalfblock,125,1
+darkdoublewoodenhalfblock,125,1
+darkdwoodenhalfblock,125,1
+darkdoublewoodhalfblock,125,1
+darkdwoodhalfblock,125,1
+darkdoublewhalfblock,125,1
+darkdwhalfblock,125,1
+darkdoublehalfblock,125,1
+darkdhalfblock,125,1
 birchwoodenplankdoublestep,125,2
 birchwoodenplankdstep,125,2
 birchwoodplankdoublestep,125,2
@@ -2813,6 +2736,36 @@ birchdoublewslab,125,2
 birchdwslab,125,2
 birchdoubleslab,125,2
 birchdslab,125,2
+birchwoodenplankdoublehalfblock,125,2
+birchwoodenplankdhalfblock,125,2
+birchwoodplankdoublehalfblock,125,2
+birchwoodplankdhalfblock,125,2
+birchwplankdoublehalfblock,125,2
+birchwplankdhalfblock,125,2
+birchplankdoublehalfblock,125,2
+birchplankdhalfblock,125,2
+birchwoodendoublehalfblock,125,2
+birchwoodendhalfblock,125,2
+birchwooddoublehalfblock,125,2
+birchwooddhalfblock,125,2
+birchwdoublehalfblock,125,2
+birchwdhalfblock,125,2
+birchdoublewoodenplankhalfblock,125,2
+birchdwoodenplankhalfblock,125,2
+birchdoublewoodplankhalfblock,125,2
+birchdwoodplankhalfblock,125,2
+birchdoublewplankhalfblock,125,2
+birchdwplankhalfblock,125,2
+birchdoubleplankhalfblock,125,2
+birchdplankhalfblock,125,2
+birchdoublewoodenhalfblock,125,2
+birchdwoodenhalfblock,125,2
+birchdoublewoodhalfblock,125,2
+birchdwoodhalfblock,125,2
+birchdoublewhalfblock,125,2
+birchdwhalfblock,125,2
+birchdoublehalfblock,125,2
+birchdhalfblock,125,2
 lightwoodenplankdoublehalfblock,125,2
 lightwoodenplankdhalfblock,125,2
 lightwoodplankdoublehalfblock,125,2
@@ -2903,36 +2856,6 @@ lightdoublewslab,125,2
 lightdwslab,125,2
 lightdoubleslab,125,2
 lightdslab,125,2
-junglewoodenplankdoublehalfblock,125,3
-junglewoodenplankdhalfblock,125,3
-junglewoodplankdoublehalfblock,125,3
-junglewoodplankdhalfblock,125,3
-junglewplankdoublehalfblock,125,3
-junglewplankdhalfblock,125,3
-jungleplankdoublehalfblock,125,3
-jungleplankdhalfblock,125,3
-junglewoodendoublehalfblock,125,3
-junglewoodendhalfblock,125,3
-junglewooddoublehalfblock,125,3
-junglewooddhalfblock,125,3
-junglewdoublehalfblock,125,3
-junglewdhalfblock,125,3
-jungledoublewoodenplankhalfblock,125,3
-jungledwoodenplankhalfblock,125,3
-jungledoublewoodplankhalfblock,125,3
-jungledwoodplankhalfblock,125,3
-jungledoublewplankhalfblock,125,3
-jungledwplankhalfblock,125,3
-jungledoubleplankhalfblock,125,3
-jungledplankhalfblock,125,3
-jungledoublewoodenhalfblock,125,3
-jungledwoodenhalfblock,125,3
-jungledoublewoodhalfblock,125,3
-jungledwoodhalfblock,125,3
-jungledoublewhalfblock,125,3
-jungledwhalfblock,125,3
-jungledoublehalfblock,125,3
-jungledhalfblock,125,3
 junglewoodenplankdoublestep,125,3
 junglewoodenplankdstep,125,3
 junglewoodplankdoublestep,125,3
@@ -2993,6 +2916,36 @@ jungledoublewslab,125,3
 jungledwslab,125,3
 jungledoubleslab,125,3
 jungledslab,125,3
+junglewoodenplankdoublehalfblock,125,3
+junglewoodenplankdhalfblock,125,3
+junglewoodplankdoublehalfblock,125,3
+junglewoodplankdhalfblock,125,3
+junglewplankdoublehalfblock,125,3
+junglewplankdhalfblock,125,3
+jungleplankdoublehalfblock,125,3
+jungleplankdhalfblock,125,3
+junglewoodendoublehalfblock,125,3
+junglewoodendhalfblock,125,3
+junglewooddoublehalfblock,125,3
+junglewooddhalfblock,125,3
+junglewdoublehalfblock,125,3
+junglewdhalfblock,125,3
+jungledoublewoodenplankhalfblock,125,3
+jungledwoodenplankhalfblock,125,3
+jungledoublewoodplankhalfblock,125,3
+jungledwoodplankhalfblock,125,3
+jungledoublewplankhalfblock,125,3
+jungledwplankhalfblock,125,3
+jungledoubleplankhalfblock,125,3
+jungledplankhalfblock,125,3
+jungledoublewoodenhalfblock,125,3
+jungledwoodenhalfblock,125,3
+jungledoublewoodhalfblock,125,3
+jungledwoodhalfblock,125,3
+jungledoublewhalfblock,125,3
+jungledwhalfblock,125,3
+jungledoublehalfblock,125,3
+jungledhalfblock,125,3
 forestwoodenplankdoublehalfblock,125,3
 forestwoodenplankdhalfblock,125,3
 forestwoodplankdoublehalfblock,125,3
@@ -3281,8 +3234,8 @@ cfruit,127,0
 cocoapod,127,0
 cocopod,127,0
 cpod,127,0
-sandstairs,128,0
 sandstonestairs,128,0
+sandstairs,128,0
 sandsstairs,128,0
 sstonestairs,128,0
 ssstairs,128,0
@@ -3439,6 +3392,7 @@ mosscobblefence,139,1
 mcobblestonefence,139,1
 mcstonefence,139,1
 mcobblefence,139,1
+flowerpot,140,0
 emptyflowerpot,140,0
 emptypot,140,0
 flowerpotblock,140,0
@@ -3527,19 +3481,20 @@ fernflowerpot,140,11
 bushflowerpot,140,11
 fernpot,140,11
 bushpot,140,11
-carrots,141,0
 plantedcarrot,141,0
 plantcarrot,141,0
+carrots,141,0
 growingcarrot,141,0
+potatoplant,142,0
 potatoes,142,0
 plantedpotato,142,0
 plantpotato,142,0
 growingpotato,142,0
+woodenbutton,143,0
 woodenplankbutton,143,0
 woodplankbutton,143,0
 wplankbutton,143,0
 plankbutton,143,0
-woodenbutton,143,0
 woodbutton,143,0
 wbutton,143,0
 headblock,144,0
@@ -3548,14 +3503,14 @@ slightlydamagedanvil,145,1
 slightdamageanvil,145,1
 damagedanvil,145,1
 verydamagedanvil,145,2
-trappedchest,146,0
 trapchest,146,0
+trappedchest,146,0
 chesttrapped,146,0
 chesttrap,146,0
+goldpressureplate,147,0
 weightedgoldpressureplate,147,0
 weightgoldpressureplate,147,0
 wgoldpressureplate,147,0
-goldpressureplate,147,0
 weightedgoldpressplate,147,0
 weightgoldpressplate,147,0
 wgoldpressplate,147,0
@@ -3584,10 +3539,10 @@ weightedgplate,147,0
 weightgplate,147,0
 wgplate,147,0
 gplate,147,0
+ironpressureplate,148,0
 weightedironpressureplate,148,0
 weightironpressureplate,148,0
 wironpressureplate,148,0
-ironpressureplate,148,0
 weightedironpressplate,148,0
 weightironpressplate,148,0
 wironpressplate,148,0
@@ -3616,21 +3571,6 @@ weightediplate,148,0
 weightiplate,148,0
 wiplate,148,0
 iplate,148,0
-redstonecomparatorblockoff,149,0
-redstonecompererblockoff,149,0
-redstonecompareblockoff,149,0
-rstonecomparatorblockoff,149,0
-rstonecompererblockoff,149,0
-rstonecompareblockoff,149,0
-redscomparatorblockoff,149,0
-redscompererblockoff,149,0
-redscompareblockoff,149,0
-rscomparatorblockoff,149,0
-rscompererblockoff,149,0
-rscompareblockoff,149,0
-comparatorblockoff,149,0
-compererblockoff,149,0
-compareblockoff,149,0
 redstonecomparatoroff,149,0
 redstonecompereroff,149,0
 redstonecompareoff,149,0
@@ -3646,21 +3586,21 @@ rscompareoff,149,0
 comparatoroff,149,0
 compereroff,149,0
 compareoff,149,0
-redstonecomparatorblockon,150,0
-redstonecompererblockon,150,0
-redstonecompareblockon,150,0
-rstonecomparatorblockon,150,0
-rstonecompererblockon,150,0
-rstonecompareblockon,150,0
-redscomparatorblockon,150,0
-redscompererblockon,150,0
-redscompareblockon,150,0
-rscomparatorblockon,150,0
-rscompererblockon,150,0
-rscompareblockon,150,0
-comparatorblockon,150,0
-compererblockon,150,0
-compareblockon,150,0
+redstonecomparatorblockoff,149,0
+redstonecompererblockoff,149,0
+redstonecompareblockoff,149,0
+rstonecomparatorblockoff,149,0
+rstonecompererblockoff,149,0
+rstonecompareblockoff,149,0
+redscomparatorblockoff,149,0
+redscompererblockoff,149,0
+redscompareblockoff,149,0
+rscomparatorblockoff,149,0
+rscompererblockoff,149,0
+rscompareblockoff,149,0
+comparatorblockoff,149,0
+compererblockoff,149,0
+compareblockoff,149,0
 redstonecomparatoron,150,0
 redstonecompereron,150,0
 redstonecompareon,150,0
@@ -3676,6 +3616,21 @@ rscompareon,150,0
 comparatoron,150,0
 compereron,150,0
 compareon,150,0
+redstonecomparatorblockon,150,0
+redstonecompererblockon,150,0
+redstonecompareblockon,150,0
+rstonecomparatorblockon,150,0
+rstonecompererblockon,150,0
+rstonecompareblockon,150,0
+redscomparatorblockon,150,0
+redscompererblockon,150,0
+redscompareblockon,150,0
+rscomparatorblockon,150,0
+rscompererblockon,150,0
+rscompareblockon,150,0
+comparatorblockon,150,0
+compererblockon,150,0
+compareblockon,150,0
 daylightsensor,151,0
 daylightsense,151,0
 lightsensor,151,0
@@ -3715,9 +3670,9 @@ itempuller,154,0
 itempull,154,0
 itemstorer,154,0
 itemstore,154,0
+quartzblock,155,0
 normalquartzblock,155,0
 nquartzblock,155,0
-quartzblock,155,0
 normalqblock,155,0
 nqblock,155,0
 qblock,155,0
@@ -3924,9 +3879,9 @@ blackstainedclay,159,15
 blaclay,159,15
 blasclay,159,15
 blastainedclay,159,15
+hay,170,0
 hayblock,170,0
 haybale,170,0
-hay,170,0
 whitecarpet,171,0
 whitefloor,171,0
 wcarpet,171,0
@@ -4116,14 +4071,15 @@ wpick,270,0
 woodenaxe,271,0
 woodaxe,271,0
 waxe,271,0
+stonesword,272,0
 smoothstonesword,272,0
 cobblestonesword,272,0
 sstonesword,272,0
 cstonesword,272,0
-stonesword,272,0
 sssword,272,0
 cssword,272,0
 ssword,272,0
+stoneshovel,273,0
 smoothstoneshovel,273,0
 smoothstonespade,273,0
 cobblestoneshovel,273,0
@@ -4132,7 +4088,6 @@ sstoneshovel,273,0
 sstonespade,273,0
 cstoneshovel,273,0
 cstonespade,273,0
-stoneshovel,273,0
 stonespade,273,0
 ssshovel,273,0
 csshovel,273,0
@@ -4140,6 +4095,7 @@ ssspade,273,0
 csspade,273,0
 sshovel,273,0
 sspade,273,0
+stonepickaxe,274,0
 smoothstonepickaxe,274,0
 cobblestonepickaxe,274,0
 smoothstonepick,274,0
@@ -4148,7 +4104,6 @@ sstonepickaxe,274,0
 sstonepick,274,0
 cstonepickaxe,274,0
 cstonepick,274,0
-stonepickaxe,274,0
 stonepick,274,0
 sspickaxe,274,0
 sspick,274,0
@@ -4156,11 +4111,11 @@ cspickaxe,274,0
 cspick,274,0
 spickaxe,274,0
 spick,274,0
+stoneaxe,275,0
 smoothstoneaxe,275,0
 cobblestoneaxe,275,0
 sstoneaxe,275,0
 cstoneaxe,275,0
-stoneaxe,275,0
 ssaxe,275,0
 csaxe,275,0
 saxe,275,0
@@ -4208,11 +4163,11 @@ sulfur,289,0
 woodenhoe,290,0
 woodhoe,290,0
 whoe,290,0
+stonehoe,291,0
 smoothstonehoe,291,0
 cobblestonehoe,291,0
 sstonehoe,291,0
 cstonehoe,291,0
-stonehoe,291,0
 sshoe,291,0
 cshoe,291,0
 shoe,291,0
@@ -4469,10 +4424,10 @@ rawpork,319,0
 rpork,319,0
 rawporkchop,319,0
 rporkchop,319,0
+cookedpork,320,0
 grilledpork,320,0
 grillpork,320,0
 gpork,320,0
-cookedpork,320,0
 cookpork,320,0
 cpork,320,0
 grilledporkchop,320,0
@@ -4569,8 +4524,8 @@ papyrus,339,0
 book,340,0
 slimeball,341,0
 slball,341,0
-storageminecart,342,0
 chestminecart,342,0
+storageminecart,342,0
 storagemcart,342,0
 chestmcart,342,0
 storagecart,342,0
@@ -4581,10 +4536,10 @@ smcart,342,0
 cmcart,342,0
 scart,342,0
 ccart,342,0
+furnaceminecart,343,0
 engineminecart,343,0
 poweredminecart,343,0
 powerminecart,343,0
-furnaceminecart,343,0
 enginemcart,343,0
 poweredmcart,343,0
 powermcart,343,0
@@ -4608,12 +4563,13 @@ fishingrod,346,0
 fishrod,346,0
 frod,346,0
 rod,346,0
+watch,347,0
 goldwatch,347,0
 goldclock,347,0
 gwatch,347,0
 gclock,347,0
-watch,347,0
 clock,347,0
+glowstonedust,348,0
 glowingstoneblockdust,348,0
 lightstoneblockdust,348,0
 glowstoneblockdust,348,0
@@ -4628,7 +4584,6 @@ blightstonedust,348,0
 bglowstonedust,348,0
 glowingstonedust,348,0
 lightstonedust,348,0
-glowstonedust,348,0
 glowingblockdust,348,0
 lightblockdust,348,0
 glowblockdust,348,0
@@ -4801,6 +4756,7 @@ brownbdye,351,3
 browncolour,351,3
 browncolor,351,3
 browndye,351,3
+lapislazuli,351,4
 bluelapislzuli,351,4
 bluelapisl,351,4
 bluelapis,351,4
@@ -4808,7 +4764,6 @@ bluel,351,4
 lapislazuliblue,351,4
 lapislblue,351,4
 lapisblue,351,4
-lapislazuli,351,4
 lapisl,351,4
 lapis,351,4
 bluelapislazulicolour,351,4
@@ -4841,36 +4796,36 @@ lapisdye,351,4
 bluecolour,351,4
 bluecolor,351,4
 bluedye,351,4
+purpledye,351,5
 purplecolour,351,5
 purplecolor,351,5
-purpledye,351,5
+cyandye,351,6
 cyancolour,351,6
 cyancolor,351,6
-cyandye,351,6
+lightgraydye,351,7
 lightgraycolour,351,7
 lightgraycolor,351,7
-lightgraydye,351,7
 lgraycolour,351,7
 lgraycolor,351,7
 lgraydye,351,7
 silvercolour,351,7
 silvercolor,351,7
 silverdye,351,7
+darkgraydye,351,8
 darkgraycolour,351,8
 darkgraycolor,351,8
-darkgraydye,351,8
 dgraycolour,351,8
 dgraycolor,351,8
 dgraydye,351,8
 graycolour,351,8
 graycolor,351,8
 graydye,351,8
+pinkdye,351,9
 pinkcolour,351,9
 pinkcolor,351,9
-pinkdye,351,9
+limedye,351,10
 limecolour,351,10
 limecolor,351,10
-limedye,351,10
 dandelionyellow,351,11
 dandelionyellowcolour,351,11
 dandelionyellowcolor,351,11
@@ -4902,6 +4857,7 @@ magentadye,351,13
 orangecolour,351,14
 orangecolor,351,14
 orangedye,351,14
+bonemeal,351,15
 whitebonemeal,351,15
 whitebonemealcolour,351,15
 whitebonemealcolor,351,15
@@ -4918,7 +4874,6 @@ bonemwhite,351,15
 bonemwhitecolour,351,15
 bonemwhitecolor,351,15
 bonemwhitedye,351,15
-bonemeal,351,15
 bonemealcolour,351,15
 bonemealcolor,351,15
 bonemealdye,351,15
@@ -6449,11 +6404,10 @@ evileyeofender,381,0
 evilenderpearl,381,0
 eeye,381,0
 eofender,381,0
+glisteringmelon,382,0
 speckledmelon,382,0
 goldmelon,382,0
 sparklymelon,382,0
-glisteningmelon,382,0
-glisteringmelon,382,0
 shiningmelon,382,0
 gmelon,382,0
 smelon,382,0
@@ -6658,8 +6612,8 @@ fwpowder,402,0
 fireworkcharge,402,0
 fworkcharge,402,0
 fwcharge,402,0
-enchantmentbook,403,0
 enchantedbook,403,0
+enchantmentbook,403,0
 enchantingbook,403,0
 enchantbook,403,0
 magicalbook,403,0
@@ -6694,13 +6648,13 @@ nquartz,406,0
 dquartz,406,0
 hquartz,406,0
 quartz,406,0
+tntminecart,407,0
 dynamiteminecart,407,0
 dynamitemcart,407,0
 dynamitecart,407,0
 bombminecart,407,0
 bombmcart,407,0
 bombcart,407,0
-tntminecart,407,0
 tntmcart,407,0
 tntcart,407,0
 dminecart,407,0
@@ -6759,6 +6713,7 @@ leash,420,0
 rope,420,0
 nametag,421,0
 tag,421,0
+13disc,2256,0
 goldmusicrecord,2256,0
 goldmusicdisk,2256,0
 goldmusicdisc,2256,0
@@ -6789,7 +6744,6 @@ golddisc,2256,0
 goldcd,2256,0
 13record,2256,0
 13disk,2256,0
-13disc,2256,0
 13cd,2256,0
 gorecord,2256,0
 godisk,2256,0
@@ -6803,6 +6757,7 @@ cd1,2256,0
 1disk,2256,0
 1disc,2256,0
 1cd,2256,0
+catdisc,2257,0
 greenmusicrecord,2257,0
 greenmusicdisk,2257,0
 greenmusicdisc,2257,0
@@ -6833,7 +6788,6 @@ greendisc,2257,0
 greencd,2257,0
 catrecord,2257,0
 catdisk,2257,0
-catdisc,2257,0
 catcd,2257,0
 grrecord,2257,0
 grdisk,2257,0
@@ -6847,6 +6801,7 @@ cd2,2257,0
 2disk,2257,0
 2disc,2257,0
 2cd,2257,0
+blocksdisc,2258,0
 orangemusicrecord,2258,0
 orangemusicdisk,2258,0
 orangemusicdisc,2258,0
@@ -6877,7 +6832,6 @@ orangedisc,2258,0
 orangecd,2258,0
 blocksrecord,2258,0
 blocksdisk,2258,0
-blocksdisc,2258,0
 blockscd,2258,0
 orrecord,2258,0
 ordisk,2258,0
@@ -6891,6 +6845,7 @@ cd3,2258,0
 3disk,2258,0
 3disc,2258,0
 3cd,2258,0
+chirpdisc,2259,0
 redmusicrecord,2259,0
 redmusicdisk,2259,0
 redmusicdisc,2259,0
@@ -6921,7 +6876,6 @@ reddisc,2259,0
 redcd,2259,0
 chirprecord,2259,0
 chirpdisk,2259,0
-chirpdisc,2259,0
 chirpcd,2259,0
 rerecord,2259,0
 redisk,2259,0
@@ -6935,6 +6889,7 @@ cd4,2259,0
 4disk,2259,0
 4disc,2259,0
 4cd,2259,0
+fardisc,2260,0
 lightgreenmusicrecord,2260,0
 lightgreenmusicdisk,2260,0
 lightgreenmusicdisc,2260,0
@@ -6989,7 +6944,6 @@ lightgrdisc,2260,0
 lightgrcd,2260,0
 farrecord,2260,0
 fardisk,2260,0
-fardisc,2260,0
 farcd,2260,0
 lgrrecord,2260,0
 lgrdisk,2260,0
@@ -7003,6 +6957,7 @@ cd5,2260,0
 5disk,2260,0
 5disc,2260,0
 5cd,2260,0
+malldisc,2261,0
 purplemusicrecord,2261,0
 purplemusicdisk,2261,0
 purplemusicdisc,2261,0
@@ -7033,7 +6988,6 @@ purpledisc,2261,0
 purplecd,2261,0
 mallrecord,2261,0
 malldisk,2261,0
-malldisc,2261,0
 mallcd,2261,0
 purecord,2261,0
 pudisk,2261,0
@@ -7047,6 +7001,7 @@ cd6,2261,0
 6disk,2261,0
 6disc,2261,0
 6cd,2261,0
+mellohidisc,2262,0
 pinkmusicrecord,2262,0
 pinkmusicdisk,2262,0
 pinkmusicdisc,2262,0
@@ -7077,7 +7032,6 @@ pinkdisc,2262,0
 pinkcd,2262,0
 mellohirecord,2262,0
 mellohidisk,2262,0
-mellohidisc,2262,0
 mellohicd,2262,0
 pirecord,2262,0
 pidisk,2262,0
@@ -7091,6 +7045,7 @@ cd7,2262,0
 7disk,2262,0
 7disc,2262,0
 7cd,2262,0
+staldisc,2263,0
 blackmusicrecord,2263,0
 blackmusicdisk,2263,0
 blackmusicdisc,2263,0
@@ -7121,7 +7076,6 @@ blackdisc,2263,0
 blackcd,2263,0
 stalrecord,2263,0
 staldisk,2263,0
-staldisc,2263,0
 stalcd,2263,0
 blrecord,2263,0
 bldisk,2263,0
@@ -7135,6 +7089,7 @@ cd8,2263,0
 8disk,2263,0
 8disc,2263,0
 8cd,2263,0
+straddisc,2264,0
 whitemusicrecord,2264,0
 whitemusicdisk,2264,0
 whitemusicdisc,2264,0
@@ -7165,7 +7120,6 @@ whitedisc,2264,0
 whitecd,2264,0
 stradrecord,2264,0
 straddisk,2264,0
-straddisc,2264,0
 stradcd,2264,0
 whrecord,2264,0
 whdisk,2264,0
@@ -7179,6 +7133,7 @@ cd9,2264,0
 9disk,2264,0
 9disc,2264,0
 9cd,2264,0
+warddisc,2265,0
 darkgreenmusicrecord,2265,0
 darkgreenmusicdisk,2265,0
 darkgreenmusicdisc,2265,0
@@ -7233,7 +7188,6 @@ darkgrdisc,2265,0
 darkgrcd,2265,0
 wardrecord,2265,0
 warddisk,2265,0
-warddisc,2265,0
 wardcd,2265,0
 dgrrecord,2265,0
 dgrdisk,2265,0
@@ -7247,6 +7201,7 @@ cd10,2265,0
 10disk,2265,0
 10disc,2265,0
 10cd,2265,0
+11disc,2266,0
 crackedmusicrecord,2266,0
 crackedmusicdisk,2266,0
 crackedmusicdisc,2266,0
@@ -7297,8 +7252,8 @@ disc11,2266,0
 cd11,2266,0
 11record,2266,0
 11disk,2266,0
-11disc,2266,0
 11cd,2266,0
+waitdisc,2267,0
 waitmusicrecord,2267,0
 waitmusicdisk,2267,0
 waitmusicdisc,2267,0
@@ -7333,7 +7288,6 @@ cyanmdisc,2267,0
 cyanmcd,2267,0
 waitrecord,2267,0
 waitdisk,2267,0
-waitdisc,2267,0
 waitcd,2267,0
 bluerecord,2267,0
 bluedisk,2267,0