2 files changed, 202 insertions, 2 deletions

diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
index 94082cd94..d5a2f53bf 100644
--- a/Server/Plugins/APIDump/APIDesc.lua
+++ b/Server/Plugins/APIDump/APIDesc.lua
@@ -14801,6 +14801,10 @@ end
 				{
 					Notes = "The blocktype for birch wood stairs"
 				},
+				E_BLOCK_BLACK_SHULKER_BOX =
+				{
+					Notes = "The blocktype for black shulker box"
+				},
 				E_BLOCK_BLOCK_OF_COAL =
 				{
 					Notes = "The blocktype for block of coal"
@@ -14809,6 +14813,10 @@ end
 				{
 					Notes = "The blocktype for block of redstone"
 				},
+				E_BLOCK_BLUE_SHULKER_BOX =
+				{
+					Notes = "The blocktype for blue shulker box"
+				},
 				E_BLOCK_BONE_BLOCK =
 				{
 					Notes = "The blocktype for bone block"
@@ -14833,6 +14841,10 @@ end
 				{
 					Notes = "The blocktype for brown mushroom"
 				},
+				E_BLOCK_BROWN_SHULKER_BOX =
+				{
+					Notes = "The blocktype for brown shulker box"
+				},
 				E_BLOCK_BURNING_FURNACE =
 				{
 					Notes = "The blocktype for burning furnace"
@@ -14941,6 +14953,10 @@ end
 				{
 					Notes = "The blocktype for crops"
 				},
+				E_BLOCK_CYAN_SHULKER_BOX =
+				{
+					Notes = "The blocktype for cyan shulker box"
+				},
 				E_BLOCK_DANDELION =
 				{
 					Notes = "The blocktype for dandelion"
@@ -15113,6 +15129,14 @@ end
 				{
 					Notes = "The blocktype for gravel"
 				},
+				E_BLOCK_GRAY_SHULKER_BOX =
+				{
+					Notes = "The blocktype for gray shulker box"
+				},
+				E_BLOCK_GREEN_SHULKER_BOX =
+				{
+					Notes = "The blocktype for green shulker box"
+				},
 				E_BLOCK_HARDENED_CLAY =
 				{
 					Notes = "The blocktype for hardened clay"
@@ -15221,6 +15245,14 @@ end
 				{
 					Notes = "The blocktype for lever"
 				},
+				E_BLOCK_LIGHT_BLUE_SHULKER_BOX =
+				{
+					Notes = "The blocktype for light blue shulker box"
+				},
+				E_BLOCK_LIGHT_GRAY_SHULKER_BOX =
+				{
+					Notes = "The blocktype for light gray shulker box"
+				},
 				E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE =
 				{
 					Notes = "The blocktype for light weighted pressure plate"
@@ -15229,6 +15261,10 @@ end
 				{
 					Notes = "The blocktype for lily pad"
 				},
+				E_BLOCK_LIME_SHULKER_BOX =
+				{
+					Notes = "The blocktype for lime shulker box"
+				},
 				E_BLOCK_LIT_FURNACE =
 				{
 					Notes = "The blocktype for lit furnace"
@@ -15237,6 +15273,10 @@ end
 				{
 					Notes = "The blocktype for log"
 				},
+				E_BLOCK_MAGENTA_SHULKER_BOX =
+				{
+					Notes = "The blocktype for magenta shulker box"
+				},
 				E_BLOCK_MAGMA =
 				{
 					Notes = "The blocktype for magma"
@@ -15329,14 +15369,26 @@ end
 				{
 					Notes = "The blocktype for oak wood stairs"
 				},
+				E_BLOCK_OBSERVER =
+				{
+					Notes = "The blocktype for observer"
+				},
 				E_BLOCK_OBSIDIAN =
 				{
 					Notes = "The blocktype for obsidian"
 				},
+				E_BLOCK_ORANGE_SHULKER_BOX =
+				{
+					Notes = "The blocktype for orange shulker box"
+				},
 				E_BLOCK_PACKED_ICE =
 				{
 					Notes = "The blocktype for packed ice"
 				},
+				E_BLOCK_PINK_SHULKER_BOX =
+				{
+					Notes = "The blocktype for pink shulker box"
+				},
 				E_BLOCK_PISTON =
 				{
 					Notes = "The blocktype for piston"
@@ -15373,6 +15425,10 @@ end
 				{
 					Notes = "The blocktype for pumpkin stem"
 				},
+				E_BLOCK_PURPLE_SHULKER_BOX =
+				{
+					Notes = "The blocktype for purple shulker box"
+				},
 				E_BLOCK_PURPUR_BLOCK =
 				{
 					Notes = "The blocktype for purpur block"
@@ -15465,6 +15521,10 @@ end
 				{
 					Notes = "The blocktype for red sandstone stairs"
 				},
+				E_BLOCK_RED_SHULKER_BOX =
+				{
+					Notes = "The blocktype for red shulker box"
+				},
 				E_BLOCK_REEDS =
 				{
 					Notes = "The blocktype for reeds"
@@ -15665,6 +15725,10 @@ end
 				{
 					Notes = "The blocktype for water"
 				},
+				E_BLOCK_WHITE_SHULKER_BOX =
+				{
+					Notes = "The blocktype for white shulker box"
+				},
 				E_BLOCK_WOODEN_BUTTON =
 				{
 					Notes = "The blocktype for wooden button"
@@ -15697,6 +15761,10 @@ end
 				{
 					Notes = "The blocktype for yellow flower"
 				},
+				E_BLOCK_YELLOW_SHULKER_BOX =
+				{
+					Notes = "The blocktype for yellow shulker box"
+				},
 				E_ITEM_11_DISC =
 				{
 					Notes = "The itemtype for 11 disc"
@@ -15705,6 +15773,10 @@ end
 				{
 					Notes = "The itemtype for 13 disc"
 				},
+				E_ITEM_ACACIA_BOAT =
+				{
+					Notes = "The itemtype for acacia boat"
+				},
 				E_ITEM_ACACIA_DOOR =
 				{
 					Notes = "The itemtype for acacia door"
@@ -15729,6 +15801,22 @@ end
 				{
 					Notes = "The itemtype for bed"
 				},
+				E_ITEM_BEETROOT =
+				{
+					Notes = "The itemtype for beetroot"
+				},
+				E_ITEM_BEETROOT_SEEDS =
+				{
+					Notes = "The itemtype for beetroot seeds"
+				},
+				E_ITEM_BEETROOT_SOUP =
+				{
+					Notes = "The itemtype for betroot soup"
+				},
+				E_ITEM_BIRCH_BOAT =
+				{
+					Notes = "The itemtype for birch boat"
+				},
 				E_ITEM_BIRCH_DOOR =
 				{
 					Notes = "The itemtype for birch door"
@@ -15829,6 +15917,10 @@ end
 				{
 					Notes = "The itemtype for chirp disc"
 				},
+				E_ITEM_CHORUS_FRUIT =
+				{
+					Notes = "The itemtype for chorus fruit"
+				},
 				E_ITEM_CLAY =
 				{
 					Notes = "The itemtype for clay"
@@ -15877,6 +15969,10 @@ end
 				{
 					Notes = "The itemtype for cookie"
 				},
+				E_ITEM_DARK_OAK_BOAT =
+				{
+					Notes = "The itemtype for dark oak boat"
+				},
 				E_ITEM_DARK_OAK_DOOR =
 				{
 					Notes = "The itemtype for dark oak door"
@@ -15925,6 +16021,10 @@ end
 				{
 					Notes = "The itemtype for diamond sword"
 				},
+				E_ITEM_DRAGON_BREATH =
+				{
+					Notes = "The itemtype for dragon breath"
+				},
 				E_ITEM_DYE =
 				{
 					Notes = "The itemtype for dye"
@@ -15933,6 +16033,10 @@ end
 				{
 					Notes = "The itemtype for egg"
 				},
+				E_ITEM_ELYTRA =
+				{
+					Notes = "The itemtype for elytra"
+				},
 				E_ITEM_EMERALD =
 				{
 					Notes = "The itemtype for emerald"
@@ -15949,6 +16053,10 @@ end
 				{
 					Notes = "The itemtype for enchanted book"
 				},
+				E_ITEM_END_CRYSTAL =
+				{
+					Notes = "The itemtype for end crystal"
+				},
 				E_ITEM_ENDER_PEARL =
 				{
 					Notes = "The itemtype for ender pearl"
@@ -16125,6 +16233,10 @@ end
 				{
 					Notes = "The itemtype for iron leggings"
 				},
+				E_ITEM_IRON_NUGGET =
+				{
+					Notes = "The itemtype for iron nugget"
+				},
 				E_ITEM_IRON_PICKAXE =
 				{
 					Notes = "The itemtype for iron pickaxe"
@@ -16141,6 +16253,10 @@ end
 				{
 					Notes = "The itemtype for item frame"
 				},
+				E_ITEM_JUNGLE_BOAT =
+				{
+					Notes = "The itemtype for jungle boat"
+				},
 				E_ITEM_JUNGLE_DOOR =
 				{
 					Notes = "The itemtype for jungle door"
@@ -16185,6 +16301,10 @@ end
 				{
 					Notes = "The itemtype for leather tunic"
 				},
+				E_ITEM_LINGERING_POTION =
+				{
+					Notes = "The itemtype for lingering potion"
+				},
 				E_ITEM_MAGMA_CREAM =
 				{
 					Notes = "The itemtype for magma cream"
@@ -16273,6 +16393,10 @@ end
 				{
 					Notes = "The itemtype for poisonous potato"
 				},
+				E_ITEM_POPPED_CHORUS_FRUIT =
+				{
+					Notes = "The itemtype for popped chorus fruit"
+				},
 				E_ITEM_POTATO =
 				{
 					Notes = "The itemtype for potato"
@@ -16283,7 +16407,7 @@ end
 				},
 				E_ITEM_POTIONS =
 				{
-					Notes = "The itemtype for potions"
+					Notes = "The itemtype for potion (obsolete, use E_ITEM_POTION instead)"
 				},
 				E_ITEM_PRISMARINE_CRYSTALS =
 				{
@@ -16365,6 +16489,14 @@ end
 				{
 					Notes = "The itemtype for shears"
 				},
+				E_ITEM_SHIELD =
+				{
+					Notes = "The itemtype for shield"
+				},
+				E_ITEM_SHULKER_SHELL =
+				{
+					Notes = "The itemtype for shulker shell"
+				},
 				E_ITEM_SIGN =
 				{
 					Notes = "The itemtype for sign"
@@ -16381,10 +16513,22 @@ end
 				{
 					Notes = "The itemtype for spawn egg"
 				},
+				E_ITEM_SPECTRAL_ARROW =
+				{
+					Notes = "The itemtype for spectral arrow"
+				},
 				E_ITEM_SPIDER_EYE =
 				{
 					Notes = "The itemtype for spider eye"
 				},
+				E_ITEM_SPLASH_POTION =
+				{
+					Notes = "The itemtype for splash potion"
+				},
+				E_ITEM_SPRUCE_BOAT =
+				{
+					Notes = "The itemtype for spruce boat"
+				},
 				E_ITEM_SPRUCE_DOOR =
 				{
 					Notes = "The itemtype for spruce door"
@@ -16441,6 +16585,14 @@ end
 				{
 					Notes = "The itemtype for sugar cane"
 				},
+				E_ITEM_TIPPED_ARROW =
+				{
+					Notes = "The itemtype for tipped arrow"
+				},
+				E_ITEM_TOTEM_OF_UNDYING =
+				{
+					Notes = "The itemtype for totem of undying"
+				},
 				E_ITEM_WAIT_DISC =
 				{
 					Notes = "The itemtype for wait disc"
@@ -16605,6 +16757,30 @@ end
 				{
 					Notes = "A flag in the metadata of droppers and dispensers that indicates that the dropper or dispenser is looking in the positive Z direction.",
 				},
+				E_META_HEAD_CREEPER =
+				{
+					Notes = "A flag in the metadata of heads that indicates that the head is a creeper head.",
+				},
+				E_META_HEAD_DRAGON =
+				{
+					Notes = "A flag in the metadata of heads that indicates that the head is a dragon head.",
+				},
+				E_META_HEAD_PLAYER =
+				{
+					Notes = "A flag in the metadata of heads that indicates that the head is a player head.",
+				},
+				E_META_HEAD_SKELETON =
+				{
+					Notes = "A flag in the metadata of heads that indicates that the head is a skeleton head.",
+				},
+				E_META_HEAD_WITHER =
+				{
+					Notes = "A flag in the metadata of heads that indicates that the head is a wither head.",
+				},
+				E_META_HEAD_ZOMBIE =
+				{
+					Notes = "A flag in the metadata of heads that indicates that the head is a zombie head.",
+},
 				esBed =
 				{
 					Notes = "A bed explosion. The SourceData param is the {{Vector3i|position}} of the bed.",
@@ -16717,6 +16893,30 @@ end
 				{
 					Notes = "The right hand is the main hand",
 				},
+				SKULL_TYPE_CREEPER =
+				{
+					Notes = "A creeper skull",
+				},
+				SKULL_TYPE_DRAGON =
+				{
+					Notes = "A dragon skull",
+				},
+				SKULL_TYPE_PLAYER =
+				{
+					Notes = "A player skull",
+				},
+				SKULL_TYPE_SKELETON =
+				{
+					Notes = "A skeleton skull",
+				},
+				SKULL_TYPE_WITHER =
+				{
+					Notes = "A wither skull",
+				},
+				SKULL_TYPE_ZOMBIE =
+				{
+					Notes = "A zombie skull",
+				},
 				spCape =
 				{
 					Notes = "The cape skin part",
diff --git a/Server/furnace.txt b/Server/furnace.txt
index a98b6b681..a087722cb 100644
--- a/Server/furnace.txt
+++ b/Server/furnace.txt
@@ -65,7 +65,7 @@ GoldChestplate      = GoldNugget
 GoldHorseArmor      = GoldNugget
 GoldHelmet          = GoldNugget
 GoldHoe             = GoldNugget
-GoldenLeggings      = GoldNugget
+GoldPants           = GoldNugget
 GoldPickaxe         = GoldNugget
 GoldShovel          = GoldNugget
 GoldSword           = GoldNugget