4 files changed, 319 insertions, 1 deletions

diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
index d01ac3319..c3338b442 100644
--- a/Server/Plugins/APIDump/APIDesc.lua
+++ b/Server/Plugins/APIDump/APIDesc.lua
@@ -13497,6 +13497,10 @@ end
 				{
 					Notes = "The blocktype for birch wood stairs"
 				},
+				E_BLOCK_BLACK_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for black terracotta"
+				},
 				E_BLOCK_BLACK_SHULKER_BOX =
 				{
 					Notes = "The blocktype for black shulker box"
@@ -13509,6 +13513,10 @@ end
 				{
 					Notes = "The blocktype for block of redstone"
 				},
+				E_BLOCK_BLUE_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for blue glazed terracotta"
+				},
 				E_BLOCK_BLUE_SHULKER_BOX =
 				{
 					Notes = "The blocktype for blue shulker box"
@@ -13533,6 +13541,10 @@ end
 				{
 					Notes = "The blocktype for brick stairs"
 				},
+				E_BLOCK_BROWN_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for brown glazed terracotta"
+				},
 				E_BLOCK_BROWN_MUSHROOM =
 				{
 					Notes = "The blocktype for brown mushroom"
@@ -13641,6 +13653,14 @@ end
 				{
 					Notes = "The blocktype for command block"
 				},
+				E_BLOCK_CONCRETE =
+				{
+					Notes = "The blocktype for concrete"
+				},
+				E_BLOCK_CONCRETE_POWDER =
+				{
+					Notes = "The blocktype for concrete powder"
+				},
 				E_BLOCK_CRAFTING_TABLE =
 				{
 					Notes = "The blocktype for crafting table"
@@ -13649,6 +13669,10 @@ end
 				{
 					Notes = "The blocktype for crops"
 				},
+				E_BLOCK_CYAN_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for cyan glazed terracotta"
+				},
 				E_BLOCK_CYAN_SHULKER_BOX =
 				{
 					Notes = "The blocktype for cyan shulker box"
@@ -13825,10 +13849,18 @@ end
 				{
 					Notes = "The blocktype for gravel"
 				},
+				E_BLOCK_GRAY_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for gray glazed terracotta"
+				},
 				E_BLOCK_GRAY_SHULKER_BOX =
 				{
 					Notes = "The blocktype for gray shulker box"
 				},
+				E_BLOCK_GREEN_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for green glazed terracotta"
+				},
 				E_BLOCK_GREEN_SHULKER_BOX =
 				{
 					Notes = "The blocktype for green shulker box"
@@ -13941,10 +13973,18 @@ end
 				{
 					Notes = "The blocktype for lever"
 				},
+				E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for light blue glazed terracotta"
+				},
 				E_BLOCK_LIGHT_BLUE_SHULKER_BOX =
 				{
 					Notes = "The blocktype for light blue shulker box"
 				},
+				E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for light gray glazed terracotta"
+				},
 				E_BLOCK_LIGHT_GRAY_SHULKER_BOX =
 				{
 					Notes = "The blocktype for light gray shulker box"
@@ -13957,6 +13997,10 @@ end
 				{
 					Notes = "The blocktype for lily pad"
 				},
+				E_BLOCK_LIME_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for lime glazed terracotta"
+				},
 				E_BLOCK_LIME_SHULKER_BOX =
 				{
 					Notes = "The blocktype for lime shulker box"
@@ -13969,6 +14013,10 @@ end
 				{
 					Notes = "The blocktype for log"
 				},
+				E_BLOCK_MAGENTA_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for magenta glazed terracotta"
+				},
 				E_BLOCK_MAGENTA_SHULKER_BOX =
 				{
 					Notes = "The blocktype for magenta shulker box"
@@ -14073,6 +14121,10 @@ end
 				{
 					Notes = "The blocktype for obsidian"
 				},
+				E_BLOCK_ORANGE_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for orange glazed terracota"
+				},
 				E_BLOCK_ORANGE_SHULKER_BOX =
 				{
 					Notes = "The blocktype for orange shulker box"
@@ -14081,6 +14133,10 @@ end
 				{
 					Notes = "The blocktype for packed ice"
 				},
+				E_BLOCK_PINK_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for pink glazed terracotta"
+				},
 				E_BLOCK_PINK_SHULKER_BOX =
 				{
 					Notes = "The blocktype for pink shulker box"
@@ -14121,6 +14177,10 @@ end
 				{
 					Notes = "The blocktype for pumpkin stem"
 				},
+				E_BLOCK_PURPLE_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for purple glazed terracotta"
+				},
 				E_BLOCK_PURPLE_SHULKER_BOX =
 				{
 					Notes = "The blocktype for purple shulker box"
@@ -14193,6 +14253,10 @@ end
 				{
 					Notes = "The blocktype for redstone wire"
 				},
+				E_BLOCK_RED_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for red glazed terracotta"
+				},
 				E_BLOCK_RED_MUSHROOM =
 				{
 					Notes = "The blocktype for red mushroom"
@@ -14421,6 +14485,10 @@ end
 				{
 					Notes = "The blocktype for water"
 				},
+				E_BLOCK_WHITE_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for white glazed terracotta"
+				},
 				E_BLOCK_WHITE_SHULKER_BOX =
 				{
 					Notes = "The blocktype for white shulker box"
@@ -14457,6 +14525,10 @@ end
 				{
 					Notes = "The blocktype for yellow flower"
 				},
+				E_BLOCK_YELLOW_GLAZED_TERRACOTTA =
+				{
+					Notes = "The blocktype for yellow glazed terracotta"
+				},
 				E_BLOCK_YELLOW_SHULKER_BOX =
 				{
 					Notes = "The blocktype for yellow shulker box"
@@ -15421,6 +15493,134 @@ end
 				{
 					Notes = "The player has swapped their held item with the item in their offhand slot (1.9)",
 				},
+				E_META_CONCRETE_BLACK =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is black.",
+				},
+				E_META_CONCRETE_BLUE =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is blue.",
+				},
+				E_META_CONCRETE_BROWN =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is brown.",
+				},
+				E_META_CONCRETE_CYAN =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is cyan.",
+				},
+				E_META_CONCRETE_GRAY =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is gray.",
+				},
+				E_META_CONCRETE_GREEN =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is green.",
+				},
+				E_META_CONCRETE_LIGHTBLUE =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is light blue.",
+				},
+				E_META_CONCRETE_LIGHTGRAY =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is light gray.",
+				},
+				E_META_CONCRETE_LIGHTGREEN =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is light green.",
+				},
+				E_META_CONCRETE_MAGENTA =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is magenta.",
+				},
+				E_META_CONCRETE_ORANGE =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is orange.",
+				},
+				E_META_CONCRETE_PINK =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is pink.",
+				},
+				E_META_CONCRETE_POWDER_BLACK =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is black.",
+				},
+				E_META_CONCRETE_POWDER_BLUE =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is blue.",
+				},
+				E_META_CONCRETE_POWDER_BROWN =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is brown.",
+				},
+				E_META_CONCRETE_POWDER_CYAN =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is cyan.",
+				},
+				E_META_CONCRETE_POWDER_GRAY =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is gray.",
+				},
+				E_META_CONCRETE_POWDER_GREEN =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is green.",
+				},
+				E_META_CONCRETE_POWDER_LIGHTBLUE =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is light blue.",
+				},
+				E_META_CONCRETE_POWDER_LIGHTGRAY =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is light gray.",
+				},
+				E_META_CONCRETE_POWDER_LIGHTGREEN =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is light green.",
+				},
+				E_META_CONCRETE_POWDER_MAGENTA =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is magenta.",
+				},
+				E_META_CONCRETE_POWDER_ORANGE =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is orange.",
+				},
+				E_META_CONCRETE_POWDER_PINK =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is pink.",
+				},
+				E_META_CONCRETE_POWDER_PURPLE =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is purple.",
+				},
+				E_META_CONCRETE_POWDER_RED =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is red.",
+				},
+				E_META_CONCRETE_POWDER_WHITE =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is white.",
+				},
+				E_META_CONCRETE_POWDER_YELLOW =
+				{
+					Notes = "A flag in the metadata of concete powder that indicates that the concrete powder is yellow.",
+				},
+				E_META_CONCRETE_PURPLE =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is purple.",
+				},
+				E_META_CONCRETE_RED =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is red.",
+				},
+				E_META_CONCRETE_WHITE =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is white.",
+				},
+				E_META_CONCRETE_YELLOW =
+				{
+					Notes = "A flag in the metadata of concete that indicates that the concrete is yellow.",
+				},
 				E_META_DROPSPENSER_ACTIVATED =
 				{
 					Notes = "A flag in the metadata of droppers and dispensers that indicates that the dropper or dispenser is currently activated. If this flag is set, the block must be unpowered first and powered again to shoot the next item.",
diff --git a/Server/crafting.txt b/Server/crafting.txt
index d789013fb..e74725921 100644
--- a/Server/crafting.txt
+++ b/Server/crafting.txt
@@ -468,6 +468,24 @@ MagentaDye, 4 = BlueDye, *   | WhiteDye, * | RedDye, *, *
 
 
 
+#******************************************************#
+# Concrete Powder:
+#
+White_Concrete_Powder         = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | BoneMeal, 2:2
+Orange_Concrete_Powder        = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | OrangeDye, 2:2
+Magenta_Concrete_Powder       = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | MagentaDye, 2:2
+Light_Blue_Concrete_Powder    = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | LightBlueDye, 2:2
+Yellow_Concrete_Powder        = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | YellowDye, 2:2
+Lime_Concrete_Powder          = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | LimeDye, 2:2
+Pink_Concrete_Powder          = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | PinkDye, 2:2
+Gray_Concrete_Powder          = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | GrayDye, 2:2
+Light_Gray_Concrete_Powder    = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | LightGrayDye, 2:2
+Cyan_Concrete_Powder          = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | CyanDye, 2:2
+Blue_Concrete_Powder          = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | BlueDye, 2:2
+Brown_Concrete_Powder         = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | BrownDye, 2:2
+Green_Concrete_Powder         = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | GreenDye, 2:2
+Red_Concrete_Powder           = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | RedDye, 2:2
+Black_Concrete_Powder         = Sand, 1:1, 3:1, 1:3, 3:3 | Gravel, 2:1, 1:2, 3:2, 2:3 | BlackDye, 2:2
 
 #******************************************************#
 # Colored shulker boxes:
diff --git a/Server/furnace.txt b/Server/furnace.txt
index a087722cb..eb75c6148 100644
--- a/Server/furnace.txt
+++ b/Server/furnace.txt
@@ -43,6 +43,9 @@
 # Smelting recipes
 
 Beef                = Steak
+BlackTerracotta     = BlackGlazedTerracotta
+BlueTerracotta      = BlueGlazedTerracotta
+BrownTerracotta     = BrownGlazedTerracotta
 Cactus              = CactusGreen
 ChainmailBoots      = IronNugget
 ChainmailChestplate = IronNugget
@@ -55,6 +58,7 @@ ClayBlock           = HardenedClay
 CoalOre             = Coal
 Cobblestone         = Stone
 CrackedStonebrick   = Stonebrick
+CyanTerracotta      = CyanGlazedTerracotta
 DiamondOre          = Diamond
 EmeraldOre          = Emerald
 Fish                = CookedFish
@@ -69,6 +73,8 @@ GoldPants           = GoldNugget
 GoldPickaxe         = GoldNugget
 GoldShovel          = GoldNugget
 GoldSword           = GoldNugget
+GrayTerracotta      = GrayGlazedTerracotta
+GreenTerracotta     = GreenGlazedTerracotta
 IronOre             = IronIngot
 IronAxe             = IronNugget
 IronBoots           = IronNugget
@@ -81,20 +87,29 @@ IronPickaxe         = IronNugget
 IronShovel          = IronNugget
 IronSword           = IronNugget
 LapisOre            = LapisLazuli
+LightBlueTerracotta = LightBlueGlazedTerracotta
+LightGrayTerracotta = LightGrayGlazedTerracotta
+LimeTerracotta      = LimeGlazedTerracotta
 Log                 = CharCoal
 Log2                = CharCoal
+MagentaTerracotta   = MagentaGlazedTerracotta
 Mutton              = CookedMutton
 NetherQuartzOre     = NetherQuartz
 Netherrack          = NetherBrick
+OrangeTerracotta    = OrangeGlazedTerracotta
+PinkTerracotta      = PinkGlazedTerracotta
 Porkchop            = CookedPorkchop
 Potato              = BakedPotato
+PurpleTerracotta    = PurpleGlazedTerracotta
 Rabbit              = CookedRabbit
+RedTerracotta       = RedGlazedTerracotta
 RedstoneOre         = Redstone
 Salmon              = CookedSalmon
 Sand                = Glass
 StoneBrick          = CrackedStoneBricks
 WetSponge           = Sponge
-
+WhiteTerracotta     = WhiteGlazedTerracotta
+YellowTerracotta    = YellowGlazedTerracotta
 
 
 
diff --git a/Server/items.ini b/Server/items.ini
index 64d703d9f..a6f87d5f3 100644
--- a/Server/items.ini
+++ b/Server/items.ini
@@ -538,40 +538,59 @@ quartzstairs=156
 activator_rail=157
 activatorrail=157
 dropper=158
+terracotta=159
 stained_hardened_clay=159
 stainedhardenedclay=159
+whiteterracotta=159
 whitestainedclay=159
+orangeterracotta=159:1
 orangestainedclay=159:1
+magentaterracotta=159:2
 magentastainedclay=159:2
+lightblueterracotta=159:3
 lightbluestainedclay=159:3
 ltbluestainedclay=159:3
+yellowterracotta=159:4
 yellowstainedclay=159:4
+limeterracotta=159:5
 limestainedclay=159:5
 lightgreenstainedclay=159:5
 ltgreenstainedclay=159:5
+pinkterracotta=159:6
 pinkstainedclay=159:6
+grayterracotta=159:7
+greyterracotta=159:7
 graystainedclay=159:7
 greystainedclay=159:7
 darkgraystainedclay=159:7
 darkgreystainedclay=159:7
 dkgraystainedclay=159:7
 dkgreystainedclay=159:7
+lightgrayterracotta=159:8
+lightgreyterracotta=159:8
 lightgraystainedclay=159:8
 lightgreystainedclay=159:8
 ltgraystainedclay=159:8
 ltgreystainedclay=159:8
 silverstainedclay=159:8
+cyanterracotta=159:9
 cyanstainedclay=159:9
+purpleterracotta=159:10
 purplestainedclay=159:10
 violetstainedclay=159:10
+blueterracotta=159:11
 bluestainedclay=159:11
 darkbluestainedclay=159:11
 dkbluestainedclay=159:11
+brownterracotta=159:12
 brownstainedclay=159:12
+greenterracotta=159:13
 greenstainedclay=159:13
 darkgreenstainedclay=159:13
 dkgreenstainedclay=159:13
+redterracotta=159:14
 redstainedclay=159:14
+blackterracotta=159:15
 blackstainedclay=159:15
 stained_glass_pane=160
 stainedglasspane=160
@@ -824,6 +843,72 @@ redshulkerbox=233
 red_shulker_box=233
 blackshulkerbox=234
 black_shulker_box=234
+whiteglazedterracotta=235
+white_glazed_terracotta=235
+orangeglazedterracotta=236
+orange_glazed_terracotta=236
+magentaglazedterracotta=237
+magenta_glazed_terracotta=237
+lightblueglazedterracotta=238
+light_blue_glazed_terracotta=238
+yellowglazedterracotta=239
+yellow_glazed_terracotta=239
+limeglazedterracotta=240
+lime_glazed_terracotta=240
+pinkglazedterracotta=241
+pink_glazed_terracotta=241
+grayglazedterracotta=242
+gray_glazed_terracotta=242
+lightgrayglazedterracotta=243
+light_gray_glazed_terracotta=243
+cyanglazedterracotta=244
+cyan_glazed_terracotta=244
+purpleglazedterracotta=245
+purple_glazed_terracotta=245
+blueglazedterracotta=246
+blue_glazed_terracotta=246
+brownglazedterracotta=247
+brown_glazed_terracotta=247
+greenglazedterracotta=248
+green_glazed_terracotta=248
+redglazedterracotta=249
+red_glazed_terracotta=249
+blackglazedterracotta=250
+black_glazed_terracotta=250
+concrete=251
+white_concrete=251:0
+orange_concrete=251:1
+magenta_concrete=251:2
+light_blue_concrete=251:3
+yellow_concrete=251:4
+lime_concrete=251:5
+pink_concrete=251:6
+gray_concrete=251:7
+light_gray_concrete=251:8
+cyan_concrete=251:9
+purple_concrete=251:10
+blue_concrete=251:11
+brown_concrete=251:12
+green_concrete=251:13
+red_concrete=251:14
+black_concrete=251:15
+concrete_powder=252
+white_concrete_powder=252:0
+orange_concrete_powder=252:1
+magenta_concrete_powder=252:2
+light_blue_concrete_powder=252:3
+yellow_concrete_powder=252:4
+lime_concrete_powder=252:5
+pink_concrete_powder=252:6
+gray_concrete_powder=252:7
+light_gray_concrete_powder=252:8
+cyan_concrete_powder=252:9
+purple_concrete_powder=252:10
+blue_concrete_powder=252:11
+brown_concrete_powder=252:12
+green_concrete_powder=252:13
+red_concrete_powder=252:14
+black_concrete_powder=252:15
 structureblock=255
 structure_block=255
 iron_shovel=256