Create/Update assets for version 17w06a

assets/minecraft/blockstates/black_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "black_concrete" }
+    }
+}

assets/minecraft/blockstates/black_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "black_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/black_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "black_glazed_terracotta" },
+        "facing=west": { "model": "black_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "black_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "black_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/blue_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "blue_concrete" }
+    }
+}

assets/minecraft/blockstates/blue_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "blue_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/blue_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "blue_glazed_terracotta" },
+        "facing=west": { "model": "blue_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "blue_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "blue_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/brown_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "brown_concrete" }
+    }
+}

assets/minecraft/blockstates/brown_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "brown_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/brown_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "brown_glazed_terracotta" },
+        "facing=west": { "model": "brown_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "brown_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "brown_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/cyan_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "cyan_concrete" }
+    }
+}

assets/minecraft/blockstates/cyan_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "cyan_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/cyan_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "cyan_glazed_terracotta" },
+        "facing=west": { "model": "cyan_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "cyan_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "cyan_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/gray_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "gray_concrete" }
+    }
+}

assets/minecraft/blockstates/gray_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "gray_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/gray_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "gray_glazed_terracotta" },
+        "facing=west": { "model": "gray_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "gray_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "gray_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/green_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "green_concrete" }
+    }
+}

assets/minecraft/blockstates/green_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "green_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/green_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "green_glazed_terracotta" },
+        "facing=west": { "model": "green_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "green_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "green_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/light_blue_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "light_blue_concrete" }
+    }
+}

assets/minecraft/blockstates/light_blue_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "light_blue_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/light_blue_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "light_blue_glazed_terracotta" },
+        "facing=west": { "model": "light_blue_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "light_blue_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "light_blue_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/lime_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "lime_concrete" }
+    }
+}

assets/minecraft/blockstates/lime_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "lime_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/lime_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "lime_glazed_terracotta" },
+        "facing=west": { "model": "lime_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "lime_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "lime_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/magenta_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "magenta_concrete" }
+    }
+}

assets/minecraft/blockstates/magenta_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "magenta_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/magenta_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "magenta_glazed_terracotta" },
+        "facing=west": { "model": "magenta_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "magenta_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "magenta_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/observer.json

@@ -0,0 +1,16 @@
+{
+    "variants": {
+        "facing=up,powered=false": { "model": "observer", "x": 270 },
+        "facing=down,powered=false": { "model": "observer", "x": 90 },
+        "facing=north,powered=false": { "model": "observer" },
+        "facing=south,powered=false": { "model": "observer", "y": 180 },
+        "facing=west,powered=false": { "model": "observer", "y": 270 },
+        "facing=east,powered=false": { "model": "observer", "y": 90 },
+        "facing=up,powered=true": { "model": "observer_powered", "x": 270 },
+        "facing=down,powered=true": { "model": "observer_powered", "x": 90 },
+        "facing=north,powered=true": { "model": "observer_powered" },
+        "facing=south,powered=true": { "model": "observer_powered", "y": 180 },
+        "facing=west,powered=true": { "model": "observer_powered", "y": 270 },
+        "facing=east,powered=true": { "model": "observer_powered", "y": 90 }
+    }
+}

assets/minecraft/blockstates/orange_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "orange_concrete" }
+    }
+}

assets/minecraft/blockstates/orange_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "orange_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/orange_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "orange_glazed_terracotta" },
+        "facing=west": { "model": "orange_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "orange_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "orange_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/pink_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "pink_concrete" }
+    }
+}

assets/minecraft/blockstates/pink_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "pink_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/pink_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "pink_glazed_terracotta" },
+        "facing=west": { "model": "pink_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "pink_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "pink_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/purple_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "purple_concrete" }
+    }
+}

assets/minecraft/blockstates/purple_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "purple_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/purple_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "purple_glazed_terracotta" },
+        "facing=west": { "model": "purple_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "purple_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "purple_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/red_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "red_concrete" }
+    }
+}

assets/minecraft/blockstates/red_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "red_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/red_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "red_glazed_terracotta" },
+        "facing=west": { "model": "red_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "red_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "red_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/silver_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "silver_concrete" }
+    }
+}

assets/minecraft/blockstates/silver_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "silver_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/silver_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "silver_glazed_terracotta" },
+        "facing=west": { "model": "silver_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "silver_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "silver_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/white_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "white_concrete" }
+    }
+}

assets/minecraft/blockstates/white_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "white_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/white_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "white_glazed_terracotta" },
+        "facing=west": { "model": "white_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "white_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "white_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/blockstates/yellow_concrete.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "yellow_concrete" }
+    }
+}

assets/minecraft/blockstates/yellow_concrete_powder.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "yellow_concrete_powder" }
+    }
+}

assets/minecraft/blockstates/yellow_glazed_terracotta.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "yellow_glazed_terracotta" },
+        "facing=west": { "model": "yellow_glazed_terracotta", "y": 90 },
+        "facing=north": { "model": "yellow_glazed_terracotta", "y": 180 },
+        "facing=east": { "model": "yellow_glazed_terracotta", "y": 270 }
+    }
+}

assets/minecraft/lang/en_us.lang

@@ -23,7 +23,7 @@ translation.test.invalid2=hi %  s
 translation.test.args=%s %s
 translation.test.world=world
 
-menu.game=Game menu
+menu.game=Game Menu
 menu.singleplayer=Singleplayer
 menu.multiplayer=Multiplayer
 menu.online=Minecraft Realms
@@ -60,7 +60,7 @@ selectWorld.newWorld=New World
 selectWorld.newWorld.copyOf=Copy of %s
 selectWorld.enterName=World Name
 selectWorld.resultFolder=Will be saved in:
-selectWorld.enterSeed=Seed for the World Generator
+selectWorld.enterSeed=Seed for the world generator
 selectWorld.seedInfo=Leave blank for a random seed
 selectWorld.cheats=Cheats
 selectWorld.customizeType=Customize
@@ -91,7 +91,6 @@ createWorld.customize.flat.removeLayer=Remove Layer
 createWorld.customize.flat.layer.top=Top - %s
 createWorld.customize.flat.layer=%s
 createWorld.customize.flat.layer.bottom=Bottom - %s
-createWorld.customize.flat.air=Air
 
 createWorld.customize.preset.classic_flat=Classic Flat
 createWorld.customize.preset.tunnelers_dream=Tunnelers' Dream
@@ -137,6 +136,7 @@ createWorld.customize.custom.useVillages=Villages
 createWorld.customize.custom.useMineShafts=Mineshafts
 createWorld.customize.custom.useTemples=Temples
 createWorld.customize.custom.useMonuments=Ocean Monuments
+createWorld.customize.custom.useMansions=Woodland Mansions
 createWorld.customize.custom.useRavines=Ravines
 createWorld.customize.custom.useDungeons=Dungeons
 createWorld.customize.custom.dungeonChance=Dungeon Count
@@ -175,10 +175,10 @@ gameMode.changed=Your game mode has been updated to %s
 
 spectatorMenu.previous_page=Previous Page
 spectatorMenu.next_page=Next Page
-spectatorMenu.close=Close menu
-spectatorMenu.teleport=Teleport to player
+spectatorMenu.close=Close Menu
+spectatorMenu.teleport=Teleport to Player
 spectatorMenu.teleport.prompt=Select a player to teleport to
-spectatorMenu.team_teleport=Teleport to team member
+spectatorMenu.team_teleport=Teleport to Team Member
 spectatorMenu.team_teleport.prompt=Select a team to teleport to
 spectatorMenu.root.prompt=Press a key to select a command, and again to use it.
 
@@ -224,7 +224,7 @@ selectServer.select=Join Server
 selectServer.direct=Direct Connect
 selectServer.edit=Edit
 selectServer.delete=Delete
-selectServer.add=Add server
+selectServer.add=Add Server
 selectServer.defaultName=Minecraft Server
 selectServer.deleteQuestion=Are you sure you want to remove this server?
 selectServer.deleteWarning=will be lost forever! (A long time!)
@@ -429,7 +429,7 @@ options.attack.crosshair=Crosshair
 options.attack.hotbar=Hotbar
 options.showSubtitles=Show Subtitles
 options.realmsNotifications=Realms Notifications
-options.autoJump=Auto-jump
+options.autoJump=Auto-Jump
 
 options.mipmapLevels=Mipmap Levels
 options.forceUnicodeFont=Force Unicode Font
@@ -439,6 +439,8 @@ difficulty.lock.question=Are you sure you want to lock the difficulty of this wo
 
 title.oldgl1=Old graphics card detected; this may prevent you from
 title.oldgl2=playing in the future as OpenGL 2.0 will be required.
+title.oldjava1=Old java detected; this will prevent you from playing
+title.oldjava2=in the future as Java 8 will be required.
 
 controls.title=Controls
 controls.reset=Reset
@@ -483,7 +485,7 @@ key.categories.gameplay=Gameplay
 key.categories.ui=Game Interface
 key.categories.inventory=Inventory
 
-resourcePack.openFolder=Open resource pack folder
+resourcePack.openFolder=Open Resource Pack Folder
 resourcePack.title=Select Resource Packs
 resourcePack.available.title=Available Resource Packs
 resourcePack.selected.title=Selected Resource Packs
@@ -510,6 +512,7 @@ book.generation.3=Tattered
 
 merchant.deprecated=Trade something else to unlock!
 
+tile.air.name=Air
 tile.barrier.name=Barrier
 tile.stone.stone.name=Stone
 tile.stone.granite.name=Granite
@@ -713,7 +716,7 @@ tile.woolCarpet.yellow.name=Yellow Carpet
 tile.woolCarpet.lightBlue.name=Light Blue Carpet
 tile.woolCarpet.magenta.name=Magenta Carpet
 tile.woolCarpet.orange.name=Orange Carpet
-tile.woolCarpet.white.name=Carpet
+tile.woolCarpet.white.name=White Carpet
 tile.ice.name=Ice
 tile.frostedIce.name=Frosted Ice
 tile.icePacked.name=Packed Ice
@@ -773,7 +776,7 @@ tile.cloth.yellow.name=Yellow Wool
 tile.cloth.lightBlue.name=Light Blue Wool
 tile.cloth.magenta.name=Magenta Wool
 tile.cloth.orange.name=Orange Wool
-tile.cloth.white.name=Wool
+tile.cloth.white.name=White Wool
 tile.oreLapis.name=Lapis Lazuli Ore
 tile.blockLapis.name=Lapis Lazuli Block
 tile.dispenser.name=Dispenser
@@ -869,6 +872,71 @@ tile.magma.name=Magma Block
 tile.netherWartBlock.name=Nether Wart Block
 tile.redNetherBrick.name=Red Nether Brick
 tile.boneBlock.name=Bone Block
+tile.observer.name=Observer
+tile.shulkerBoxWhite.name=White Shulker Box
+tile.shulkerBoxOrange.name=Orange Shulker Box
+tile.shulkerBoxMagenta.name=Magenta Shulker Box
+tile.shulkerBoxLightBlue.name=Light Blue Shulker Box
+tile.shulkerBoxYellow.name=Yellow Shulker Box
+tile.shulkerBoxLime.name=Lime Shulker Box
+tile.shulkerBoxPink.name=Pink Shulker Box
+tile.shulkerBoxGray.name=Gray Shulker Box
+tile.shulkerBoxSilver.name=Light Gray Shulker Box
+tile.shulkerBoxCyan.name=Cyan Shulker Box
+tile.shulkerBoxPurple.name=Purple Shulker Box
+tile.shulkerBoxBlue.name=Blue Shulker Box
+tile.shulkerBoxBrown.name=Brown Shulker Box
+tile.shulkerBoxGreen.name=Green Shulker Box
+tile.shulkerBoxRed.name=Red Shulker Box
+tile.shulkerBoxBlack.name=Black Shulker Box
+tile.glazedTerracottaWhite.name=White Glazed Terracotta
+tile.glazedTerracottaOrange.name=Orange Glazed Terracotta
+tile.glazedTerracottaMagenta.name=Magenta Glazed Terracotta
+tile.glazedTerracottaLightBlue.name=Light Blue Glazed Terracotta
+tile.glazedTerracottaYellow.name=Yellow Glazed Terracotta
+tile.glazedTerracottaLime.name=Lime Glazed Terracotta
+tile.glazedTerracottaPink.name=Pink Glazed Terracotta
+tile.glazedTerracottaGray.name=Gray Glazed Terracotta
+tile.glazedTerracottaSilver.name=Light Gray Glazed Terracotta
+tile.glazedTerracottaCyan.name=Cyan Glazed Terracotta
+tile.glazedTerracottaPurple.name=Purple Glazed Terracotta
+tile.glazedTerracottaBlue.name=Blue Glazed Terracotta
+tile.glazedTerracottaBrown.name=Brown Glazed Terracotta
+tile.glazedTerracottaGreen.name=Green Glazed Terracotta
+tile.glazedTerracottaRed.name=Red Glazed Terracotta
+tile.glazedTerracottaBlack.name=Black Glazed Terracotta
+tile.concrete.black.name=Black Concrete
+tile.concrete.red.name=Red Concrete
+tile.concrete.green.name=Green Concrete
+tile.concrete.brown.name=Brown Concrete
+tile.concrete.blue.name=Blue Concrete
+tile.concrete.purple.name=Purple Concrete
+tile.concrete.cyan.name=Cyan Concrete
+tile.concrete.silver.name=Light Gray Concrete
+tile.concrete.gray.name=Gray Concrete
+tile.concrete.pink.name=Pink Concrete
+tile.concrete.lime.name=Lime Concrete
+tile.concrete.yellow.name=Yellow Concrete
+tile.concrete.lightBlue.name=Light Blue Concrete
+tile.concrete.magenta.name=Magenta Concrete
+tile.concrete.orange.name=Orange Concrete
+tile.concrete.white.name=White Concrete
+tile.concretePowder.black.name=Black Concrete Powder
+tile.concretePowder.red.name=Red Concrete Powder
+tile.concretePowder.green.name=Green Concrete Powder
+tile.concretePowder.brown.name=Brown Concrete Powder
+tile.concretePowder.blue.name=Blue Concrete Powder
+tile.concretePowder.purple.name=Purple Concrete Powder
+tile.concretePowder.cyan.name=Cyan Concrete Powder
+tile.concretePowder.silver.name=Light Gray Concrete Powder
+tile.concretePowder.gray.name=Gray Concrete Powder
+tile.concretePowder.pink.name=Pink Concrete Powder
+tile.concretePowder.lime.name=Lime Concrete Powder
+tile.concretePowder.yellow.name=Yellow Concrete Powder
+tile.concretePowder.lightBlue.name=Light Blue Concrete Powder
+tile.concretePowder.magenta.name=Magenta Concrete Powder
+tile.concretePowder.orange.name=Orange Concrete Powder
+tile.concretePowder.white.name=White Concrete Powder
 
 tile.structureVoid.name=Structure Void
 tile.structureBlock.name=Structure Block
@@ -1051,6 +1119,8 @@ item.blazeRod.name=Blaze Rod
 item.ghastTear.name=Ghast Tear
 item.netherStalkSeeds.name=Nether Wart
 item.potion.name=Potion
+item.splash_potion.name=Splash Potion
+item.lingering_potion.name=Lingering Potion
 item.end_crystal.name=End Crystal
 item.goldNugget.name=Gold Nugget
 item.glassBottle.name=Glass Bottle
@@ -1129,6 +1199,9 @@ item.beetroot_seeds.name=Beetroot Seeds
 item.beetroot_soup.name=Beetroot Soup
 item.dragon_breath.name=Dragon's Breath
 item.elytra.name=Elytra
+item.totem.name=Totem of Undying
+item.shulkerShell.name=Shulker Shell
+item.ironNugget.name=Iron Nugget
 
 container.inventory=Inventory
 container.hopper=Item Hopper
@@ -1151,6 +1224,8 @@ container.chest=Chest
 container.chestDouble=Large Chest
 container.enderchest=Ender Chest
 container.beacon=Beacon
+container.shulkerBox=Shulker Box
+container.shulkerBox.more=and %s more...
 
 container.spectatorCantOpen=Unable to open. Loot not generated yet.
 container.isLocked=%s is locked!
@@ -1196,6 +1271,9 @@ item.color=Color: %s
 item.nbt_tags=NBT: %s tag(s)
 item.durability=Durability: %s / %s
 
+filled_map.mansion=Woodland Explorer Map
+filled_map.monument=Ocean Explorer Map
+
 entity.Item.name=Item
 entity.XPOrb.name=Experience Orb
 entity.SmallFireball.name=Small Fireball
@@ -1240,6 +1318,9 @@ entity.Guardian.name=Guardian
 entity.ElderGuardian.name=Elder Guardian
 entity.Shulker.name=Shulker
 entity.PolarBear.name=Polar Bear
+entity.EvocationIllager.name=Evoker
+entity.Vex.name=Vex
+entity.VindicationIllager.name=Vindicator
 
 entity.Villager.farmer=Farmer
 entity.Villager.fisherman=Fisherman
@@ -1253,6 +1334,7 @@ entity.Villager.tool=Tool Smith
 entity.Villager.butcher=Butcher
 entity.Villager.leather=Leatherworker
 entity.Villager.nitwit=Nitwit
+entity.Villager.cartographer=Cartographer
 
 entity.Pig.name=Pig
 entity.Sheep.name=Sheep
@@ -1270,6 +1352,7 @@ entity.SkeletonHorse.name=Skeleton Horse
 entity.ZombieHorse.name=Zombie Horse
 entity.Rabbit.name=Rabbit
 entity.KillerBunny.name=The Killer Bunny
+entity.Llama.name=Llama
 
 entity.PrimedTnt.name=Block of TNT
 entity.FallingSand.name=Falling Block
@@ -1301,6 +1384,7 @@ death.attack.lava.player=%1$s tried to swim in lava to escape %2$s
 death.attack.hotFloor=%1$s discovered floor was lava
 death.attack.hotFloor.player=%1$s walked into danger zone due to %2$s
 death.attack.inWall=%1$s suffocated in a wall
+death.attack.cramming=%1$s was squished too much
 death.attack.drown=%1$s drowned
 death.attack.drown.player=%1$s drowned whilst trying to escape %2$s
 death.attack.starve=%1$s starved to death
@@ -1329,6 +1413,7 @@ death.attack.fall=%1$s hit the ground too hard
 death.attack.outOfWorld=%1$s fell out of the world
 death.attack.dragonBreath=%1$s was roasted in dragon breath
 death.attack.flyIntoWall=%1$s experienced kinetic energy
+death.attack.fireworks=%1$s went off with a bang
 
 deathScreen.respawn=Respawn
 deathScreen.spectate=Spectate world
@@ -1369,7 +1454,7 @@ effect.luck=Luck
 effect.unluck=Bad Luck
 effect.levitation=Levitation
 
-tipped_arrow.effect.empty=Tipped Arrow
+tipped_arrow.effect.empty=Uncraftable Tipped Arrow
 tipped_arrow.effect.water=Tipped Arrow
 tipped_arrow.effect.mundane=Tipped Arrow
 tipped_arrow.effect.thick=Tipped Arrow
@@ -1464,6 +1549,7 @@ enchantment.damage.undead=Smite
 enchantment.damage.arthropods=Bane of Arthropods
 enchantment.knockback=Knockback
 enchantment.fire=Fire Aspect
+enchantment.sweeping=Sweeping Edge
 enchantment.protect.all=Protection
 enchantment.protect.fire=Fire Protection
 enchantment.protect.fall=Feather Falling
@@ -1486,6 +1572,8 @@ enchantment.arrowKnockback=Punch
 enchantment.arrowInfinite=Infinity
 enchantment.thorns=Thorns
 enchantment.mending=Mending
+enchantment.binding_curse=Curse of Binding
+enchantment.vanishing_curse=Curse of Vanishing
 
 enchantment.level.1=I
 enchantment.level.2=II
@@ -1517,11 +1605,11 @@ stat.entityKilledBy=%s killed you %s time(s)
 stat.entityKills.none=You have never killed %s
 stat.entityKilledBy.none=You have never been killed by %s
 
-stat.startGame=Times played
-stat.createWorld=Worlds created
-stat.loadWorld=Saves loaded
-stat.joinMultiplayer=Multiplayer joins
-stat.leaveGame=Games quit
+stat.startGame=Times Played
+stat.createWorld=Worlds Created
+stat.loadWorld=Saves Loaded
+stat.joinMultiplayer=Multiplayer Joins
+stat.leaveGame=Games Quit
 
 stat.playOneMinute=Minutes Played
 stat.timeSinceDeath=Since Last Death
@@ -1567,9 +1655,9 @@ stat.beaconInteraction=Interactions with Beacon
 stat.dropperInspected=Droppers Searched
 stat.hopperInspected=Hoppers Searched
 stat.dispenserInspected=Dispensers Searched
-stat.noteblockPlayed=Noteblocks played
-stat.noteblockTuned=Noteblocks tuned
-stat.flowerPotted=Plants potted
+stat.noteblockPlayed=Note Blocks Played
+stat.noteblockTuned=Note Blocks Tuned
+stat.flowerPotted=Plants Potted
 stat.trappedChestTriggered=Trapped Chests Triggered
 stat.enderchestOpened=Ender Chests Opened
 stat.itemEnchanted=Items Enchanted
@@ -1577,6 +1665,7 @@ stat.recordPlayed=Records Played
 stat.furnaceInteraction=Interactions with Furnace
 stat.workbenchInteraction=Interactions with Crafting Table
 stat.chestOpened=Chests Opened
+stat.shulkerBoxOpened=Shulker Boxes Opened
 stat.sleepInBed=Times Slept in a Bed
 
 stat.mineBlock=%1$s Mined
@@ -1662,9 +1751,10 @@ achievement.bookcase.desc=Build some bookshelves to improve your enchantment tab
 commands.generic.exception=An unknown error occurred while attempting to perform this command
 commands.generic.permission=You do not have permission to use this command
 commands.generic.syntax=Invalid command syntax
-commands.generic.player.notFound=That player cannot be found
-commands.generic.entity.notFound=That entity cannot be found
-commands.generic.entity.invalidUuid=The entity UUID provided is in an invalid format
+commands.generic.player.notFound=Player '%s' cannot be found
+commands.generic.entity.notFound=Entity '%s' cannot be found
+commands.generic.selector.notFound=Selector '%s' found nothing
+commands.generic.entity.invalidUuid=The entity UUID '%s' is in an invalid format
 commands.generic.entity.invalidType=Entity type '%s' is invalid
 commands.generic.notFound=Unknown command. Try /help for a list of commands
 commands.generic.parameter.invalid='%s' is not a valid parameter
@@ -1674,6 +1764,8 @@ commands.generic.num.tooSmall=The number you have entered (%s) is too small, it
 commands.generic.num.tooBig=The number you have entered (%s) is too big, it must be at most %s
 commands.generic.blockstate.invalid='%s' is not a state for block %s
 commands.generic.usage=Usage: %s
+commands.generic.selector_argument=Invalid selector argument: '%s'
+commands.generic.player.unspecified=You must specify which player you wish to perform this action on.
 
 commands.setidletimeout.usage=/setidletimeout <Minutes until kick>
 commands.setidletimeout.success=Successfully set the idle timeout to %s minutes.
@@ -1709,7 +1801,7 @@ commands.stats.noCompatibleBlock=Block at %s, %s, %s can not track stats
 commands.stats.failed=Invalid parameters
 commands.stats.cleared=Cleared %s stats
 commands.stats.success=Storing %s stats in %s on %s
-commands.summon.usage=/summon <EntityName> [x] [y] [z] [dataTag]
+commands.summon.usage=/summon <entityname> [x] [y] [z] [dataTag]
 commands.summon.success=Object successfully summoned
 commands.summon.failed=Unable to summon object
 commands.summon.tagError=Data tag parsing failed: %s
@@ -1814,7 +1906,7 @@ commands.banip.usage=/ban-ip <address|name> [reason ...]
 commands.unbanip.invalid=You have entered an invalid IP address
 commands.unbanip.success=Unbanned IP address %s
 commands.unbanip.usage=/pardon-ip <address>
-commands.save.usage=/save-all
+commands.save.usage=/save-all [flush]
 commands.save-on.alreadyOn=Saving is already turned on
 commands.save-on.usage=/save-on
 commands.save-off.alreadyOff=Saving is already turned off
@@ -1902,6 +1994,7 @@ commands.scoreboard.players.tag.notFound=Entity didn't have the %s tag
 commands.scoreboard.players.tag.success.add=Tag %s added
 commands.scoreboard.players.tag.success.remove=Tag %s removed
 commands.scoreboard.players.tag.list=Tags on entity %s are:
+commands.scoreboard.players.tag.tagError=Players tag command failed, reason: %s
 commands.scoreboard.teams.usage=/scoreboard teams <list|add|remove|empty|join|leave|option> ...
 commands.scoreboard.teams.add.usage=/scoreboard teams add <name> [display name ...]
 commands.scoreboard.teams.add.alreadyExists=A team with the name '%s' already exists
@@ -1993,6 +2086,7 @@ commands.testfor.success=Found %s
 commands.testfor.tagError=Data tag parsing failed: %s
 commands.seed.usage=/seed
 commands.seed.success=Seed: %s
+commands.spreadplayers.noop=No players found to spread
 commands.spreadplayers.usage=/spreadplayers <x> <z> <spreadDistance> <maxRange> <respectTeams true|false> <player ...>
 commands.spreadplayers.spreading.teams=Spreading %s team(s) %s blocks around %s,%s (min %s blocks apart)
 commands.spreadplayers.spreading.players=Spreading %s player(s) %s blocks around %s,%s (min %s blocks apart)
@@ -2029,7 +2123,7 @@ commands.worldborder.warning.time.usage=/worldborder warning time <seconds>
 commands.worldborder.warning.time.success=Set world border warning to %s seconds away (from %s seconds)
 commands.worldborder.warning.distance.usage=/worldborder warning distance <distance>
 commands.worldborder.warning.distance.success=Set world border warning to %s blocks away (from %s blocks)
-commands.title.usage=/title <player> <title|subtitle|actionbar|clear|reset|times> ...
+commands.title.usage=/title <player> title|subtitle|actionbar|clear|reset|times ...
 commands.title.usage.title=/title <player> title|subtitle|actionbar <raw json title>
 commands.title.usage.clear=/title <player> clear|reset
 commands.title.usage.times=/title <player> times <fadeIn> <stay> <fadeOut>
@@ -2039,6 +2133,9 @@ commands.stopsound.unknownSoundSource=Source %s is unknown
 commands.stopsound.success.individualSound=Stopped sound '%s' with source '%s' for %s
 commands.stopsound.success.soundSource=Stopped source '%s' for %s
 commands.stopsound.success.all=Stopped all sounds for %s
+commands.locate.usage=/locate <feature>
+commands.locate.success=Located %s at %s (y?) %s
+commands.locate.failure=Unable to locate any %s feature
 
 itemGroup.buildingBlocks=Building Blocks
 itemGroup.decorations=Decoration Blocks
@@ -2052,8 +2149,11 @@ itemGroup.combat=Combat
 itemGroup.brewing=Brewing
 itemGroup.materials=Materials
 itemGroup.inventory=Survival Inventory
+itemGroup.hotbar=Saved Toolbars
 
 inventory.binSlot=Destroy Item
+inventory.hotbarSaved=Item toolbar saved (restore with Shift+%1$s)
+inventory.hotbarInfo=Save toolbar with Ctrl+%1$s
 
 advMode.setCommand=Set Console Command for Block
 advMode.setCommand.success=Command set: %s
@@ -2819,11 +2919,13 @@ subtitles.block.iron_trapdoor.open=Trapdoor closes
 subtitles.block.lava.ambient=Lava pops
 subtitles.block.lava.extinguish=Lava hisses
 subtitles.block.lever.click=Lever clicks
-subtitles.block.note.note=Note block plays
+subtitles.block.note.note=Note Block plays
 subtitles.block.piston.move=Piston moves
 subtitles.block.portal.ambient=Portal whooshes
 subtitles.block.pressure_plate.click=Pressure Plate clicks
 subtitles.block.redstone_torch.burnout=Torch fizzes
+subtitles.block.shulker_box.close=Shulker closes
+subtitles.block.shulker_box.open=Shulker opens
 subtitles.block.trapdoor.toggle=Trapdoor creaks
 subtitles.block.tripwire.attach=Tripwire attaches
 subtitles.block.tripwire.click=Tripwire clicks
@@ -2865,6 +2967,13 @@ subtitles.entity.donkey.chest=Donkey Chest equips
 subtitles.entity.donkey.death=Donkey dies
 subtitles.entity.donkey.hurt=Donkey hurts
 subtitles.entity.egg.throw=Egg flies
+subtitles.entity.elder_guardian.ambient.land=Elder Guardian flaps
+subtitles.entity.elder_guardian.ambient=Elder Guardian moans
+subtitles.entity.elder_guardian.attack=Elder Guardian shoots
+subtitles.entity.elder_guardian.curse=Elder Guardian curses
+subtitles.entity.elder_guardian.death=Elder Guardian dies
+subtitles.entity.elder_guardian.flop=Elder Guardian flops
+subtitles.entity.elder_guardian.hurt=Elder Guardian hurts
 subtitles.entity.enderdragon.ambient=Dragon roars
 subtitles.entity.enderdragon.death=Dragon dies
 subtitles.entity.enderdragon.flap=Dragon flaps
@@ -2881,6 +2990,14 @@ subtitles.entity.endermite.ambient=Endermite scuttles
 subtitles.entity.endermite.death=Endermite dies
 subtitles.entity.endermite.hurt=Endermite hurts
 subtitles.entity.enderpearl.throw=Ender Pearl flies
+subtitles.entity.evocation_fangs.attack=Fangs snap
+subtitles.entity.evocation_illager.ambient=Evoker murmurs
+subtitles.entity.evocation_illager.cast_spell=Evoker casts spell
+subtitles.entity.evocation_illager.death=Evoker dies
+subtitles.entity.evocation_illager.hurt=Evoker hurts
+subtitles.entity.evocation_illager.prepare_attack=Evoker prepares attack
+subtitles.entity.evocation_illager.prepare_summon=Evoker prepares summoning
+subtitles.entity.evocation_illager.prepare_wololo=Evoker prepares charming
 subtitles.entity.experience_orb.pickup=Experience gained
 subtitles.entity.firework.blast=Firework blasts
 subtitles.entity.firework.launch=Firework launches
@@ -2900,13 +3017,6 @@ subtitles.entity.ghast.ambient=Ghast cries
 subtitles.entity.ghast.death=Ghast dies
 subtitles.entity.ghast.hurt=Ghast hurts
 subtitles.entity.ghast.shoot=Ghast shoots
-subtitles.entity.elder_guardian.ambient.land=Elder Guardian flaps
-subtitles.entity.elder_guardian.ambient=Elder Guardian moans
-subtitles.entity.elder_guardian.attack=Elder Guardian shoots
-subtitles.entity.elder_guardian.curse=Elder Guardian curses
-subtitles.entity.elder_guardian.death=Elder Guardian dies
-subtitles.entity.elder_guardian.flop=Elder Guardian flops
-subtitles.entity.elder_guardian.hurt=Elder Guardian hurts
 subtitles.entity.guardian.ambient.land=Guardian flaps
 subtitles.entity.guardian.ambient=Guardian moans
 subtitles.entity.guardian.attack=Guardian shoots
@@ -2941,11 +3051,21 @@ subtitles.entity.leashknot.break=Leash knot breaks
 subtitles.entity.leashknot.place=Leash knot tied
 subtitles.entity.lightning.impact=Lightning strikes
 subtitles.entity.lightning.thunder=Thunder roars
+subtitles.entity.llama.ambient=Llama bleats
+subtitles.entity.llama.angry=Llama bleats angry
+subtitles.entity.llama.chest=Llama Chest equips
+subtitles.entity.llama.death=Llama dies
+subtitles.entity.llama.eat=Llama eats
+subtitles.entity.llama.hurt=Llama hurts
+subtitles.entity.llama.spit=Llama spits
+subtitles.entity.llama.step=Llama steps
+subtitles.entity.llama.swag=Llama is decorated
 subtitles.entity.magmacube.death=Magma Cube dies
 subtitles.entity.magmacube.hurt=Magma Cube hurts
 subtitles.entity.magmacube.squish=Magma Cube squishes
 subtitles.entity.minecart.riding=Minecart rolls
 subtitles.entity.mule.ambient=Mule hee-haws
+subtitles.entity.mule.chest=Mule Chest equips
 subtitles.entity.mule.death=Mule dies
 subtitles.entity.mule.hurt=Mule hurts
 subtitles.entity.painting.break=Painting breaks
@@ -3009,12 +3129,19 @@ subtitles.entity.stray.ambient=Stray rattles
 subtitles.entity.stray.death=Stray dies
 subtitles.entity.stray.hurt=Stray hurts
 subtitles.entity.tnt.primed=TNT fizzes
+subtitles.entity.vex.ambient=Vex vexes
+subtitles.entity.vex.charge=Vex shrieks
+subtitles.entity.vex.death=Vex dies
+subtitles.entity.vex.hurt=Vex hurts
 subtitles.entity.villager.ambient=Villager mumbles
 subtitles.entity.villager.death=Villager dies
 subtitles.entity.villager.hurt=Villager hurts
 subtitles.entity.villager.no=Villager disagrees
 subtitles.entity.villager.trading=Villager trades
 subtitles.entity.villager.yes=Villager agrees
+subtitles.entity.vindication_illager.ambient=Vindicator mutters
+subtitles.entity.vindication_illager.death=Vindicator dies
+subtitles.entity.vindication_illager.hurt=Vindicator hurts
 subtitles.entity.witch.ambient=Witch giggles
 subtitles.entity.witch.death=Witch dies
 subtitles.entity.witch.drink=Witch drinks
@@ -3052,6 +3179,7 @@ subtitles.entity.zombie_villager.hurt=Zombie Villager hurts
 subtitles.item.armor.equip=Gear equipped
 subtitles.item.armor.equip_chain=Chain armor jingles
 subtitles.item.armor.equip_diamond=Diamond armor clangs
+subtitles.item.armor.equip_elytra=Elytra rustles
 subtitles.item.armor.equip_gold=Gold armor clinks
 subtitles.item.armor.equip_iron=Iron armor clanks
 subtitles.item.armor.equip_leather=Leather armor rustles
@@ -3065,6 +3193,7 @@ subtitles.item.hoe.till=Hoe tills
 subtitles.item.shear=Shears click
 subtitles.item.shield.block=Shield blocks
 subtitles.item.shovel.flatten=Shovel flattens
+subtitles.item.totem.use=Totem activates
 subtitles.weather.rain=Rain falls
 
 debug.reload_chunks.help=F3 + A = Reload chunks

assets/minecraft/loot_tables/chests/woodland_mansion.json

@@ -0,0 +1,264 @@
+{
+    "pools": [
+        {
+            "rolls": {
+                "min": 1,
+                "max": 3
+            },
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:lead",
+                    "weight": 20
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:golden_apple",
+                    "weight": 15
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:golden_apple",
+                    "weight": 2,
+                    "functions": [
+                        {
+                            "function": "set_data",
+                            "data": 1
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:record_13",
+                    "weight": 15
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:record_cat",
+                    "weight": 15
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:name_tag",
+                    "weight": 20
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:chainmail_chestplate",
+                    "weight": 10
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:diamond_hoe",
+                    "weight": 15
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:diamond_chestplate",
+                    "weight": 5
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:book",
+                    "weight": 10,
+                    "functions": [
+                        {
+                            "function": "enchant_randomly"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "rolls": {
+                "min": 1,
+                "max": 4
+            },
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:iron_ingot",
+                    "weight": 10,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 4
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:gold_ingot",
+                    "weight": 5,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 4
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:bread",
+                    "weight": 20
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:wheat",
+                    "weight": 20,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 4
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:bucket",
+                    "weight": 10
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:redstone",
+                    "weight": 15,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 4
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:coal",
+                    "weight": 15,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 4
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:melon_seeds",
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 2,
+                                "max": 4
+                            }
+                        }
+                    ],
+                    "weight": 10
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:pumpkin_seeds",
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 2,
+                                "max": 4
+                            }
+                        }
+                    ],
+                    "weight": 10
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:beetroot_seeds",
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 2,
+                                "max": 4
+                            }
+                        }
+                    ],
+                    "weight": 10
+                }
+            ]
+        },
+        {
+            "rolls": 3,
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:bone",
+                    "weight": 10,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 8
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:gunpowder",
+                    "weight": 10,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 8
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:rotten_flesh",
+                    "weight": 10,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 8
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "item",
+                    "name": "minecraft:string",
+                    "weight": 10,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 8
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

assets/minecraft/loot_tables/entities/elder_guardian.json

@@ -40,6 +40,18 @@
                                 "min": 0,
                                 "max": 1
                             }
+                        },
+                        {
+                            "function": "furnace_smelt",
+                            "conditions": [
+                                {
+                                    "condition": "entity_properties",
+                                    "entity": "this",
+                                    "properties": {
+                                        "on_fire": true
+                                    }
+                                }
+                            ]
                         }
                     ]
                 },

assets/minecraft/loot_tables/entities/ender_dragon.json

@@ -0,0 +1 @@
+{}

assets/minecraft/loot_tables/entities/evocation_illager.json

@@ -0,0 +1,44 @@
+{
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "item",
+          "name": "minecraft:totem_of_undying"
+        }
+      ]
+    },
+    {
+        "rolls": 1,
+        "entries": [
+            {
+                "type": "item",
+                "name": "minecraft:emerald",
+                "weight": 1,
+                "functions": [
+                    {
+                        "function": "set_count",
+                        "count": {
+                            "min": 0,
+                            "max": 1
+                        }
+                    },
+                    {
+                        "function": "looting_enchant",
+                        "count": {
+                            "min": 0,
+                            "max": 1
+                        }
+                    }
+                ]
+            }
+        ],
+        "conditions": [
+            {
+                "condition": "killed_by_player"
+            }
+        ]
+    }
+  ]
+}

assets/minecraft/loot_tables/entities/guardian.json

@@ -40,6 +40,18 @@
                                 "min": 0,
                                 "max": 1
                             }
+                        },
+                        {
+                            "function": "furnace_smelt",
+                            "conditions": [
+                                {
+                                    "condition": "entity_properties",
+                                    "entity": "this",
+                                    "properties": {
+                                        "on_fire": true
+                                    }
+                                }
+                            ]
                         }
                     ]
                 },

assets/minecraft/loot_tables/entities/llama.json

@@ -0,0 +1,29 @@
+{
+    "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:leather",
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 0,
+                                "max": 2
+                            }
+                        },
+                        {
+                            "function": "looting_enchant",
+                            "count": {
+                                "min": 0,
+                                "max": 1
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

assets/minecraft/loot_tables/entities/rabbit.json

@@ -52,6 +52,13 @@
                                     }
                                 }
                             ]
+                        },
+                        {
+                            "function": "looting_enchant",
+                            "count": {
+                                "min": 0,
+                                "max": 1
+                            }
                         }
                     ]
                 }

assets/minecraft/loot_tables/entities/shulker.json

@@ -1 +1,20 @@
-{}
+{
+  "pools": [
+    {
+      "conditions": [
+        {
+          "condition": "random_chance_with_looting",
+          "chance": 0.5,
+          "looting_multiplier": 0.0625
+        }
+      ],
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "item",
+          "name": "minecraft:shulker_shell"
+        }
+      ]
+    }
+  ]
+}

assets/minecraft/loot_tables/entities/skeleton_horse.json

@@ -5,7 +5,24 @@
             "entries": [
                 {
                     "type": "item",
-                    "name": "minecraft:bone"
+                    "name": "minecraft:bone",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 0,
+                                "max": 2
+                            }
+                        },
+                        {
+                            "function": "looting_enchant",
+                            "count": {
+                                "min": 0,
+                                "max": 1
+                            }
+                        }
+                    ]
                 }
             ]
         }

assets/minecraft/loot_tables/entities/vex.json

@@ -0,0 +1 @@
+{}

assets/minecraft/loot_tables/entities/villager.json

@@ -0,0 +1 @@
+{}

assets/minecraft/loot_tables/entities/vindication_illager.json

@@ -0,0 +1,35 @@
+{
+  "pools": [
+    {
+        "rolls": 1,
+        "entries": [
+            {
+                "type": "item",
+                "name": "minecraft:emerald",
+                "weight": 1,
+                "functions": [
+                    {
+                        "function": "set_count",
+                        "count": {
+                            "min": 0,
+                            "max": 1
+                        }
+                    },
+                    {
+                        "function": "looting_enchant",
+                        "count": {
+                            "min": 0,
+                            "max": 1
+                        }
+                    }
+                ]
+            }
+        ],
+        "conditions": [
+            {
+                "condition": "killed_by_player"
+            }
+        ]
+    }
+  ]
+}

assets/minecraft/loot_tables/entities/zombie_horse.json

@@ -5,7 +5,24 @@
             "entries": [
                 {
                     "type": "item",
-                    "name": "minecraft:rotten_flesh"
+                    "name": "minecraft:rotten_flesh",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 0,
+                                "max": 2
+                            }
+                        },
+                        {
+                            "function": "looting_enchant",
+                            "count": {
+                                "min": 0,
+                                "max": 1
+                            }
+                        }
+                    ]
                 }
             ]
         }

assets/minecraft/loot_tables/gameplay/fishing/junk.json

@@ -30,7 +30,13 @@
                 {
                     "type": "item",
                     "name": "minecraft:potion",
-                    "weight": 10
+                    "weight": 10,
+                    "functions": [
+                        {
+                            "function": "set_nbt",
+                            "tag": "{Potion:\"minecraft:water\"}"
+                        }
+                    ]
                 },
                 {
                     "type": "item",
@@ -64,11 +70,15 @@
                 {
                     "type": "item",
                     "name": "minecraft:dye",
-                    "weight": 10,
+                    "weight": 1,
                     "functions": [
                         {
                             "function": "set_data",
                             "data": 0
+                        },
+                        {
+                            "function": "set_count",
+                            "count": 10
                         }
                     ]
                 },
@@ -85,4 +95,4 @@
             ]
         }
     ]
-}
+}

assets/minecraft/models/block/black_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_black"
+    }
+}

assets/minecraft/models/block/black_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_black"
+    }
+}

assets/minecraft/models/block/black_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_black",
+        "pattern": "blocks/glazed_terracotta_black"
+    }
+}

assets/minecraft/models/block/blue_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_blue"
+    }
+}

assets/minecraft/models/block/blue_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_blue"
+    }
+}

assets/minecraft/models/block/blue_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_blue",
+        "pattern": "blocks/glazed_terracotta_blue"
+    }
+}

assets/minecraft/models/block/brown_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_brown"
+    }
+}

assets/minecraft/models/block/brown_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_brown"
+    }
+}

assets/minecraft/models/block/brown_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_brown",
+        "pattern": "blocks/glazed_terracotta_brown"
+    }
+}

assets/minecraft/models/block/cobblestone_wall_ne.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_ne",
-    "textures": {
-        "wall": "blocks/cobblestone"
-    }
-}

assets/minecraft/models/block/cobblestone_wall_ns.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_ns",
-    "textures": {
-        "wall": "blocks/cobblestone"
-    }
-}

assets/minecraft/models/block/cobblestone_wall_ns_above.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_ns_above",
-    "textures": {
-        "wall": "blocks/cobblestone"
-    }
-}

assets/minecraft/models/block/cobblestone_wall_nse.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_nse",
-    "textures": {
-        "wall": "blocks/cobblestone"
-    }
-}

assets/minecraft/models/block/cobblestone_wall_nsew.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_nsew",
-    "textures": {
-        "wall": "blocks/cobblestone"
-    }
-}

assets/minecraft/models/block/cyan_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_cyan"
+    }
+}

assets/minecraft/models/block/cyan_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_cyan"
+    }
+}

assets/minecraft/models/block/cyan_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_cyan",
+        "pattern": "blocks/glazed_terracotta_cyan"
+    }
+}

assets/minecraft/models/block/glazed_terracotta.json

@@ -0,0 +1,23 @@
+{
+    "parent": "block/cube",
+    "display": {
+        "firstperson_righthand": {
+            "rotation": [ 0, 135, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.40, 0.40, 0.40 ]
+        }
+    },
+    "elements": [
+        {   "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 16 ],
+            "faces": {
+                "down":  { "uv": [ 0,  0, 16, 16 ], "texture": "#pattern", "cullface": "down" },
+                "up":    { "uv": [ 0,  0, 16, 16 ], "texture": "#pattern", "cullface": "up" },
+                "north": { "uv": [ 0,  0, 16, 16 ], "texture": "#pattern", "cullface": "north", "rotation": 90 },
+                "south": { "uv": [ 0,  0, 16, 16 ], "texture": "#pattern", "cullface": "south", "rotation": 270 },
+                "west":  { "uv": [ 0,  0, 16, 16 ], "texture": "#pattern", "cullface": "west", "rotation": 0 },
+                "east":  { "uv": [ 0,  0, 16, 16 ], "texture": "#pattern", "cullface": "east", "rotation": 180 }
+            }
+        }
+    ]
+}

assets/minecraft/models/block/gray_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_gray"
+    }
+}

assets/minecraft/models/block/gray_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_gray"
+    }
+}

assets/minecraft/models/block/gray_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_gray",
+        "pattern": "blocks/glazed_terracotta_gray"
+    }
+}

assets/minecraft/models/block/green_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_green"
+    }
+}

assets/minecraft/models/block/green_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_green"
+    }
+}

assets/minecraft/models/block/green_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_green",
+        "pattern": "blocks/glazed_terracotta_green"
+    }
+}

assets/minecraft/models/block/light_blue_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_light_blue"
+    }
+}

assets/minecraft/models/block/light_blue_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_light_blue"
+    }
+}

assets/minecraft/models/block/light_blue_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_light_blue",
+        "pattern": "blocks/glazed_terracotta_light_blue"
+    }
+}

assets/minecraft/models/block/lime_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_lime"
+    }
+}

assets/minecraft/models/block/lime_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_lime"
+    }
+}

assets/minecraft/models/block/lime_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_lime",
+        "pattern": "blocks/glazed_terracotta_lime"
+    }
+}

assets/minecraft/models/block/magenta_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_magenta"
+    }
+}

assets/minecraft/models/block/magenta_concrete_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_powder_magenta"
+    }
+}

assets/minecraft/models/block/magenta_glazed_terracotta.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/glazed_terracotta",
+    "textures": {
+        "particle": "blocks/glazed_terracotta_magenta",
+        "pattern": "blocks/glazed_terracotta_magenta"
+    }
+}

assets/minecraft/models/block/observer.json

@@ -1,17 +1,22 @@
 {
+    "parent": "block/block",
     "textures": {
-        "particle": "#side"
+        "bottom": "blocks/observer_back",
+        "side": "blocks/observer_side",
+        "top": "blocks/observer_top",
+        "front": "blocks/observer_front",
+        "particle": "blocks/observer_front"
     },
     "elements": [
         {   "from": [ 0, 0, 0 ],
             "to": [ 16, 16, 16 ],
             "faces": {
-                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "down" },
-                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "up" },
-                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "north" },
-                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "south" },
-                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west", "rotation": 270 },
-                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east", "rotation": 90 }
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "down" },
+                "up":    { "uv": [ 0, 16, 16, 0 ], "texture": "#top", "cullface": "up" },
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#front", "cullface": "north" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "south" },
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
             }
         }
     ]

assets/minecraft/models/block/observer_powered.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/observer",
+    "textures": {
+        "bottom": "blocks/observer_back_lit"
+    }
+}

assets/minecraft/models/block/orange_concrete.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/concrete_orange"
+    }
+}