2 files changed, 328 insertions, 197 deletions

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index d29344b64..6c0c79e0a 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -40,8 +40,8 @@
 
 # Need to list each of the four log types, otherwise all logs would get converted into apple planks (^0)
 
-ApplePlanks, 4   = AppleLog, * 
-ConiferPlanks, 4 = ConiferLog, *
+OakPlanks, 4     = OakLog, * 
+SprucePlanks, 4  = SpruceLog, *
 BirchPlanks, 4   = BirchLog, *
 JunglePlanks, 4  = JungleLog, *
 AcaciaPlanks, 4  = AcaciaLog, *
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 6eb9eee6e..67a3020ae 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -15,42 +15,28 @@ podzol=3:2
 cobblestone=4
 cobble=4
 planks=5
-appleplanks=5:0
 oakplanks=5:0
-coniferplanks=5:1
-pineplanks=5:1
 spruceplanks=5:1
-darkplanks=5:1
 birchplanks=5:2
-lightplanks=5:2
 jungleplanks=5:3
-redplanks=5:3
 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
-conifersapling=6:1
-pinesapling=6:1
 sprucesapling=6:1
 birchsapling=6:2
 junglesapling=6:3
-adminium=7
+acaciasapling=6:4
+darkoaksapling=6:5
 bedrock=7
 water=8
-stillwater=9
-swater=9
 stationarywater=9
 lava=10
-stilllava=11
-slava=11
 stationarylava=11
 sand=12
 redsand=12:1
@@ -58,22 +44,13 @@ gravel=13
 goldore=14
 ironore=15
 coalore=16
-tree=17
 log=17
-applelog=17:0
 oaklog=17:0
-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
-coniferleaves=18:1
-pineleaves=18:1
 spruceleaves=18:1
 birchleaves=18:2
 jungleleaves=18:3
@@ -85,8 +62,7 @@ lapisblock=22
 dispenser=23
 sandstone=24
 normalsandstone=24:0
-ornamentsandstone=24:1
-decorativesandstone=24:1
+chiseledsandstone=24:1
 smoothsandstone=24:2
 noteblock=25
 bedblock=26
@@ -100,8 +76,6 @@ tallgrasstwo=31:2
 deadbush=32
 piston=33
 pistonextension=34
-pistonhead=34
-cloth=35
 wool=35
 whitewool=35:0
 orangewool=35:1
@@ -109,39 +83,21 @@ magentawool=35:2
 lightbluewool=35:3
 yellowwool=35:4
 limewool=35:5
-lightgreenwool=35:5
-ltgreenwool=35:5
 pinkwool=35:6
 graywool=35:7
-greywool=35:7
-darkgraywool=35:7
-darkgreywool=35:7
-dkgraywool=35:7
-dkgreywool=35:7
 lightgraywool=35:8
-lightgreywool=35:8
-ltgraywool=35:8
-ltgreywool=35:8
 cyanwool=35:9
 purplewool=35:10
-violetwool=35:10
 bluewool=35:11
-darkbluewool=35:11
 brownwool=35:12
 greenwool=35:13
-darkgreenwool=35:13
-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.
-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,9 +105,7 @@ pinktulip=38:7
 oxeyedaisy=38:8
 brownmushroom=39
 redmushroom=40
-gold=41
 goldblock=41
-iron=42
 ironblock=42
 doubleslab=43
 stonedoubleslab=43:0
@@ -163,7 +117,6 @@ stonebrickdoubleslab=43:5
 netherbrickdoubleslab=43:6
 quartzdoubleslab=43:7
 slab=44
-step=44
 stoneslab=44:0
 sandstoneslab=44:1
 woodslab=44:2
@@ -173,44 +126,31 @@ stonebrickslab=44:5
 netherbrickslab=44:6
 quartzslab=44:7
 brickblock=45
-brickwall=45
 tnt=46
 bookshelf=47
-bookcase=47
 mossycobblestone=48
-mossy=48
 obsidian=49
 torch=50
 fire=51
 mobspawner=52
-woodstairs=53
 oakwoodstairs=53
 chest=54
-redstonedust=55
 redstonewire=55
 diamondore=56
 diamondblock=57
 workbench=58
 crop=59
 crops=59
-soil=60
 farmland=60
-tilleddirt=60
 furnace=61
 litfurnace=62
 signblock=63
 wooddoorblock=64
 ladder=65
 rails=66
-rail=66
-track=66
-tracks=66
 cobblestonestairs=67
-stairs=67
-signblocktop=68
 wallsign=68
 lever=69
-rockplate=70
 stoneplate=70
 irondoorblock=71
 woodplate=72
@@ -228,16 +168,11 @@ reedblock=83
 jukebox=84
 fence=85
 pumpkin=86
-netherstone=87
 netherrack=87
-hellrock=87
-slowsand=88
 soulsand=88
-lightstone=89
 glowstone=89
 portal=90
 jackolantern=91
-jacko=91
 cakeblock=92
 whitestainedglass=95
 orangestainedglass=95:1
@@ -249,7 +184,7 @@ pinkstainedglass=95:6
 graystainedglass=95:7
 lightgraystainedglass=95:8
 cyanstainedglass=95:9
-violetstainedglass=95:10
+purplestainedglass=95:10
 bluestainedglass=95:11
 brownstainedglass=95:12
 greenstainedglass=95:13
@@ -257,7 +192,6 @@ redstainedglass=95:14
 blackstainedglass=95:15
 trapdoor=96
 silverfishblock=97
-stonebricks=98
 stonebrick=98
 mossystonebrick=98:1
 crackedstonebrick=98:2
@@ -287,36 +221,21 @@ endportalframe=120
 endstone=121
 dragonegg=122
 redstonelamp=123
-redstonelampoff=123
-redstonelampon=124
+litredstonelamp=124
 woodendoubleslab=125
-appledoublewoodslab=125:0
 oakwooddoubleslab=125:0
-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
-roofedwooddoubleslab=125:5
 woodenslab=126
-applewoodslab=126:0
 oakwoodslab=126:0
-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
 cocoabeans=127
 sandstonestairs=128
 emeraldore=129
@@ -324,12 +243,9 @@ enderchest=130
 tripwirehook=131
 tripwire=132
 emeraldblock=133
-coniferwoodstairs=134
-pinewoodstairs=134
 sprucewoodstairs=134
 darkwoodstairs=134
 birchwoodstairs=135
-whitewoodstairs=135
 junglewoodstairs=136
 commandblock=137
 beacon=138
@@ -342,8 +258,7 @@ woodenbutton=143
 skeletonhead=144
 witherhead=144:1
 zombiehead=144:2
-humanhead=144:3
-stevehead=144:3
+playerhead=144:3
 creeperhead=144:4
 anvil=145
 trappedchest=146
@@ -371,7 +286,7 @@ pinkstainedclay=159:6
 graystainedclay=159:7
 lightgraystainedclay=159:8
 cyanstainedclay=159:9
-violetstainedclay=159:10
+purplestainedclay=159:10
 bluestainedclay=159:11
 brownstainedclay=159:12
 greenstainedclay=159:13
@@ -387,24 +302,20 @@ pinkstainedglasspane=160:6
 graystainedglasspane=160:7
 lightgraystainedglasspane=160:8
 cyanstainedglasspane=160:9
-violetstainedglasspane=160:10
+purplestainedglasspane=160:10
 bluestainedglasspane=160:11
 brownstainedglasspane=160:12
 greenstainedglasspane=160:13
 redstainedglasspane=160:14
 blackstainedglasspane=160:15
-acacialeaves=161
-bigoakleaves=161:1
+newleaves=161
+acacialeaves=161:0
 darkoakleaves=161:1
-roofedoakleaves=161:1
-acacialog=162
-bigoaklog=162:1
+newlog=162
+acacialog=162:0
 darkoaklog=162:1
-roofedoaklog=162:1
 acaciawoodstairs=163
-bigoakwoodstiars=164
 darkoakwoodstairs=164
-roofedoakwoodstairs=164
 slimeblock=165
 irontrapdoor=167
 prismarine=168
@@ -413,107 +324,88 @@ darkprismarine=168:2
 sealantern=169
 haybale=170
 carpet=171
+whitecarpet=171:0
+orangecarpet=171:1
+magentacarpet=171:2
+lightbluecarpet=171:3
+yellowcarpet=171:4
+limecarpet=171:5
+pinkcarpet=171:6
+graycarpet=171:7
+lightgraycarpet=171:8
+cyancarpet=171:9
+purplecarpet=171:10
+bluecarpet=171:11
+browncarpet=171:12
+greencarpet=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
-coniferfencegate=183
-pinefencegate=183
 sprucefencegate=183
-darkfencegate=183
 birchfencegate=184
-whitefencegate=184
 junglefencegate=185
 darkoakfencegate=186
-bigoakfencegate=186
-roofedoakfencegate=186
 acaciafencegate=187
-coniferfence=188
-pinefence=188
 sprucefence=188
-darkfence=188
 birchfence=189
-whitefence=189
 junglefence=190
 darkoakfence=191
-bigoakfence=191
-roofedoakfence=191
 acaciafence=192
 ironshovel=256
-ironspade=256
 ironpickaxe=257
-ironpick=257
 ironaxe=258
 flintandsteel=259
-lighter=259
 apple=260
-redapple=260
 bow=261
 arrow=262
 coal=263
-coalblock=173
 charcoal=263:1
 diamond=264
 ironingot=265
-ironbar=265
 goldingot=266
-goldeningot=266
-goldbar=266
-goldenbar=266
 ironsword=267
 woodensword=268
-woodsword=268
 woodenshovel=269
-woodshovel=269
-woodenspade=269
-woodspade=269
 woodenpickaxe=270
-woodpickaxe=270
-woodenpick=270
-woodpick=270
 woodenaxe=271
-woodaxe=271
 stonesword=272
 stoneshovel=273
-stonespade=273
 stonepickaxe=274
-stonepick=274
 stoneaxe=275
 diamondsword=276
 diamondshovel=277
 diamondspade=277
 diamondpickaxe=278
-diamondpick=278
 diamondaxe=279
 stick=280
 bowl=281
 mushroomstew=282
-bowlwithsoup=282
-soupbowl=282
-soup=282
 goldensword=283
-goldsword=283
 goldenshovel=284
-goldshovel=284
 goldenspade=284
-goldspade=284
 goldenpickaxe=285
-goldpickaxe=285
-goldenpick=285
-goldpick=285
 goldenaxe=286
-goldaxe=286
 string=287
 feather=288
 gunpowder=289
-woodhoe=290
 woodenhoe=290
 stonehoe=291
 ironhoe=292
 diamondhoe=293
-goldhoe=294
 goldenhoe=294
 seeds=295
 wheat=296
@@ -535,26 +427,16 @@ diamondchestplate=311
 diamondpants=312
 diamondboots=313
 goldenhelmet=314
-goldhelmet=314
 goldenchestplate=315
-goldchestplate=315
 goldenpants=316
-goldpants=316
 goldenboots=317
-goldboots=317
 flint=318
-meat=319
-pork=319
-cookedmeat=320
-cookedpork=320
+porkchop=319
+cookedporkchop=320
 painting=321
-paintings=321
 goldenapple=322
-goldapple=322
 enchantedgoldenapple=322:1
-enchantedgoldapple=322:1
 sign=323
-wooddoor=324
 woodendoor=324
 bucket=325
 waterbucket=326
@@ -569,11 +451,9 @@ leather=334
 milkbucket=335
 brick=336
 clay=337
-reed=338
 sugarcane=338
 paper=339
 book=340
-slimeorb=341
 slimeball=341
 storageminecart=342
 poweredminecart=343
@@ -581,57 +461,31 @@ egg=344
 compass=345
 fishingrod=346
 watch=347
-lightstonedust=348
-lightdust=348
 glowstonedust=348
-glowdust=348
-rawfish=349
 fish=349
 cookedfish=350
 dye=351
 inksac=351:0
-blackdye=351:0
-reddye=351:1
 rosered=351:1
-greendye=351:2
 cactusgreen=351:2
 cocoabeans=351:3
-browndye=351:3
 lapislazuli=351:4
-bluedye=351:4
-darkbluedye=351:4
-dkbluedye=351:4
 purpledye=351:5
-violetdye=351:5
 cyandye=351:6
-lightgreydye=351:7
 lightgraydye=351:7
-ltgreydye=351:7
-ltgraydye=351:7
-greydye=351:8
 graydye=351:8
-darkgreydye=351:8
-darkgraydye=351:8
-dkgreydye=351:8
-dkgraydye=351:8
 pinkdye=351:9
 limedye=351:10
-lightgreendye=351:10
-ltgreendye=351:10
 dandellionyellow=351:11
-yellowdye=351:11
 lightbluedye=351:12
-ltbluedye=351:12
 magentadye=351:13
 orangedye=351:14
 bonemeal=351:15
-whitedye=351:15
 bone=352
 sugar=353
 cake=354
 bed=355
 repeater=356
-diode=356
 cookie=357
 map=358
 shears=359
@@ -675,7 +529,7 @@ goldencarrot=396
 skeletonhead=397
 witherhead=397:1
 zombiehead=397:2
-stevehead=397:3
+playerhead=397:3
 creeperhead=397:4
 carrotonastick=398
 netherstar=399
@@ -693,7 +547,6 @@ prismarinecrystals=410
 rawrabbit=411
 cookedrabbit=412
 rabbitstew=413
-rabbitsoup=413
 rabbitsfood=414
 rabbithide=415
 armorstand=416
@@ -713,7 +566,6 @@ brownbanner=415:3
 bluebanner=415:4
 purplebanner=415:5
 cyanbanner=415:6
-silverbanner=415:7
 lightgraybanner=415:7
 graybanner=415:8
 pinkbanner=415:9
@@ -723,17 +575,11 @@ lightbluebanner=415:12
 magentabanner=415:13
 orangebanner=415:14
 whitebanner=415:15
-coniferdoor=427
-pinedoor=427
 sprucedoor=427
-darkdoor=427
 birchdoor=428
-whitedoor=428
 jungledoor=429
 acaciadoor=430
-bigoakdoor=431
 darkoakdoor=431
-roofedoakdoor=431
 goldrecord=2256
 greenrecord=2257
 blocksrecord=2258
@@ -746,6 +592,291 @@ stradrecord=2264
 wardrecord=2265
 11record=2266
 
+; ----------
+; Custom Names
+
+appleplanks=5:0
+coniferplanks=5:1
+pineplanks=5:1
+darkplanks=5:1
+lightplanks=5:2
+redplanks=5:3
+bigoakplanks=5:5
+roofedoakplanks=5:5
+applesapling=6:0
+conifersapling=6:1
+pinesapling=6:1
+whitesapling=6:2
+redsapling=6:3
+bigoaksapling=6:5
+roofedoaksapling=6:5
+adminium=7
+flowingwater=8
+swater=9
+stillwater=9
+stilllava=11
+slava=11
+tree=17
+applelog=17:0
+coniferlog=17:1
+pinelog=17:1
+darklog=17:1
+whitelog=17:2
+appleleaves=18:0
+coniferleaves=18:1
+pineleaves=18:1
+whiteleaves=18:2
+decorativesandstone=24:1
+ornamentsandstone=24:1
+pistonhead=34
+cloth=35
+ltbluewool=35:3
+lightgreenwool=35:5
+ltgreenwool=35:5
+greywool=35:7
+darkgraywool=35:7
+darkgreywool=35:7
+dkgraywool=35:7
+dkgreywool=35:7
+lightgreywool=35:8
+ltgraywool=35:8
+ltgreywool=35:8
+silverwool=35:8
+violetwool=35:10
+darkbluewool=35:11
+dkbluewool=35:11
+darkgreenwool=35:13
+dkgreenwool=35:13
+rose=38
+flower=38
+gold=41
+iron=42
+step=44
+brickwall=45
+bookcase=47
+mossy=48
+woodstairs=53
+redstonedust=55
+tilleddirt=60
+soil=60
+rail=66
+track=66
+tracks=66
+stairs=67
+signblocktop=68
+rockplate=70
+hellrock=87
+netherstone=87
+slowsand=88
+lightstone=89
+jacko=91
+ltbluestainedglass=95:3
+lightgreenstainedglass=95:5
+ltgreenstainedglass=95:5
+greystainedglass=95:7
+darkgraystainedglass=95:7
+darkgreystainedglass=95:7
+dkgraystainedglass=95:7
+dkgreystainedglass=95:7
+lightgreystainedglass=95:8
+ltgraystainedglass=95:8
+ltgreystainedglass=95:8
+silverstainedglass=95:8
+violetstainedglass=95:10
+darkbluestainedglass=95:11
+dkbluestainedglass=95:11
+darkgreenstainedglass=95:13
+dkgreenstainedglass=95:13
+stonebricks=98
+redstonelampoff=123
+redstonelampon=124
+appledoublewoodslab=125:0
+coniferwooddoubleslab=125:1
+pinewooddoubleslab=125:1
+darkwooddoubleslab=125:1
+whitewooddoubleslab=125:2
+bigoakwooddoubleslab=125:5
+roofedwooddoubleslab=125:5
+applewoodslab=126:0
+coniferwoodslab=126:1
+pinewoodslab=126:1
+darkwoodslab=126:1
+whitewoodslab=126:2
+roofedwoodslab=126:5
+bigoakwoodslab=126:5
+coniferwoodstairs=134
+pinewoodstairs=134
+whitewoodstairs=135
+humanhead=144:3
+stevehead=144:3
+ltbluestainedclay=159:3
+lightgreenstainedclay=159:5
+ltgreenstainedclay=159:5
+greystainedclay=159:7
+darkgraystainedclay=159:7
+darkgreystainedclay=159:7
+dkgraystainedclay=159:7
+dkgreystainedclay=159:7
+lightgreystainedclay=159:8
+ltgraystainedclay=159:8
+ltgreystainedclay=159:8
+silvertsainedclay=159:8
+violetstainedclay=159:10
+darkbluestainedclay=159:11
+dkbluestainedclay=159:11
+darkgreenstainedclay=159:13
+dkgreenstainedclay=159:13
+ltbluestainedglasspane=160:3
+lightgreenstainedglasspane=160:5
+ltgreenstainedglasspane=160:5
+greystainedglasspane=160:7
+darkgraystainedglasspane=160:7
+darkgreystainedglasspane=160:7
+dkgraystainedglasspane=160:7
+dkgreystainedglasspane=160:7
+lightgreystainedglasspane=160:8
+ltgraystainedglasspane=160:8
+ltgreystainedglasspane=160:8
+silverstainedglasspane=160:8
+violetstainedglasspane=160:10
+darkbluestainedglasspane=160:11
+dkbluestainedglasspane=160:11
+darkgreenstainedglasspane=160:13
+dkgreenstainedglasspane=160:13
+bigoakleaves=161:1
+roofedoakleaves=161:1
+bigoaklog=162:1
+roofedoaklog=162:1
+bigoakwoodstiars=164
+roofedoakwoodstairs=164
+ltbluecarpet=171:3
+lightgreencarpet=171:5
+ltgreencarpet=171:5
+greycarpet=171:7
+darkgraycarpet=171:7
+darkgreycarpet=171:7
+dkgraycarpet=171:7
+dkgreycarpet=171:7
+lightgreycarpet=171:8
+ltgraycarpet=171:8
+ltgreycarpet=171:8
+silvercarpet=171:8
+violetcarpet=171:10
+darkbluecarpet=171:11
+dkbluecarpet=171:11
+darkgreencarpet=171:13
+dkgreencarpet=171:13
+coniferfencegate=183
+pinefencegate=183
+darkfencegate=183
+whitefencegate=184
+bigoakfencegate=186
+roofedoakfencegate=186
+coniferfence=188
+pinefence=188
+darkfence=188
+whitefence=189
+bigoakfence=191
+roofedoakfence=191
+ironspade=256
+ironpick=257
+lighter=259
+redapple=260
+ironbar=265
+goldeningot=266
+goldbar=266
+goldenbar=266
+woodsword=268
+woodspade=269
+woodshovel=269
+woodenspade=269
+woodpickaxe=270
+woodenpick=270
+woodpick=270
+woodaxe=271
+stonespade=273
+stonepick=274
+diamondpick=278
+bowlwithsoup=282
+soupbowl=282
+soup=282
+goldsword=283
+goldshovel=284
+goldspade=284
+goldpickaxe=285
+goldenpick=285
+goldpick=285
+goldaxe=286
+woodhoe=290
+goldhoe=294
+goldhelmet=314
+goldchestplate=315
+goldpants=316
+goldboots=317
+meat=319
+pork=319
+cookedmeat=320
+cookedpork=320
+paintings=321
+goldapple=322
+enchantedgoldapple=322:1
+wooddoor=324
+reed=338
+slimeorb=341
+lightstonedust=348
+lightdust=348
+glowdust=348
+rawfish=349
+blackdye=351:0
+reddye=351:1
+greendye=351:2
+darkgreendye=351:2
+dkgreendye=351:2
+browndye=351:3
+bluedye=351:4
+darkbluedye=351:4
+dkbluedye=351:4
+violetdye=351:5
+ltgreydye=351:7
+ltgraydye=351:7
+lightgreydye=351:7
+silverdye=351:7
+greydye=351:8
+darkgreydye=351:8
+darkgraydye=351:8
+dkgreydye=351:8
+dkgraydye=351:8
+lightgreendye=351:10
+ltgreendye=351:10
+yellowdye=351:11
+ltbluedye=351:12
+whitedye=351:15
+diode=356
+stevehead=397:3
+rabbitsoup=413
+darkgreenbanner=415:2
+dkgreenbanner=415:2
+darkbluebanner=415:4
+dkbluebanner=415:4
+violetbanner=415:5
+lightgreybanner=415:7
+ltgraybanner=415:7
+ltgreybanner=415:7
+silverbanner=415:7
+greybanner=415:8
+darkgraybanner=415:8
+darkgreybanner=415:8
+dkgraybanner=415:8
+dkgreybanner=415:8
+lightgreenbanner=415:10
+ltgreenbanner=415:10
+ltbluebanner=415:12
+coniferdoor=427
+pinedoor=427
+darkdoor=427
+whitedoor=428
+bigoakdoor=431
+roofedoakdoor=431