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

@@ -1,10 +1,16 @@
 {
     "variants": {
-        "facing=down": { "model": "observer", "x": 90 },
-        "facing=up": { "model": "observer", "x": 270 },
-        "facing=north": { "model": "observer" },
-        "facing=south": { "model": "observer", "y": 180 },
-        "facing=west": { "model": "observer", "y": 270 },
-        "facing=east": { "model": "observer", "y": 90 }
+        "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

@@ -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
@@ -714,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
@@ -774,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
@@ -879,7 +881,7 @@ 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 Grey 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
@@ -887,6 +889,54 @@ 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
@@ -1069,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
@@ -1149,6 +1201,7 @@ 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
@@ -1172,7 +1225,7 @@ container.chestDouble=Large Chest
 container.enderchest=Ender Chest
 container.beacon=Beacon
 container.shulkerBox=Shulker Box
-container.shulkerBox.more=and %d more...
+container.shulkerBox.more=and %s more...
 
 container.spectatorCantOpen=Unable to open. Loot not generated yet.
 container.isLocked=%s is locked!
@@ -1331,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
@@ -1359,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
@@ -1494,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
@@ -1695,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
@@ -1707,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.
@@ -1742,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
@@ -1935,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
@@ -2026,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)
@@ -2062,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>
@@ -2072,8 +2133,8 @@ 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 %d (y?) %d
+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
@@ -2088,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
@@ -2855,7 +2919,7 @@ 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
@@ -2989,6 +3053,7 @@ 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
@@ -3000,6 +3065,7 @@ 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
@@ -3113,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

assets/minecraft/loot_tables/entities/ender_dragon.json

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

assets/minecraft/loot_tables/entities/evocation_illager.json

@@ -5,7 +5,7 @@
       "entries": [
         {
           "type": "item",
-          "name": "minecraft:totem"
+          "name": "minecraft:totem_of_undying"
         }
       ]
     },
@@ -39,6 +39,6 @@
                 "condition": "killed_by_player"
             }
         ]
-    }    
+    }
   ]
 }

assets/minecraft/loot_tables/entities/vex.json

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

assets/minecraft/loot_tables/entities/vindication_illager.json

@@ -1,24 +1,5 @@
 {
   "pools": [
-    {
-      "conditions": [
-        {
-          "condition": "random_chance_with_looting",
-          "chance": 0.15,
-          "looting_multiplier": 0.0625
-        },
-        {
-                "condition": "killed_by_player"
-        }
-      ],
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "item",
-          "name": "minecraft:iron_axe"
-        }
-      ]
-    },
     {
         "rolls": 1,
         "entries": [
@@ -49,6 +30,6 @@
                 "condition": "killed_by_player"
             }
         ]
-    }    
+    }
   ]
 }

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/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

@@ -11,8 +11,8 @@
         {   "from": [ 0, 0, 0 ],
             "to": [ 16, 16, 16 ],
             "faces": {
-                "down":  { "uv": [ 0, 16, 16, 0 ], "texture": "#top", "cullface": "down" },
-                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
+                "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" },

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"
+    }
+}

assets/minecraft/models/block/orange_concrete_powder.json

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

assets/minecraft/models/block/orange_glazed_terracotta.json

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

assets/minecraft/models/block/pink_concrete.json

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

assets/minecraft/models/block/pink_concrete_powder.json

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

assets/minecraft/models/block/pink_glazed_terracotta.json

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

assets/minecraft/models/block/purple_concrete.json

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

assets/minecraft/models/block/purple_concrete_powder.json

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

assets/minecraft/models/block/purple_glazed_terracotta.json

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

assets/minecraft/models/block/red_concrete.json

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

assets/minecraft/models/block/red_concrete_powder.json

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

assets/minecraft/models/block/red_glazed_terracotta.json

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

assets/minecraft/models/block/silver_concrete.json

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

assets/minecraft/models/block/silver_concrete_powder.json

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

assets/minecraft/models/block/silver_glazed_terracotta.json

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

assets/minecraft/models/block/white_concrete.json

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