1 files changed, 205 insertions, 69 deletions

diff --git a/MCServer/items.ini b/MCServer/items.ini
index 6eb9eee6e..daf366654 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -1,5 +1,6 @@
 [Items]
 air=0
+stone=1
 rock=1
 granite=1:1
 polishedgranite=1:2
@@ -7,7 +8,6 @@ diorite=1:3
 polisheddiorite=1:4
 andesite=1:5
 polishedandesite=1:6
-stone=1
 grass=2
 dirt=3
 coarseddirt=3:1
@@ -15,11 +15,11 @@ podzol=3:2
 cobblestone=4
 cobble=4
 planks=5
-appleplanks=5:0
 oakplanks=5:0
+appleplanks=5:0
+spruceplanks=5:1
 coniferplanks=5:1
 pineplanks=5:1
-spruceplanks=5:1
 darkplanks=5:1
 birchplanks=5:2
 lightplanks=5:2
@@ -29,53 +29,59 @@ acaciaplanks=5:4
 darkoakplanks=5:5
 bigoakplanks=5:5
 roofedoakplanks=5:5
-
-
-; Obsolete: do not use "wood", as its meaning is not clear - wiki uses log as wood, we use planks as wood.
-wood=5
-
 sapling=6
-applesapling=6:0
 oaksapling=6:0
+applesapling=6:0
+sprucesapling=6:1
 conifersapling=6:1
 pinesapling=6:1
-sprucesapling=6:1
+darkplanks=6:1
 birchsapling=6:2
+whitesapling=6:2
 junglesapling=6:3
-adminium=7
+redsapling=6:3
+acaciasapling=6:4
+darkoaksapling=6:5
+bigoaksapling=6:5
+roofedoaksapling=6:5
 bedrock=7
+adminium=7
 water=8
+flowingwater=8
+stationarywater=9
 stillwater=9
 swater=9
-stationarywater=9
 lava=10
+flowinglava=10
+stationarylava=11
 stilllava=11
 slava=11
-stationarylava=11
 sand=12
 redsand=12:1
 gravel=13
 goldore=14
 ironore=15
 coalore=16
-tree=17
 log=17
-applelog=17:0
+tree=17
 oaklog=17:0
+applelog=17:0
+sprucelog=17:1
 coniferlog=17:1
 pinelog=17:1
-sprucelog=17:1
 darklog=17:1
 birchlog=17:2
 whitelog=17:2
 junglelog=17:3
 leaves=18
-appleleaves=18:0
 oakleaves=18:0
+appleleaves=18:0
+spruceleaves=18:1
 coniferleaves=18:1
 pineleaves=18:1
-spruceleaves=18:1
+darkleaves=18:1
 birchleaves=18:2
+whiteleaves=18:2
 jungleleaves=18:3
 sponge=19
 wetsponge=19:1
@@ -85,8 +91,9 @@ lapisblock=22
 dispenser=23
 sandstone=24
 normalsandstone=24:0
-ornamentsandstone=24:1
+chiseledsandstone=24:1
 decorativesandstone=24:1
+ornamentsandstone=24:1
 smoothsandstone=24:2
 noteblock=25
 bedblock=26
@@ -101,14 +108,16 @@ deadbush=32
 piston=33
 pistonextension=34
 pistonhead=34
-cloth=35
 wool=35
+cloth=35
 whitewool=35:0
 orangewool=35:1
 magentawool=35:2
 lightbluewool=35:3
+ltbluewool=35:3
 yellowwool=35:4
 limewool=35:5
+ltbluewool=35:3
 lightgreenwool=35:5
 ltgreenwool=35:5
 pinkwool=35:6
@@ -122,11 +131,13 @@ lightgraywool=35:8
 lightgreywool=35:8
 ltgraywool=35:8
 ltgreywool=35:8
+silverwool=35:8
 cyanwool=35:9
 purplewool=35:10
 violetwool=35:10
 bluewool=35:11
 darkbluewool=35:11
+dkbluewool=35:11
 brownwool=35:12
 greenwool=35:13
 darkgreenwool=35:13
@@ -134,14 +145,12 @@ dkgreenwool=35:13
 redwool=35:14
 blackwool=35:15
 dandelion=37
-
-; Renamed in 1.7, use "poppy" instead; kept for compatibility reasons, will be removed later on.
+poppy=38
 rose=38
-
 flower=38
-poppy=38
 blueorchid=38:1
 allium=38:2
+azurebluet=38:3
 redtulip=38:4
 orangetulip=38:5
 whitetulip=38:6
@@ -149,11 +158,12 @@ pinktulip=38:7
 oxeyedaisy=38:8
 brownmushroom=39
 redmushroom=40
-gold=41
 goldblock=41
-iron=42
+gold=41
 ironblock=42
+iron=42
 doubleslab=43
+doublestep=43
 stonedoubleslab=43:0
 sandstonedoubleslab=43:1
 wooddoubleslab=43:2
@@ -183,19 +193,19 @@ obsidian=49
 torch=50
 fire=51
 mobspawner=52
-woodstairs=53
 oakwoodstairs=53
+woodstairs=53
 chest=54
-redstonedust=55
 redstonewire=55
+redstonedust=55
 diamondore=56
 diamondblock=57
 workbench=58
 crop=59
 crops=59
-soil=60
 farmland=60
 tilleddirt=60
+soil=60
 furnace=61
 litfurnace=62
 signblock=63
@@ -207,11 +217,11 @@ track=66
 tracks=66
 cobblestonestairs=67
 stairs=67
-signblocktop=68
 wallsign=68
+signblocktop=68
 lever=69
-rockplate=70
 stoneplate=70
+rockplate=70
 irondoorblock=71
 woodplate=72
 redstoneore=73
@@ -228,13 +238,13 @@ reedblock=83
 jukebox=84
 fence=85
 pumpkin=86
-netherstone=87
 netherrack=87
 hellrock=87
-slowsand=88
+netherstone=87
 soulsand=88
-lightstone=89
+slowsand=88
 glowstone=89
+lightstone=89
 portal=90
 jackolantern=91
 jacko=91
@@ -243,22 +253,39 @@ whitestainedglass=95
 orangestainedglass=95:1
 magentastainedglass=95:2
 lightbluestainedglass=95:3
+ltbluestainedglass=95:3
 yellowstainedglass=95:4
 limestainedglass=95:5
+lightgreenstainedglass=95:5
+ltgreenstainedglass=95:5
 pinkstainedglass=95:6
 graystainedglass=95:7
+greystainedglass=95:7
+darkgraystainedglass=95:7
+darkgreystainedglass=95:7
+dkgraystainedglass=95:7
+dkgreystainedglass=95:7
 lightgraystainedglass=95:8
+lightgreystainedglass=95:8
+ltgraystainedglass=95:8
+ltgreystainedglass=95:8
+silverstainedglass=95:8
 cyanstainedglass=95:9
+purplestainedglass=95:10
 violetstainedglass=95:10
 bluestainedglass=95:11
+darkbluestainedglass=95:11
+dkbluestainedglass=95:11
 brownstainedglass=95:12
 greenstainedglass=95:13
+darkgreenstainedglass=95:13
+dkgreenstainedglass=95:13
 redstainedglass=95:14
 blackstainedglass=95:15
 trapdoor=96
 silverfishblock=97
-stonebricks=98
 stonebrick=98
+stonebricks=98
 mossystonebrick=98:1
 crackedstonebrick=98:2
 chiseledstonebrick=98:3
@@ -288,35 +315,36 @@ endstone=121
 dragonegg=122
 redstonelamp=123
 redstonelampoff=123
+litredstonelamp=124
 redstonelampon=124
 woodendoubleslab=125
-appledoublewoodslab=125:0
 oakwooddoubleslab=125:0
+appledoublewoodslab=125:0
+sprucewooddoubleslab=125:1
 coniferwooddoubleslab=125:1
 pinewooddoubleslab=125:1
-sprucewooddoubleslab=125:1
 darkwooddoubleslab=125:1
 birchwooddoubleslab=125:2
 whitewooddoubleslab=125:2
 junglewooddoubleslab=125:3
 acaciawooddoubleslab=125:4
-bigoakwooddoubleslab=125:5
 darkoakwooddoubleslab=125:5
+bigoakwooddoubleslab=125:5
 roofedwooddoubleslab=125:5
 woodenslab=126
-applewoodslab=126:0
 oakwoodslab=126:0
+applewoodslab=126:0
+sprucewoodslab=126:1
 coniferwoodslab=126:1
 pinewoodslab=126:1
-sprucewoodslab=126:1
 darkwoodslab=126:1
 birchwoodslab=126:2
 whitewoodslab=126:2
 junglewoodslab=126:3
 acaciawoodslab=126:4
-bigoakwoodslab=126:5
 darkoakwoodslab=126:5
 roofedwoodslab=126:5
+bigoakwoodslab=126:5
 cocoabeans=127
 sandstonestairs=128
 emeraldore=129
@@ -324,9 +352,9 @@ enderchest=130
 tripwirehook=131
 tripwire=132
 emeraldblock=133
+sprucewoodstairs=134
 coniferwoodstairs=134
 pinewoodstairs=134
-sprucewoodstairs=134
 darkwoodstairs=134
 birchwoodstairs=135
 whitewoodstairs=135
@@ -342,6 +370,7 @@ woodenbutton=143
 skeletonhead=144
 witherhead=144:1
 zombiehead=144:2
+playerhead=144:3
 humanhead=144:3
 stevehead=144:3
 creeperhead=144:4
@@ -365,47 +394,84 @@ whitestainedclay=159
 orangestainedclay=159:1
 magentastainedclay=159:2
 lightbluestainedclay=159:3
+ltbluestainedclay=159:3
 yellowstainedclay=159:4
 limestainedclay=159:5
+lightgreenstainedclay=159:5
+ltgreenstainedclay=159:5
 pinkstainedclay=159:6
 graystainedclay=159:7
+greystainedclay=159:7
+darkgraystainedclay=159:7
+darkgreystainedclay=159:7
+dkgraystainedclay=159:7
+dkgreystainedclay=159:7
 lightgraystainedclay=159:8
+lightgreystainedclay=159:8
+ltgraystainedclay=159:8
+ltgreystainedclay=159:8
+silverstainedclay=159:8
 cyanstainedclay=159:9
+purplestainedclay=159:10
 violetstainedclay=159:10
 bluestainedclay=159:11
+darkbluestainedclay=159:11
+dkbluestainedclay=159:11
 brownstainedclay=159:12
 greenstainedclay=159:13
+darkgreenstainedclay=159:13
+dkgreenstainedclay=159:13
 redstainedclay=159:14
 blackstainedclay=159:15
 whitestainedglasspane=160
 orangestainedglasspane=160:1
 magentastainedglasspane=160:2
 lightbluestainedglasspane=160:3
+ltbluestainedglasspane=160:3
 yellowstainedglasspane=160:4
 limestainedglasspane=160:5
+lightgreenstainedglasspane=160:5
+ltgreenstainedglasspane=160:5
 pinkstainedglasspane=160:6
 graystainedglasspane=160:7
+greystainedglasspane=160:7
+darkgraystainedglasspane=160:7
+darkgreystainedglasspane=160:7
+dkgraystainedglasspane=160:7
+dkgreystainedglasspane=160:7
 lightgraystainedglasspane=160:8
+lightgreystainedglasspane=160:8
+ltgraystainedglasspane=160:8
+ltgreystainedglasspane=160:8
+silverstainedglasspane=160:8
 cyanstainedglasspane=160:9
+purplestainedglasspane=160:10
 violetstainedglasspane=160:10
 bluestainedglasspane=160:11
+darkbluestainedglasspane=160:11
+dkbluestainedglasspane=160:11
 brownstainedglasspane=160:12
 greenstainedglasspane=160:13
+darkgreenstainedglasspane=160:13
+dkgreenstainedglasspane=160:13
 redstainedglasspane=160:14
 blackstainedglasspane=160:15
-acacialeaves=161
-bigoakleaves=161:1
+newleaves=161
+acacialeaves=161:0
 darkoakleaves=161:1
+bigoakleaves=161:1
 roofedoakleaves=161:1
-acacialog=162
-bigoaklog=162:1
+newlog=162
+acacialog=162:0
 darkoaklog=162:1
+bigoaklog=162:1
 roofedoaklog=162:1
 acaciawoodstairs=163
-bigoakwoodstiars=164
 darkoakwoodstairs=164
+bigoakwoodstiars=164
 roofedoakwoodstairs=164
 slimeblock=165
+barrier=166
 irontrapdoor=167
 prismarine=168
 prismarinebricks=168:1
@@ -413,15 +479,58 @@ darkprismarine=168:2
 sealantern=169
 haybale=170
 carpet=171
+whitecarpet=171:0
+orangecarpet=171:1
+magentacarpet=171:2
+lightbluecarpet=171:3
+ltbluecarpet=171:3
+yellowcarpet=171:4
+limecarpet=171:5
+lightgreencarpet=171:5
+ltgreencarpet=171:5
+pinkcarpet=171:6
+graycarpet=171:7
+greycarpet=171:7
+darkgraycarpet=171:7
+darkgreycarpet=171:7
+dkgraycarpet=171:7
+dkgreycarpet=171:7
+lightgraycarpet=171:8
+lightgreycarpet=171:8
+ltgraycarpet=171:8
+ltgreycarpet=171:8
+silvercarpet=171:8
+cyancarpet=171:9
+purplecarpet=171:10
+violetcarpet=171:10
+bluecarpet=171:11
+darkbluecarpet=171:11
+dkbluecarpet=171:11
+browncarpet=171:12
+greencarpet=171:13
+darkgreencarpet=171:13
+dkgreencarpet=171:13
+redcarpet=171:14
+blackcarpet=171:15
 hardenedclay=172
+coalblock=173
+packedice=174
+doubleplant=175
+sunflower=175:0
+lilac=175:1
+doubletallgrass=175:2
+doubletallfern=175:3
+rosebush=175:4
+peony=175:5
 redsandstone=179
 chiseledredsandstone=179:1
 smoothredsandstone=179:2
 redsandstonestairs=180
-redsandstoneslab=182
+newstoneslab=182
+redsandstoneslab=182:0
+sprucefencegate=183
 coniferfencegate=183
 pinefencegate=183
-sprucefencegate=183
 darkfencegate=183
 birchfencegate=184
 whitefencegate=184
@@ -430,9 +539,9 @@ darkoakfencegate=186
 bigoakfencegate=186
 roofedoakfencegate=186
 acaciafencegate=187
+sprucefence=188
 coniferfence=188
 pinefence=188
-sprucefence=188
 darkfence=188
 birchfence=189
 whitefence=189
@@ -453,7 +562,6 @@ redapple=260
 bow=261
 arrow=262
 coal=263
-coalblock=173
 charcoal=263:1
 diamond=264
 ironingot=265
@@ -466,9 +574,9 @@ ironsword=267
 woodensword=268
 woodsword=268
 woodenshovel=269
+woodspade=269
 woodshovel=269
 woodenspade=269
-woodspade=269
 woodenpickaxe=270
 woodpickaxe=270
 woodenpick=270
@@ -496,8 +604,8 @@ soup=282
 goldensword=283
 goldsword=283
 goldenshovel=284
-goldshovel=284
 goldenspade=284
+goldshovel=284
 goldspade=284
 goldenpickaxe=285
 goldpickaxe=285
@@ -508,13 +616,13 @@ goldaxe=286
 string=287
 feather=288
 gunpowder=289
-woodhoe=290
 woodenhoe=290
+woodhoe=290
 stonehoe=291
 ironhoe=292
 diamondhoe=293
-goldhoe=294
 goldenhoe=294
+goldhoe=294
 seeds=295
 wheat=296
 bread=297
@@ -543,19 +651,24 @@ goldpants=316
 goldenboots=317
 goldboots=317
 flint=318
+porkchop=319
 meat=319
 pork=319
+cookedporkchop=320
 cookedmeat=320
 cookedpork=320
 painting=321
 paintings=321
 goldenapple=322
 goldapple=322
+notchapple=322:1
 enchantedgoldenapple=322:1
 enchantedgoldapple=322:1
 sign=323
-wooddoor=324
+oakdoor=324
+appledoor=324
 woodendoor=324
+wooddoor=324
 bucket=325
 waterbucket=326
 lavabucket=327
@@ -569,32 +682,38 @@ leather=334
 milkbucket=335
 brick=336
 clay=337
-reed=338
 sugarcane=338
+reed=338
 paper=339
 book=340
-slimeorb=341
 slimeball=341
+slimeorb=341
 storageminecart=342
 poweredminecart=343
 egg=344
 compass=345
 fishingrod=346
 watch=347
+glowstonedust=348
 lightstonedust=348
 lightdust=348
-glowstonedust=348
 glowdust=348
-rawfish=349
 fish=349
+rawfish=349
+rawsalmon=349:1
+clownfish=349:2
+pufferfish=349:3
 cookedfish=350
+cookedsalmon=350:1
 dye=351
 inksac=351:0
 blackdye=351:0
-reddye=351:1
 rosered=351:1
-greendye=351:2
+reddye=351:1
 cactusgreen=351:2
+greendye=351:2
+darkgreendye=351:2
+dkgreendye=351:2
 cocoabeans=351:3
 browndye=351:3
 lapislazuli=351:4
@@ -604,12 +723,13 @@ dkbluedye=351:4
 purpledye=351:5
 violetdye=351:5
 cyandye=351:6
-lightgreydye=351:7
 lightgraydye=351:7
-ltgreydye=351:7
+lightgreydye=351:7
 ltgraydye=351:7
-greydye=351:8
+ltgreydye=351:7
+silverdye=351:7
 graydye=351:8
+greydye=351:8
 darkgreydye=351:8
 darkgraydye=351:8
 dkgreydye=351:8
@@ -675,6 +795,7 @@ goldencarrot=396
 skeletonhead=397
 witherhead=397:1
 zombiehead=397:2
+playerhead=397:3
 stevehead=397:3
 creeperhead=397:4
 carrotonastick=398
@@ -709,30 +830,46 @@ banner=425
 blackbanner=415:0
 redbanner=415:1
 greenbanner=415:2
+darkgreenbanner=415:2
+dkgreenbanner=415:2
 brownbanner=415:3
 bluebanner=415:4
+darkbluebanner=415:4
+dkbluebanner=415:4
 purplebanner=415:5
+violetbanner=415:5
 cyanbanner=415:6
-silverbanner=415:7
 lightgraybanner=415:7
+lightgreybanner=415:7
+ltgraybanner=415:7
+ltgreybanner=415:7
+silverbanner=415:7
 graybanner=415:8
+greybanner=415:8
+darkgraybanner=415:8
+darkgreybanner=415:8
+dkgraybanner=415:8
+dkgreybanner=415:8
 pinkbanner=415:9
 limebanner=415:10
+lightgreenbanner=415:10
+ltgreenbanner=415:10
 yellowbanner=415:11
 lightbluebanner=415:12
+ltbluebanner=415:12
 magentabanner=415:13
 orangebanner=415:14
 whitebanner=415:15
+sprucedoor=427
 coniferdoor=427
 pinedoor=427
-sprucedoor=427
 darkdoor=427
 birchdoor=428
 whitedoor=428
 jungledoor=429
 acaciadoor=430
-bigoakdoor=431
 darkoakdoor=431
+bigoakdoor=431
 roofedoakdoor=431
 goldrecord=2256
 greenrecord=2257
@@ -748,4 +885,3 @@ wardrecord=2265
 
 
 
-