3 files changed, 353 insertions, 22 deletions

diff --git a/Server/crafting.txt b/Server/crafting.txt
index 049c571e5..d789013fb 100644
--- a/Server/crafting.txt
+++ b/Server/crafting.txt
@@ -323,6 +323,7 @@ Piston           = Planks^-1, 1:1, 2:1, 3:1 | RedstoneDust, 2:3 | Cobblestone, 1
 RedstoneLamp     = RedstoneDust, 2:1, 1:2, 3:2, 2:3 | Glowstone, 2:2
 RedstoneTorchOn  = Stick, 1:2        | RedstoneDust, 1:1
 Repeater         = Stone,  1:2, 2:2, 3:2            | RedstoneTorchOn, 1:1, 3:1 | RedstoneDust, 2:1
+PurpleShulkerBox = ShulkerShell, 2:1, 2:3 | Chest, 2:2
 SpruceDoor, 3    = SprucePlanks,  1:1, 1:2, 1:3, 2:1, 2:2, 2:3
 StickyPiston     = Piston, * | SlimeBall, *
 StoneButton      = Stone,     1:1
@@ -371,6 +372,7 @@ Coal, 9         = CoalBlock, *
 Diamond, 9      = DiamondBlock, *
 Emerald, 9      = EmeraldBlock, *
 GoldIngot, 9    = GoldBlock, *
+IronIngot       = IronNugget, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 IronIngot, 9    = IronBlock, *
 LapisLazuli, 9  = LapisBlock, *
 RedstoneDust, 9 = RedstoneBlock, *
@@ -398,6 +400,7 @@ FlowerPot                = Brick, 1:2, 2:3, 3:2
 GlassPane, 16            = Glass, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
 GoldIngot                = GoldNugget, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 IronBars, 16             = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
+IronNugget, 9            = IronIngot, *
 ItemFrame                = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Leather, 2:2
 JungleFence, 3           = JunglePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
 JungleFenceGate          = Stick, 1:1, 1:2, 3:1, 3:2 | JunglePlanks, 2:1, 2:2
@@ -467,6 +470,266 @@ MagentaDye, 4 = BlueDye, *   | WhiteDye, * | RedDye, *, *
 
 
 #******************************************************#
+# Colored shulker boxes:
+#
+BlackShulkerBox     = BlackShulkerBox, * | BlackDye, *
+BlackShulkerBox     = BlueShulkerBox, * | BlackDye, *
+BlackShulkerBox     = BrownShulkerBox, * | BlackDye, *
+BlackShulkerBox     = CyanShulkerBox, * | BlackDye, *
+BlackShulkerBox     = GrayShulkerBox, * | BlackDye, *
+BlackShulkerBox     = GreenShulkerBox, * | BlackDye, *
+BlackShulkerBox     = LightBlueShulkerBox, * | BlackDye, *
+BlackShulkerBox     = LightGrayShulkerBox, * | BlackDye, *
+BlackShulkerBox     = LimeShulkerBox, * | BlackDye, *
+BlackShulkerBox     = MagentaShulkerBox, * | BlackDye, *
+BlackShulkerBox     = OrangeShulkerBox, * | BlackDye, *
+BlackShulkerBox     = PinkShulkerBox, * | BlackDye, *
+BlackShulkerBox     = PurpleShulkerBox, * | BlackDye, *
+BlackShulkerBox     = RedShulkerBox, * | BlackDye, *
+BlackShulkerBox     = WhiteShulkerBox, * | BlackDye, *
+BlackShulkerBox     = YellowShulkerBox, * | BlackDye, *
+BlueShulkerBox      = BlackShulkerBox, * | BlueDye, *
+BlueShulkerBox      = BlueShulkerBox, * | BlueDye, *
+BlueShulkerBox      = BrownShulkerBox, * | BlueDye, *
+BlueShulkerBox      = CyanShulkerBox, * | BlueDye, *
+BlueShulkerBox      = GrayShulkerBox, * | BlueDye, *
+BlueShulkerBox      = GreenShulkerBox, * | BlueDye, *
+BlueShulkerBox      = LightBlueShulkerBox, * | BlueDye, *
+BlueShulkerBox      = LightGrayShulkerBox, * | BlueDye, *
+BlueShulkerBox      = LimeShulkerBox, * | BlueDye, *
+BlueShulkerBox      = MagentaShulkerBox, * | BlueDye, *
+BlueShulkerBox      = OrangeShulkerBox, * | BlueDye, *
+BlueShulkerBox      = PinkShulkerBox, * | BlueDye, *
+BlueShulkerBox      = PurpleShulkerBox, * | BlueDye, *
+BlueShulkerBox      = RedShulkerBox, * | BlueDye, *
+BlueShulkerBox      = WhiteShulkerBox, * | BlueDye, *
+BlueShulkerBox      = YellowShulkerBox, * | BlueDye, *
+BrownShulkerBox     = BlackShulkerBox, * | BrownDye, *
+BrownShulkerBox     = BlueShulkerBox, * | BrownDye, *
+BrownShulkerBox     = BrownShulkerBox, * | BrownDye, *
+BrownShulkerBox     = CyanShulkerBox, * | BrownDye, *
+BrownShulkerBox     = GrayShulkerBox, * | BrownDye, *
+BrownShulkerBox     = GreenShulkerBox, * | BrownDye, *
+BrownShulkerBox     = LightBlueShulkerBox, * | BrownDye, *
+BrownShulkerBox     = LightGrayShulkerBox, * | BrownDye, *
+BrownShulkerBox     = LimeShulkerBox, * | BrownDye, *
+BrownShulkerBox     = MagentaShulkerBox, * | BrownDye, *
+BrownShulkerBox     = OrangeShulkerBox, * | BrownDye, *
+BrownShulkerBox     = PinkShulkerBox, * | BrownDye, *
+BrownShulkerBox     = PurpleShulkerBox, * | BrownDye, *
+BrownShulkerBox     = RedShulkerBox, * | BrownDye, *
+BrownShulkerBox     = WhiteShulkerBox, * | BrownDye, *
+BrownShulkerBox     = YellowShulkerBox, * | BrownDye, *
+CyanShulkerBox      = BlackShulkerBox, * | CyanDye, *
+CyanShulkerBox      = BlueShulkerBox, * | CyanDye, *
+CyanShulkerBox      = BrownShulkerBox, * | CyanDye, *
+CyanShulkerBox      = CyanShulkerBox, * | CyanDye, *
+CyanShulkerBox      = GrayShulkerBox, * | CyanDye, *
+CyanShulkerBox      = GreenShulkerBox, * | CyanDye, *
+CyanShulkerBox      = LightBlueShulkerBox, * | CyanDye, *
+CyanShulkerBox      = LightGrayShulkerBox, * | CyanDye, *
+CyanShulkerBox      = LimeShulkerBox, * | CyanDye, *
+CyanShulkerBox      = MagentaShulkerBox, * | CyanDye, *
+CyanShulkerBox      = OrangeShulkerBox, * | CyanDye, *
+CyanShulkerBox      = PinkShulkerBox, * | CyanDye, *
+CyanShulkerBox      = PurpleShulkerBox, * | CyanDye, *
+CyanShulkerBox      = RedShulkerBox, * | CyanDye, *
+CyanShulkerBox      = WhiteShulkerBox, * | CyanDye, *
+CyanShulkerBox      = YellowShulkerBox, * | CyanDye, *
+GrayShulkerBox      = BlackShulkerBox, * | GrayDye, *
+GrayShulkerBox      = BlueShulkerBox, * | GrayDye, *
+GrayShulkerBox      = BrownShulkerBox, * | GrayDye, *
+GrayShulkerBox      = CyanShulkerBox, * | GrayDye, *
+GrayShulkerBox      = GrayShulkerBox, * | GrayDye, *
+GrayShulkerBox      = GreenShulkerBox, * | GrayDye, *
+GrayShulkerBox      = LightBlueShulkerBox, * | GrayDye, *
+GrayShulkerBox      = LightGrayShulkerBox, * | GrayDye, *
+GrayShulkerBox      = LimeShulkerBox, * | GrayDye, *
+GrayShulkerBox      = MagentaShulkerBox, * | GrayDye, *
+GrayShulkerBox      = OrangeShulkerBox, * | GrayDye, *
+GrayShulkerBox      = PinkShulkerBox, * | GrayDye, *
+GrayShulkerBox      = PurpleShulkerBox, * | GrayDye, *
+GrayShulkerBox      = RedShulkerBox, * | GrayDye, *
+GrayShulkerBox      = WhiteShulkerBox, * | GrayDye, *
+GrayShulkerBox      = YellowShulkerBox, * | GrayDye, *
+GreenShulkerBox     = BlackShulkerBox, * | GreenDye, *
+GreenShulkerBox     = BlueShulkerBox, * | GreenDye, *
+GreenShulkerBox     = BrownShulkerBox, * | GreenDye, *
+GreenShulkerBox     = CyanShulkerBox, * | GreenDye, *
+GreenShulkerBox     = GrayShulkerBox, * | GreenDye, *
+GreenShulkerBox     = GreenShulkerBox, * | GreenDye, *
+GreenShulkerBox     = LightBlueShulkerBox, * | GreenDye, *
+GreenShulkerBox     = LightGrayShulkerBox, * | GreenDye, *
+GreenShulkerBox     = LimeShulkerBox, * | GreenDye, *
+GreenShulkerBox     = MagentaShulkerBox, * | GreenDye, *
+GreenShulkerBox     = OrangeShulkerBox, * | GreenDye, *
+GreenShulkerBox     = PinkShulkerBox, * | GreenDye, *
+GreenShulkerBox     = PurpleShulkerBox, * | GreenDye, *
+GreenShulkerBox     = RedShulkerBox, * | GreenDye, *
+GreenShulkerBox     = WhiteShulkerBox, * | GreenDye, *
+GreenShulkerBox     = YellowShulkerBox, * | GreenDye, *
+LightBlueShulkerBox = BlackShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = BlueShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = BrownShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = CyanShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = GrayShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = GreenShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = LightBlueShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = LightGrayShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = LimeShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = MagentaShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = OrangeShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = PinkShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = PurpleShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = RedShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = WhiteShulkerBox, * | LightBlueDye, *
+LightBlueShulkerBox = YellowShulkerBox, * | LightBlueDye, *
+LightGrayShulkerBox = BlackShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = BlueShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = BrownShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = CyanShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = GrayShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = GreenShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = LightBlueShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = LightGrayShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = LimeShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = MagentaShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = OrangeShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = PinkShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = PurpleShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = RedShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = WhiteShulkerBox, * | LightGrayDye, *
+LightGrayShulkerBox = YellowShulkerBox, * | LightGrayDye, *
+LimeShulkerBox      = BlackShulkerBox, * | LimeDye, *
+LimeShulkerBox      = BlueShulkerBox, * | LimeDye, *
+LimeShulkerBox      = BrownShulkerBox, * | LimeDye, *
+LimeShulkerBox      = CyanShulkerBox, * | LimeDye, *
+LimeShulkerBox      = GrayShulkerBox, * | LimeDye, *
+LimeShulkerBox      = GreenShulkerBox, * | LimeDye, *
+LimeShulkerBox      = LightBlueShulkerBox, * | LimeDye, *
+LimeShulkerBox      = LightGrayShulkerBox, * | LimeDye, *
+LimeShulkerBox      = LimeShulkerBox, * | LimeDye, *
+LimeShulkerBox      = MagentaShulkerBox, * | LimeDye, *
+LimeShulkerBox      = OrangeShulkerBox, * | LimeDye, *
+LimeShulkerBox      = PinkShulkerBox, * | LimeDye, *
+LimeShulkerBox      = PurpleShulkerBox, * | LimeDye, *
+LimeShulkerBox      = RedShulkerBox, * | LimeDye, *
+LimeShulkerBox      = WhiteShulkerBox, * | LimeDye, *
+LimeShulkerBox      = YellowShulkerBox, * | LimeDye, *
+MagentaShulkerBox    = BlackShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = BlueShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = BrownShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = CyanShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = GrayShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = GreenShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = LightBlueShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = LightGrayShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = LimeShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = MagentaShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = OrangeShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = PinkShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = PurpleShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = RedShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = WhiteShulkerBox, * | MagentaDye, *
+MagentaShulkerBox    = YellowShulkerBox, * | MagentaDye, *
+OrangeShulkerBox     = BlackShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = BlueShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = BrownShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = CyanShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = GrayShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = GreenShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = LightBlueShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = LightGrayShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = LimeShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = MagentaShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = OrangeShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = PinkShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = PurpleShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = RedShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = WhiteShulkerBox, * | OrangeDye, *
+OrangeShulkerBox     = YellowShulkerBox, * | OrangeDye, *
+PinkShulkerBox       = BlackShulkerBox, * | PinkDye, *
+PinkShulkerBox       = BlueShulkerBox, * | PinkDye, *
+PinkShulkerBox       = BrownShulkerBox, * | PinkDye, *
+PinkShulkerBox       = CyanShulkerBox, * | PinkDye, *
+PinkShulkerBox       = GrayShulkerBox, * | PinkDye, *
+PinkShulkerBox       = GreenShulkerBox, * | PinkDye, *
+PinkShulkerBox       = LightBlueShulkerBox, * | PinkDye, *
+PinkShulkerBox       = LightGrayShulkerBox, * | PinkDye, *
+PinkShulkerBox       = LimeShulkerBox, * | PinkDye, *
+PinkShulkerBox       = MagentaShulkerBox, * | PinkDye, *
+PinkShulkerBox       = OrangeShulkerBox, * | PinkDye, *
+PinkShulkerBox       = PinkShulkerBox, * | PinkDye, *
+PinkShulkerBox       = PurpleShulkerBox, * | PinkDye, *
+PinkShulkerBox       = RedShulkerBox, * | PinkDye, *
+PinkShulkerBox       = WhiteShulkerBox, * | PinkDye, *
+PinkShulkerBox       = YellowShulkerBox, * | PinkDye, *
+PurpleShulkerBox     = BlackShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = BlueShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = BrownShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = CyanShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = GrayShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = GreenShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = LightBlueShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = LightGrayShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = LimeShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = MagentaShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = OrangeShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = PinkShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = PurpleShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = RedShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = WhiteShulkerBox, * | PurpleDye, *
+PurpleShulkerBox     = YellowShulkerBox, * | PurpleDye, *
+RedShulkerBox        = BlackShulkerBox, * | RedDye, *
+RedShulkerBox        = BlueShulkerBox, * | RedDye, *
+RedShulkerBox        = BrownShulkerBox, * | RedDye, *
+RedShulkerBox        = CyanShulkerBox, * | RedDye, *
+RedShulkerBox        = GrayShulkerBox, * | RedDye, *
+RedShulkerBox        = GreenShulkerBox, * | RedDye, *
+RedShulkerBox        = LightBlueShulkerBox, * | RedDye, *
+RedShulkerBox        = LightGrayShulkerBox, * | RedDye, *
+RedShulkerBox        = LimeShulkerBox, * | RedDye, *
+RedShulkerBox        = MagentaShulkerBox, * | RedDye, *
+RedShulkerBox        = OrangeShulkerBox, * | RedDye, *
+RedShulkerBox        = PinkShulkerBox, * | RedDye, *
+RedShulkerBox        = PurpleShulkerBox, * | RedDye, *
+RedShulkerBox        = RedShulkerBox, * | RedDye, *
+RedShulkerBox        = WhiteShulkerBox, * | RedDye, *
+RedShulkerBox        = YellowShulkerBox, * | RedDye, *
+WhiteShulkerBox      = BlackShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = BlueShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = BrownShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = CyanShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = GrayShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = GreenShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = LightBlueShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = LightGrayShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = LimeShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = MagentaShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = OrangeShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = PinkShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = PurpleShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = RedShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = WhiteShulkerBox, * | BoneMeal, *
+WhiteShulkerBox      = YellowShulkerBox, * | BoneMeal, *
+YellowShulkerBox     = BlackShulkerBox, * | YellowDye, *
+YellowShulkerBox     = BlueShulkerBox, * | YellowDye, *
+YellowShulkerBox     = BrownShulkerBox, * | YellowDye, *
+YellowShulkerBox     = CyanShulkerBox, * | YellowDye, *
+YellowShulkerBox     = GrayShulkerBox, * | YellowDye, *
+YellowShulkerBox     = GreenShulkerBox, * | YellowDye, *
+YellowShulkerBox     = LightBlueShulkerBox, * | YellowDye, *
+YellowShulkerBox     = LightGrayShulkerBox, * | YellowDye, *
+YellowShulkerBox     = LimeShulkerBox, * | YellowDye, *
+YellowShulkerBox     = MagentaShulkerBox, * | YellowDye, *
+YellowShulkerBox     = OrangeShulkerBox, * | YellowDye, *
+YellowShulkerBox     = PinkShulkerBox, * | YellowDye, *
+YellowShulkerBox     = PurpleShulkerBox, * | YellowDye, *
+YellowShulkerBox     = RedShulkerBox, * | YellowDye, *
+YellowShulkerBox     = WhiteShulkerBox, * | YellowDye, *
+YellowShulkerBox     = YellowShulkerBox, * | YellowDye, *
+
+#******************************************************#
 # Colored wool:
 #
 BlackWool     = WhiteWool, * | BlackDye, *
diff --git a/Server/furnace.txt b/Server/furnace.txt
index 96304b666..c98fb3526 100644
--- a/Server/furnace.txt
+++ b/Server/furnace.txt
@@ -42,28 +42,57 @@
 #--------------------------
 # Smelting recipes
 
-Cactus           = GreenDye
-ChorusFruit      = PoppedChorusFruit
-Clay             = Brick
-ClayBlock        = HardenedClay
-Cobble           = Stone
-DarkOakLog       = CharCoal
-GoldOre          = GoldIngot
-IronOre          = IronIngot
-Log              = CharCoal
-NetherQuartzOre  = NetherQuartz
-Netherrack       = NetherBrick
-Pork             = CookedPork
-Potato           = BakedPotato
-RawBeef          = Steak
-RawChicken       = CookedChicken
-RawFish          = CookedFish
-RawMutton        = CookedMutton
-RawRabbit        = CookedRabbit
-RawSalmon        = CookedSalmon
-Sand             = Glass
-Stonebrick       = CrackedStonebrick
-WetSponge        = Sponge
+Cactus              = GreenDye
+ChainmailBoots      = IronNugget
+ChainmailChestplate = IronNugget
+ChainmailHelmet     = IronNugget
+ChainmailLeggings   = IronNugget
+ChorusFruit         = PoppedChorusFruit
+Clay                = Brick
+ClayBlock           = HardenedClay
+CoalOre             = Coal
+Cobble              = Stone
+CrackedStonebrick   = Stonebrick
+DarkOakLog          = CharCoal
+DiamondOre          = Diamond
+EmeraldOre          = Emerald
+GoldOre             = GoldIngot
+GoldAxe             = GoldNugget
+GoldBoots           = GoldNugget
+GoldChestplate      = GoldNugget
+GoldHorseArmor      = GoldNugget
+GoldHelmet          = GoldNugget
+GoldHoe             = GoldNugget
+GoldLeggings        = GoldNugget
+GoldPickaxe         = GoldNugget
+GoldShovel          = GoldNugget
+GoldSword           = GoldNugget
+IronOre             = IronIngot
+IronAxe             = IronNugget
+IronBoots           = IronNugget
+IronChestplate      = IronNugget
+IronHorseArmor      = IronNugget
+IronHelmet          = IronNugget
+IronHoe             = IronNugget
+IronLeggings        = IronNugget
+IronPickaxe         = IronNugget
+IronShovel          = IronNugget
+IronSword           = IronNugget
+LapisOre            = LapisLazuli
+Log                 = CharCoal
+NetherQuartzOre     = NetherQuartz
+Netherrack          = NetherBrick
+Pork                = CookedPork
+Potato              = BakedPotato
+RawBeef             = Steak
+RawChicken          = CookedChicken
+RawFish             = CookedFish
+RawMutton           = CookedMutton
+RawRabbit           = CookedRabbit
+RawSalmon           = CookedSalmon
+RedstoneOre         = Redstone
+Sand                = Glass
+WetSponge           = Sponge
 
 
 
diff --git a/Server/items.ini b/Server/items.ini
index 6e16edfa5..a871c71e0 100644
--- a/Server/items.ini
+++ b/Server/items.ini
@@ -788,6 +788,39 @@ boneblock=216
 bone_block=216
 structurevoid=217
 structure_void=217
+observer=218
+whiteshulkerbox=219
+white_shulker_box=219
+orangeshulkerbox=220
+orange_shulker_box=220
+magentashulkerbox=221
+magenta_shulker_box=221
+lightblueshulkerbox=222
+light_blue_shulker_box=222
+yellowshulkerbox=223
+yellow_shulker_box=223
+limeshulkerbox=224
+lime_shulker_box=224
+pinkshulkerbox=225
+pink_shulker_box=225
+grayshulkerbox=226
+gray_shulker_box=226
+lightgrayshulkerbox=227
+light_gray_shulker_box=227
+cyanshulkerbox=228
+cyan_shulker_box=228
+purpleshulkerbox=229
+purple_shulker_box=229
+blueshulkerbox=230
+blue_shulker_box=230
+brownshulkerbox=231
+brown_shulker_box=231
+greenshulkerbox=232
+green_shulker_box=232
+redshulkerbox=233
+red_shulker_box=233
+blackshulkerbox=234
+black_shulker_box=234
 structureblock=255
 structure_block=255
 iron_shovel=256
@@ -1296,6 +1329,12 @@ acaciaboat=447
 acacia_boat=447
 darkoakboat=448
 dark_oak_boat=448
+totemofundying=449
+totem_of_undying=449
+shulkershell=450
+shulker_shell=450
+ironnugget=452
+iron_nugget=452
 goldrecord=2256
 record_13=2256
 record13=2256