1.20.2 (#99)

* add configuration state

* start updating to 23w31a

* implement a bit more of 23w31a

* chunk batching

* start adding configuration state

* ioasfhjgsd

* almost works

* configuration state mostly implemented

* handle other packets in configuration state and fix keepalive

* cleanup, fix warnings

* 23w32a

* fix some doctests

* 23w33a

* 23w35a

* 1.20.2-pre2

* fix system conflicts

* 1.20.2-pre4

* make tests compile

* tests pass

* 1.20.2-rc2

* 1.20.2

* Revert "1.20.2"

This reverts commit dd152fd265332ead333c919e585ded6d609d7468.

* didn't mean to commit that code

---------

Co-authored-by: mat <git@matdoes.dev>

1 files changed, 173 insertions, 50 deletions

diff --git a/azalea-language/src/en_us.json b/azalea-language/src/en_us.json
index 47072042..ee0df16b 100755
--- a/azalea-language/src/en_us.json
+++ b/azalea-language/src/en_us.json
@@ -200,6 +200,7 @@
   "advancements.nether.uneasy_alliance.title": "Uneasy Alliance",
   "advancements.nether.use_lodestone.description": "Use a Compass on a Lodestone",
   "advancements.nether.use_lodestone.title": "Country Lode, Take Me Home",
+  "advancements.progress": "%s/%s",
   "advancements.sad_label": ":(",
   "advancements.story.cure_zombie_villager.description": "Weaken and then cure a Zombie Villager",
   "advancements.story.cure_zombie_villager.title": "Zombie Doctor",
@@ -393,6 +394,7 @@
   "attribute.name.generic.follow_range": "Mob Follow Range",
   "attribute.name.generic.knockback_resistance": "Knockback Resistance",
   "attribute.name.generic.luck": "Luck",
+  "attribute.name.generic.max_absorption": "Max Absorption",
   "attribute.name.generic.max_health": "Max Health",
   "attribute.name.generic.movement_speed": "Speed",
   "attribute.name.horse.jump_strength": "Horse Jump Strength",
@@ -2154,6 +2156,7 @@
   "chat.link.warning": "Never open links from people that you don't trust!",
   "chat.queue": "[+%s pending lines]",
   "chat.square_brackets": "[%s]",
+  "chat.tag.error": "Server sent invalid message.",
   "chat.tag.modified": "Message modified by the server. Original:",
   "chat.tag.not_secure": "Unverified message. Cannot be reported.",
   "chat.tag.system": "Server message. Cannot be reported.",
@@ -2169,6 +2172,7 @@
   "chat.type.team.text": "%s <%s> %s",
   "chat.type.text": "<%s> %s",
   "chat.type.text.narrate": "%s says %s",
+  "chat.validation_error": "Chat validation error",
   "clear.failed.multiple": "No items were found on %s players",
   "clear.failed.single": "No items were found on player %s",
   "color.minecraft.black": "Black",
@@ -2237,6 +2241,7 @@
   "commands.banip.invalid": "Invalid IP address or unknown player",
   "commands.banip.success": "Banned IP %s: %s",
   "commands.banlist.entry": "%s was banned by %s: %s",
+  "commands.banlist.entry.unknown": "(Unknown)",
   "commands.banlist.list": "There are %s ban(s):",
   "commands.banlist.none": "There are no bans",
   "commands.bossbar.create.failed": "A bossbar already exists with the ID '%s'",
@@ -2379,6 +2384,10 @@
   "commands.forceload.removed.multiple": "Unmarked %s chunks in %s from %s to %s for force loading",
   "commands.forceload.removed.single": "Unmarked chunk %s in %s for force loading",
   "commands.forceload.toobig": "Too many chunks in the specified area (maximum %s, specified %s)",
+  "commands.function.error.argument_not_compound": "Invalid argument type: %s, expected Compound",
+  "commands.function.error.missing_argument": "Missing argument %2$s to function %1$s",
+  "commands.function.error.missing_arguments": "Missing arguments to function %s",
+  "commands.function.error.parse": "While instantiating macro %s: Command '%s' caused error: %s",
   "commands.function.success.multiple": "Executed %s command(s) from %s functions",
   "commands.function.success.multiple.result": "Executed %s functions",
   "commands.function.success.single": "Executed %s command(s) from function '%s'",
@@ -2452,6 +2461,12 @@
   "commands.publish.failed": "Unable to host local game",
   "commands.publish.started": "Local game hosted on port %s",
   "commands.publish.success": "Multiplayer game is now hosted on port %s",
+  "commands.random.error.range_too_large": "The range of the random value must be at most 2147483646",
+  "commands.random.error.range_too_small": "The range of the random value must be at least 2",
+  "commands.random.reset.all.success": "Reset %s random sequence(s)",
+  "commands.random.reset.success": "Reset random sequence %s",
+  "commands.random.roll": "%s rolled %s (from %s to %s)",
+  "commands.random.sample.success": "Randomized value: %s",
   "commands.recipe.give.failed": "No new recipes were learned",
   "commands.recipe.give.success.multiple": "Unlocked %s recipes for %s players",
   "commands.recipe.give.success.single": "Unlocked %s recipes for %s",
@@ -2649,6 +2664,8 @@
   "connect.failed": "Failed to connect to the server",
   "connect.joining": "Joining world...",
   "connect.negotiating": "Negotiating...",
+  "connect.reconfiging": "Reconfiguring...",
+  "connect.reconfiguring": "Reconfiguring...",
   "container.barrel": "Barrel",
   "container.beacon": "Beacon",
   "container.blast_furnace": "Blast Furnace",
@@ -2679,7 +2696,9 @@
   "container.repair.cost": "Enchantment Cost: %1$s",
   "container.repair.expensive": "Too Expensive!",
   "container.shulkerBox": "Shulker Box",
+  "container.shulkerBox.itemCount": "%s x%s",
   "container.shulkerBox.more": "and %s more...",
+  "container.shulkerBox.unknownContents": "???????",
   "container.smoker": "Smoker",
   "container.spectatorCantOpen": "Unable to open. Loot not generated yet.",
   "container.stonecutter": "Stonecutter",
@@ -2779,6 +2798,8 @@
   "dataPack.bundle.description": "Enables experimental Bundle item",
   "dataPack.bundle.name": "Bundles",
   "dataPack.title": "Select Data Packs",
+  "dataPack.trade_rebalance.description": "Updated trades for Villagers",
+  "dataPack.trade_rebalance.name": "Villager Trade Rebalance",
   "dataPack.update_1_20.description": "New features and content for Minecraft 1.20",
   "dataPack.update_1_20.name": "Update 1.20",
   "dataPack.validation.back": "Go Back",
@@ -2792,90 +2813,90 @@
   "datapackFailure.safeMode.failed.title": "Failed to load world in Safe Mode.",
   "datapackFailure.title": "Errors in currently selected data packs prevented the world from loading.\nYou can either try to load it with only the vanilla data pack (\"safe mode\"), or go back to the title screen and fix it manually.",
   "death.attack.anvil": "%1$s was squashed by a falling anvil",
-  "death.attack.anvil.player": "%1$s was squashed by a falling anvil whilst fighting %2$s",
+  "death.attack.anvil.player": "%1$s was squashed by a falling anvil while fighting %2$s",
   "death.attack.arrow": "%1$s was shot by %2$s",
   "death.attack.arrow.item": "%1$s was shot by %2$s using %3$s",
   "death.attack.badRespawnPoint.link": "Intentional Game Design",
   "death.attack.badRespawnPoint.message": "%1$s was killed by %2$s",
   "death.attack.cactus": "%1$s was pricked to death",
-  "death.attack.cactus.player": "%1$s walked into a cactus whilst trying to escape %2$s",
+  "death.attack.cactus.player": "%1$s walked into a cactus while trying to escape %2$s",
   "death.attack.cramming": "%1$s was squished too much",
   "death.attack.cramming.player": "%1$s was squashed by %2$s",
   "death.attack.dragonBreath": "%1$s was roasted in dragon's breath",
   "death.attack.dragonBreath.player": "%1$s was roasted in dragon's breath by %2$s",
   "death.attack.drown": "%1$s drowned",
-  "death.attack.drown.player": "%1$s drowned whilst trying to escape %2$s",
+  "death.attack.drown.player": "%1$s drowned while trying to escape %2$s",
   "death.attack.dryout": "%1$s died from dehydration",
-  "death.attack.dryout.player": "%1$s died from dehydration whilst trying to escape %2$s",
+  "death.attack.dryout.player": "%1$s died from dehydration while trying to escape %2$s",
   "death.attack.even_more_magic": "%1$s was killed by even more magic",
   "death.attack.explosion": "%1$s blew up",
   "death.attack.explosion.player": "%1$s was blown up by %2$s",
   "death.attack.explosion.player.item": "%1$s was blown up by %2$s using %3$s",
   "death.attack.fall": "%1$s hit the ground too hard",
-  "death.attack.fall.player": "%1$s hit the ground too hard whilst trying to escape %2$s",
+  "death.attack.fall.player": "%1$s hit the ground too hard while trying to escape %2$s",
   "death.attack.fallingBlock": "%1$s was squashed by a falling block",
-  "death.attack.fallingBlock.player": "%1$s was squashed by a falling block whilst fighting %2$s",
+  "death.attack.fallingBlock.player": "%1$s was squashed by a falling block while fighting %2$s",
   "death.attack.fallingStalactite": "%1$s was skewered by a falling stalactite",
-  "death.attack.fallingStalactite.player": "%1$s was skewered by a falling stalactite whilst fighting %2$s",
+  "death.attack.fallingStalactite.player": "%1$s was skewered by a falling stalactite while fighting %2$s",
   "death.attack.fireball": "%1$s was fireballed by %2$s",
   "death.attack.fireball.item": "%1$s was fireballed by %2$s using %3$s",
   "death.attack.fireworks": "%1$s went off with a bang",
   "death.attack.fireworks.item": "%1$s went off with a bang due to a firework fired from %3$s by %2$s",
-  "death.attack.fireworks.player": "%1$s went off with a bang whilst fighting %2$s",
+  "death.attack.fireworks.player": "%1$s went off with a bang while fighting %2$s",
   "death.attack.flyIntoWall": "%1$s experienced kinetic energy",
-  "death.attack.flyIntoWall.player": "%1$s experienced kinetic energy whilst trying to escape %2$s",
+  "death.attack.flyIntoWall.player": "%1$s experienced kinetic energy while trying to escape %2$s",
   "death.attack.freeze": "%1$s froze to death",
   "death.attack.freeze.player": "%1$s was frozen to death by %2$s",
   "death.attack.generic": "%1$s died",
-  "death.attack.genericKill": "%1$s was killed",
-  "death.attack.genericKill.player": "%1$s was killed whilst fighting %2$s",
   "death.attack.generic.player": "%1$s died because of %2$s",
+  "death.attack.genericKill": "%1$s was killed",
+  "death.attack.genericKill.player": "%1$s was killed while fighting %2$s",
   "death.attack.hotFloor": "%1$s discovered the floor was lava",
   "death.attack.hotFloor.player": "%1$s walked into the danger zone due to %2$s",
   "death.attack.indirectMagic": "%1$s was killed by %2$s using magic",
   "death.attack.indirectMagic.item": "%1$s was killed by %2$s using %3$s",
   "death.attack.inFire": "%1$s went up in flames",
-  "death.attack.inFire.player": "%1$s walked into fire whilst fighting %2$s",
+  "death.attack.inFire.player": "%1$s walked into fire while fighting %2$s",
   "death.attack.inWall": "%1$s suffocated in a wall",
-  "death.attack.inWall.player": "%1$s suffocated in a wall whilst fighting %2$s",
+  "death.attack.inWall.player": "%1$s suffocated in a wall while fighting %2$s",
   "death.attack.lava": "%1$s tried to swim in lava",
   "death.attack.lava.player": "%1$s tried to swim in lava to escape %2$s",
   "death.attack.lightningBolt": "%1$s was struck by lightning",
-  "death.attack.lightningBolt.player": "%1$s was struck by lightning whilst fighting %2$s",
+  "death.attack.lightningBolt.player": "%1$s was struck by lightning while fighting %2$s",
   "death.attack.magic": "%1$s was killed by magic",
-  "death.attack.magic.player": "%1$s was killed by magic whilst trying to escape %2$s",
-  "death.attack.message_too_long": "Actually, the message was too long to deliver fully. Sorry! Here's stripped version: %s",
+  "death.attack.magic.player": "%1$s was killed by magic while trying to escape %2$s",
+  "death.attack.message_too_long": "Actually, the message was too long to deliver fully. Sorry! Here's a stripped version: %s",
   "death.attack.mob": "%1$s was slain by %2$s",
   "death.attack.mob.item": "%1$s was slain by %2$s using %3$s",
   "death.attack.onFire": "%1$s burned to death",
-  "death.attack.onFire.item": "%1$s was burnt to a crisp whilst fighting %2$s wielding %3$s",
-  "death.attack.onFire.player": "%1$s was burnt to a crisp whilst fighting %2$s",
-  "death.attack.outsideBorder": "%1$s left the confines of this world",
-  "death.attack.outsideBorder.player": "%1$s left the confines of this world whilst fighting %2$s",
+  "death.attack.onFire.item": "%1$s was burned to a crisp while fighting %2$s wielding %3$s",
+  "death.attack.onFire.player": "%1$s was burned to a crisp while fighting %2$s",
   "death.attack.outOfWorld": "%1$s fell out of the world",
   "death.attack.outOfWorld.player": "%1$s didn't want to live in the same world as %2$s",
+  "death.attack.outsideBorder": "%1$s left the confines of this world",
+  "death.attack.outsideBorder.player": "%1$s left the confines of this world while fighting %2$s",
   "death.attack.player": "%1$s was slain by %2$s",
   "death.attack.player.item": "%1$s was slain by %2$s using %3$s",
   "death.attack.sonic_boom": "%1$s was obliterated by a sonically-charged shriek",
-  "death.attack.sonic_boom.item": "%1$s was obliterated by a sonically-charged shriek whilst trying to escape %2$s wielding %3$s",
-  "death.attack.sonic_boom.player": "%1$s was obliterated by a sonically-charged shriek whilst trying to escape %2$s",
+  "death.attack.sonic_boom.item": "%1$s was obliterated by a sonically-charged shriek while trying to escape %2$s wielding %3$s",
+  "death.attack.sonic_boom.player": "%1$s was obliterated by a sonically-charged shriek while trying to escape %2$s",
   "death.attack.stalagmite": "%1$s was impaled on a stalagmite",
-  "death.attack.stalagmite.player": "%1$s was impaled on a stalagmite whilst fighting %2$s",
+  "death.attack.stalagmite.player": "%1$s was impaled on a stalagmite while fighting %2$s",
   "death.attack.starve": "%1$s starved to death",
-  "death.attack.starve.player": "%1$s starved to death whilst fighting %2$s",
+  "death.attack.starve.player": "%1$s starved to death while fighting %2$s",
   "death.attack.sting": "%1$s was stung to death",
   "death.attack.sting.item": "%1$s was stung to death by %2$s using %3$s",
   "death.attack.sting.player": "%1$s was stung to death by %2$s",
   "death.attack.sweetBerryBush": "%1$s was poked to death by a sweet berry bush",
-  "death.attack.sweetBerryBush.player": "%1$s was poked to death by a sweet berry bush whilst trying to escape %2$s",
-  "death.attack.thorns": "%1$s was killed trying to hurt %2$s",
-  "death.attack.thorns.item": "%1$s was killed by %3$s trying to hurt %2$s",
+  "death.attack.sweetBerryBush.player": "%1$s was poked to death by a sweet berry bush while trying to escape %2$s",
+  "death.attack.thorns": "%1$s was killed while trying to hurt %2$s",
+  "death.attack.thorns.item": "%1$s was killed by %3$s while trying to hurt %2$s",
   "death.attack.thrown": "%1$s was pummeled by %2$s",
   "death.attack.thrown.item": "%1$s was pummeled by %2$s using %3$s",
   "death.attack.trident": "%1$s was impaled by %2$s",
   "death.attack.trident.item": "%1$s was impaled by %2$s with %3$s",
   "death.attack.wither": "%1$s withered away",
-  "death.attack.wither.player": "%1$s withered away whilst fighting %2$s",
+  "death.attack.wither.player": "%1$s withered away while fighting %2$s",
   "death.attack.witherSkull": "%1$s was shot by a skull from %2$s",
   "death.attack.witherSkull.item": "%1$s was shot by a skull from %2$s using %3$s",
   "death.fell.accident.generic": "%1$s fell from a high place",
@@ -2893,6 +2914,7 @@
   "deathScreen.quit.confirm": "Are you sure you want to quit?",
   "deathScreen.respawn": "Respawn",
   "deathScreen.score": "Score",
+  "deathScreen.score.value": "Score: %s",
   "deathScreen.spectate": "Spectate World",
   "deathScreen.title": "You Died!",
   "deathScreen.title.hardcore": "Game Over!",
@@ -3242,9 +3264,13 @@
   "entity.not_summonable": "Can't summon entity of type %s",
   "event.minecraft.raid": "Raid",
   "event.minecraft.raid.defeat": "Defeat",
+  "event.minecraft.raid.defeat.full": "Raid - Defeat",
   "event.minecraft.raid.raiders_remaining": "Raiders Remaining: %s",
   "event.minecraft.raid.victory": "Victory",
+  "event.minecraft.raid.victory.full": "Raid - Victory",
   "filled_map.buried_treasure": "Buried Treasure Map",
+  "filled_map.explorer_jungle": "Jungle Explorer Map",
+  "filled_map.explorer_swamp": "Swamp Explorer Map",
   "filled_map.id": "Id #%s",
   "filled_map.level": "(Level %s/%s)",
   "filled_map.locked": "Locked",
@@ -3252,6 +3278,11 @@
   "filled_map.monument": "Ocean Explorer Map",
   "filled_map.scale": "Scaling at 1:%s",
   "filled_map.unknown": "Unknown Map",
+  "filled_map.village_desert": "Desert Village Map",
+  "filled_map.village_plains": "Plains Village Map",
+  "filled_map.village_savanna": "Savanna Village Map",
+  "filled_map.village_snowy": "Snowy Village Map",
+  "filled_map.village_taiga": "Taiga Village Map",
   "flat_world_preset.minecraft.bottomless_pit": "Bottomless Pit",
   "flat_world_preset.minecraft.classic_flat": "Classic Flat",
   "flat_world_preset.minecraft.desert": "Desert",
@@ -3304,6 +3335,8 @@
   "gamerule.doWardenSpawning": "Spawn Wardens",
   "gamerule.doWeatherCycle": "Update weather",
   "gamerule.drowningDamage": "Deal drowning damage",
+  "gamerule.enderPearlsVanishOnDeath": "Thrown ender pearls vanish on death",
+  "gamerule.enderPearlsVanishOnDeath.description": "Whether ender pearls thrown by a player vanish when that player dies.",
   "gamerule.fallDamage": "Deal fall damage",
   "gamerule.fireDamage": "Deal fire damage",
   "gamerule.forgiveDeadPlayers": "Forgive dead players",
@@ -3350,41 +3383,71 @@
   "generator.minecraft.single_biome_surface": "Single Biome",
   "generator.single_biome_caves": "Caves",
   "generator.single_biome_floating_islands": "Floating Islands",
+  "gui.abuseReport.comments": "Comments",
+  "gui.abuseReport.describe": "Sharing details will help us make a well-informed decision.",
+  "gui.abuseReport.discard.content": "If you leave, you'll lose this report and your comments.\nAre you sure you want to leave?",
+  "gui.abuseReport.discard.discard": "Leave and Discard Report",
+  "gui.abuseReport.discard.draft": "Save as Draft",
+  "gui.abuseReport.discard.return": "Continue Editing",
+  "gui.abuseReport.discard.title": "Discard report and comments?",
+  "gui.abuseReport.draft.content": "Would you like to continue editing the existing report or discard it and create a new one?",
+  "gui.abuseReport.draft.discard": "Discard",
+  "gui.abuseReport.draft.edit": "Continue Editing",
+  "gui.abuseReport.draft.quittotitle.content": "Would you like to continue editing it or discard it?",
+  "gui.abuseReport.draft.quittotitle.title": "You have a draft chat report that will be lost if you quit",
+  "gui.abuseReport.draft.title": "Edit draft chat report?",
   "gui.abuseReport.error.title": "Problem sending your report",
+  "gui.abuseReport.message": "Where did you observe the bad behavior?\nThis will help us in researching your case.",
+  "gui.abuseReport.more_comments": "Please describe what happened:",
+  "gui.abuseReport.name.reporting": "You are reporting \"%s\".",
+  "gui.abuseReport.name.title": "Report Player Name",
+  "gui.abuseReport.observed_what": "Why are you reporting this?",
+  "gui.abuseReport.read_info": "Learn About Reporting",
   "gui.abuseReport.reason.alcohol_tobacco_drugs": "Drugs or alcohol",
   "gui.abuseReport.reason.alcohol_tobacco_drugs.description": "Someone is encouraging others to partake in illegal drug related activities or encouraging underage drinking.",
   "gui.abuseReport.reason.child_sexual_exploitation_or_abuse": "Child sexual exploitation or abuse",
   "gui.abuseReport.reason.child_sexual_exploitation_or_abuse.description": "Someone is talking about or otherwise promoting indecent behavior involving children.",
-  "gui.abuseReport.reason.defamation_impersonation_false_information": "Defamation, impersonation, or false information",
-  "gui.abuseReport.reason.defamation_impersonation_false_information.description": "Someone is damaging someone else's reputation, pretending to be someone they're not, or sharing false information with the aim to exploit or mislead others.",
+  "gui.abuseReport.reason.defamation_impersonation_false_information": "Defamation",
+  "gui.abuseReport.reason.defamation_impersonation_false_information.description": "Someone is damaging your or someone else's reputation, for example sharing false information with the aim to exploit or mislead others.",
   "gui.abuseReport.reason.description": "Description:",
   "gui.abuseReport.reason.false_reporting": "False Reporting",
+  "gui.abuseReport.reason.generic": "I want to report them",
+  "gui.abuseReport.reason.generic.description": "I'm annoyed with them / they have done something I do not like.",
   "gui.abuseReport.reason.harassment_or_bullying": "Harassment or bullying",
   "gui.abuseReport.reason.harassment_or_bullying.description": "Someone is shaming, attacking, or bullying you or someone else. This includes when someone is repeatedly trying to contact you or someone else without consent or posting private personal information about you or someone else without consent (\"doxing\").",
   "gui.abuseReport.reason.hate_speech": "Hate speech",
   "gui.abuseReport.reason.hate_speech.description": "Someone is attacking you or another player based on characteristics of their identity, like religion, race, or sexuality.",
-  "gui.abuseReport.reason.imminent_harm": "Imminent harm - Threat to harm others",
+  "gui.abuseReport.reason.imminent_harm": "Threat of harm to others",
   "gui.abuseReport.reason.imminent_harm.description": "Someone is threatening to harm you or someone else in real life.",
   "gui.abuseReport.reason.narration": "%s: %s",
   "gui.abuseReport.reason.non_consensual_intimate_imagery": "Non-consensual intimate imagery",
   "gui.abuseReport.reason.non_consensual_intimate_imagery.description": "Someone is talking about, sharing, or otherwise promoting private and intimate images.",
-  "gui.abuseReport.reason.self_harm_or_suicide": "Imminent harm - Self-harm or suicide",
+  "gui.abuseReport.reason.self_harm_or_suicide": "Self-harm or suicide",
   "gui.abuseReport.reason.self_harm_or_suicide.description": "Someone is threatening to harm themselves in real life or talking about harming themselves in real life.",
   "gui.abuseReport.reason.terrorism_or_violent_extremism": "Terrorism or violent extremism",
   "gui.abuseReport.reason.terrorism_or_violent_extremism.description": "Someone is talking about, promoting, or threatening to commit acts of terrorism or violent extremism for political, religious, ideological, or other reasons.",
   "gui.abuseReport.reason.title": "Select Report Category",
+  "gui.abuseReport.report_sent_msg": "We\u2019ve successfully received your report. Thank you!\n\nOur team will review it as soon as possible.",
+  "gui.abuseReport.select_reason": "Select Report Category",
+  "gui.abuseReport.send": "Send Report",
+  "gui.abuseReport.send.comment_too_long": "Please shorten the comment",
   "gui.abuseReport.send.error_message": "An error was returned while sending your report:\n'%s'",
   "gui.abuseReport.send.generic_error": "Encountered an unexpected error while sending your report.",
   "gui.abuseReport.send.http_error": "An unexpected HTTP error occurred while sending your report.",
   "gui.abuseReport.send.json_error": "Encountered malformed payload while sending your report.",
+  "gui.abuseReport.send.no_reason": "Please select a report category",
   "gui.abuseReport.send.service_unavailable": "Unable to reach the Abuse Reporting service. Please make sure you are connected to the internet and try again.",
   "gui.abuseReport.sending.title": "Sending your report...",
   "gui.abuseReport.sent.title": "Report sent",
+  "gui.abuseReport.skin.title": "Report Player Skin",
+  "gui.abuseReport.title": "Report Player",
+  "gui.abuseReport.type.chat": "Chat Messages",
+  "gui.abuseReport.type.name": "Player Name",
+  "gui.abuseReport.type.skin": "Player Skin",
   "gui.acknowledge": "Acknowledge",
   "gui.advancements": "Advancements",
   "gui.all": "All",
   "gui.back": "Back",
-  "gui.copy_link_to_clipboard": "Copy Link to Clipboard",
   "gui.banned.description": "%s\n\n%s\n\nLearn more at the following link: %s",
   "gui.banned.description.permanent": "Your account is permanently banned, which means you can\u2019t play online or join Realms.",
   "gui.banned.description.reason": "We recently received a report for bad behavior by your account. Our moderators have now reviewed your case and identified it as %s, which goes against the Minecraft Community Standards.",
@@ -3393,6 +3456,8 @@
   "gui.banned.description.temporary": "%s Until then, you can\u2019t play online or join Realms.",
   "gui.banned.description.temporary.duration": "Your account is temporarily suspended and will be reactivated in %s.",
   "gui.banned.description.unknownreason": "We recently received a report for bad behavior by your account. Our moderators have now reviewed your case and identified that it goes against the Minecraft Community Standards.",
+  "gui.banned.name.description": "Your current name - \"%s\" - violates our Community Standards. You can play singleplayer, but will need to change your name to play online.\n\nLearn more or submit a case review at the following link: %s",
+  "gui.banned.name.title": "Name Not Allowed in Multiplayer",
   "gui.banned.reason.defamation_impersonation_false_information": "Impersonation or sharing information to exploit or mislead others",
   "gui.banned.reason.drugs": "References to illegal drugs",
   "gui.banned.reason.extreme_violence_or_gore": "Depictions of real-life excessive violence or gore",
@@ -3406,6 +3471,8 @@
   "gui.banned.reason.nudity_or_pornography": "Displaying lewd or pornographic material",
   "gui.banned.reason.sexually_inappropriate": "Topics or content of a sexual nature",
   "gui.banned.reason.spam_or_advertising": "Spam or advertising",
+  "gui.banned.skin.description": "Your current skin violates our Community Standards. You can still play with a default skin, or select a new one.\n\nLearn more or submit a case review at the following link: %s",
+  "gui.banned.skin.title": "Skin Not Allowed",
   "gui.banned.title.permanent": "Account permanently banned",
   "gui.banned.title.temporary": "Account temporarily suspended",
   "gui.cancel": "Cancel",
@@ -3434,7 +3501,7 @@
   "gui.chatReport.send.no_reason": "Please select a report category",
   "gui.chatReport.send.no_reported_messages": "Please select at least one chat message to report",
   "gui.chatReport.send.too_many_messages": "Trying to include too many messages in the report",
-  "gui.chatReport.title": "Report Player",
+  "gui.chatReport.title": "Report Player Chat",
   "gui.chatSelection.context": "Messages surrounding this selection will be included to provide additional context",
   "gui.chatSelection.fold": "%s message(s) hidden",
   "gui.chatSelection.heading": "%s %s",
@@ -3443,6 +3510,7 @@
   "gui.chatSelection.selected": "%s/%s message(s) selected",
   "gui.chatSelection.title": "Select Chat Messages to Report",
   "gui.continue": "Continue",
+  "gui.copy_link_to_clipboard": "Copy Link to Clipboard",
   "gui.days": "%s day(s)",
   "gui.done": "Done",
   "gui.down": "Down",
@@ -3459,6 +3527,7 @@
   "gui.ok": "Ok",
   "gui.proceed": "Proceed",
   "gui.recipebook.moreRecipes": "Right Click for More",
+  "gui.recipebook.page": "%s/%s",
   "gui.recipebook.search_hint": "Search...",
   "gui.recipebook.toggleRecipes.all": "Showing All",
   "gui.recipebook.toggleRecipes.blastable": "Showing Blastable",
@@ -3591,6 +3660,7 @@
   "item.minecraft.clay_ball": "Clay Ball",
   "item.minecraft.clock": "Clock",
   "item.minecraft.coal": "Coal",
+  "item.minecraft.coast_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.cocoa_beans": "Cocoa Beans",
   "item.minecraft.cod": "Raw Cod",
   "item.minecraft.cod_bucket": "Bucket of Cod",
@@ -3639,6 +3709,7 @@
   "item.minecraft.dragon_breath": "Dragon's Breath",
   "item.minecraft.dried_kelp": "Dried Kelp",
   "item.minecraft.drowned_spawn_egg": "Drowned Spawn Egg",
+  "item.minecraft.dune_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.echo_shard": "Echo Shard",
   "item.minecraft.egg": "Egg",
   "item.minecraft.elder_guardian_spawn_egg": "Elder Guardian Spawn Egg",
@@ -3656,6 +3727,7 @@
   "item.minecraft.experience_bottle": "Bottle o' Enchanting",
   "item.minecraft.explorer_pottery_shard": "Explorer Pottery Shard",
   "item.minecraft.explorer_pottery_sherd": "Explorer Pottery Sherd",
+  "item.minecraft.eye_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.feather": "Feather",
   "item.minecraft.fermented_spider_eye": "Fermented Spider Eye",
   "item.minecraft.filled_map": "Map",
@@ -3741,6 +3813,7 @@
   "item.minecraft.honeycomb": "Honeycomb",
   "item.minecraft.hopper_minecart": "Minecart with Hopper",
   "item.minecraft.horse_spawn_egg": "Horse Spawn Egg",
+  "item.minecraft.host_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.howl_pottery_shard": "Howl Pottery Shard",
   "item.minecraft.howl_pottery_sherd": "Howl Pottery Sherd",
   "item.minecraft.husk_spawn_egg": "Husk Spawn Egg",
@@ -3867,6 +3940,7 @@
   "item.minecraft.netherite_scrap": "Netherite Scrap",
   "item.minecraft.netherite_shovel": "Netherite Shovel",
   "item.minecraft.netherite_sword": "Netherite Sword",
+  "item.minecraft.netherite_upgrade_smithing_template": "Smithing Template",
   "item.minecraft.oak_boat": "Oak Boat",
   "item.minecraft.oak_chest_boat": "Oak Boat with Chest",
   "item.minecraft.ocelot_spawn_egg": "Ocelot Spawn Egg",
@@ -3937,6 +4011,7 @@
   "item.minecraft.rabbit_hide": "Rabbit Hide",
   "item.minecraft.rabbit_spawn_egg": "Rabbit Spawn Egg",
   "item.minecraft.rabbit_stew": "Rabbit Stew",
+  "item.minecraft.raiser_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.ravager_spawn_egg": "Ravager Spawn Egg",
   "item.minecraft.raw_copper": "Raw Copper",
   "item.minecraft.raw_gold": "Raw Gold",
@@ -3944,12 +4019,15 @@
   "item.minecraft.recovery_compass": "Recovery Compass",
   "item.minecraft.red_dye": "Red Dye",
   "item.minecraft.redstone": "Redstone Dust",
+  "item.minecraft.rib_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.rotten_flesh": "Rotten Flesh",
   "item.minecraft.saddle": "Saddle",
   "item.minecraft.salmon": "Raw Salmon",
   "item.minecraft.salmon_bucket": "Bucket of Salmon",
   "item.minecraft.salmon_spawn_egg": "Salmon Spawn Egg",
   "item.minecraft.scute": "Scute",
+  "item.minecraft.sentry_armor_trim_smithing_template": "Smithing Template",
+  "item.minecraft.shaper_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.sheaf_pottery_shard": "Sheaf Pottery Shard",
   "item.minecraft.sheaf_pottery_sherd": "Sheaf Pottery Sherd",
   "item.minecraft.shears": "Shears",
@@ -3976,6 +4054,7 @@
   "item.minecraft.shulker_shell": "Shulker Shell",
   "item.minecraft.shulker_spawn_egg": "Shulker Spawn Egg",
   "item.minecraft.sign": "Sign",
+  "item.minecraft.silence_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.silverfish_spawn_egg": "Silverfish Spawn Egg",
   "item.minecraft.skeleton_horse_spawn_egg": "Skeleton Horse Spawn Egg",
   "item.minecraft.skeleton_spawn_egg": "Skeleton Spawn Egg",
@@ -4000,11 +4079,13 @@
   "item.minecraft.sniffer_spawn_egg": "Sniffer Spawn Egg",
   "item.minecraft.snort_pottery_shard": "Snort Pottery Shard",
   "item.minecraft.snort_pottery_sherd": "Snort Pottery Sherd",
+  "item.minecraft.snout_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.snow_golem_spawn_egg": "Snow Golem Spawn Egg",
   "item.minecraft.snowball": "Snowball",
   "item.minecraft.spectral_arrow": "Spectral Arrow",
   "item.minecraft.spider_eye": "Spider Eye",
   "item.minecraft.spider_spawn_egg": "Spider Spawn Egg",
+  "item.minecraft.spire_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.splash_potion": "Splash Potion",
   "item.minecraft.splash_potion.effect.awkward": "Awkward Splash Potion",
   "item.minecraft.splash_potion.effect.empty": "Splash Uncraftable Potion",
@@ -4046,6 +4127,7 @@
   "item.minecraft.sweet_berries": "Sweet Berries",
   "item.minecraft.tadpole_bucket": "Bucket of Tadpole",
   "item.minecraft.tadpole_spawn_egg": "Tadpole Spawn Egg",
+  "item.minecraft.tide_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.tipped_arrow": "Tipped Arrow",
   "item.minecraft.tipped_arrow.effect.awkward": "Tipped Arrow",
   "item.minecraft.tipped_arrow.effect.empty": "Uncraftable Tipped Arrow",
@@ -4079,16 +4161,20 @@
   "item.minecraft.tropical_fish_spawn_egg": "Tropical Fish Spawn Egg",
   "item.minecraft.turtle_helmet": "Turtle Shell",
   "item.minecraft.turtle_spawn_egg": "Turtle Spawn Egg",
+  "item.minecraft.vex_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.vex_spawn_egg": "Vex Spawn Egg",
   "item.minecraft.villager_spawn_egg": "Villager Spawn Egg",
   "item.minecraft.vindicator_spawn_egg": "Vindicator Spawn Egg",
   "item.minecraft.wandering_trader_spawn_egg": "Wandering Trader Spawn Egg",
+  "item.minecraft.ward_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.warden_spawn_egg": "Warden Spawn Egg",
   "item.minecraft.warped_fungus_on_a_stick": "Warped Fungus on a Stick",
   "item.minecraft.water_bucket": "Water Bucket",
+  "item.minecraft.wayfinder_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.wheat": "Wheat",
   "item.minecraft.wheat_seeds": "Wheat Seeds",
   "item.minecraft.white_dye": "White Dye",
+  "item.minecraft.wild_armor_trim_smithing_template": "Smithing Template",
   "item.minecraft.witch_spawn_egg": "Witch Spawn Egg",
   "item.minecraft.wither_skeleton_spawn_egg": "Wither Skeleton Spawn Egg",
   "item.minecraft.wither_spawn_egg": "Wither Spawn Egg",
@@ -4283,6 +4369,7 @@
   "lanServer.start": "Start LAN World",
   "lanServer.title": "LAN World",
   "lectern.take_book": "Take Book",
+  "loading.progress": "%s%%",
   "mco.account.privacy.info": "Read more about Mojang and privacy laws",
   "mco.account.privacyinfo": "Mojang implements certain procedures to help protect children and their privacy including complying with the Children\u2019s Online Privacy Protection Act (COPPA) and General Data Protection Regulation (GDPR).\n\nYou may need to obtain parental consent before accessing your Realms account.\n\nIf you have an older Minecraft account (you log in with your username), you need to migrate the account to a Mojang account in order to access Realms.",
   "mco.account.update": "Update account",
@@ -4395,9 +4482,6 @@
   "mco.configure.world.spawnNPCs": "Spawn NPCs",
   "mco.configure.world.spawnProtection": "Spawn protection",
   "mco.configure.world.status": "Status",
-  "mco.configure.world.subscription.remaining.months.days": "%1$s month(s), %2$s day(s)",
-  "mco.configure.world.subscription.remaining.months": "%1$s month(s)",
-  "mco.configure.world.subscription.remaining.days": "%1$s day(s)",
   "mco.configure.world.subscription.day": "day",
   "mco.configure.world.subscription.days": "days",
   "mco.configure.world.subscription.expired": "Expired",
@@ -4407,6 +4491,9 @@
   "mco.configure.world.subscription.months": "months",
   "mco.configure.world.subscription.recurring.daysleft": "Renewed automatically in",
   "mco.configure.world.subscription.recurring.info": "Changes made to your Realms subscription such as stacking time or turning off recurring billing will not be reflected until your next bill date.",
+  "mco.configure.world.subscription.remaining.days": "%1$s day(s)",
+  "mco.configure.world.subscription.remaining.months": "%1$s month(s)",
+  "mco.configure.world.subscription.remaining.months.days": "%1$s month(s), %2$s day(s)",
   "mco.configure.world.subscription.start": "Start date",
   "mco.configure.world.subscription.timeleft": "Time left",
   "mco.configure.world.subscription.title": "Your subscription",
@@ -4414,8 +4501,8 @@
   "mco.configure.world.switch.slot": "Create world",
   "mco.configure.world.switch.slot.subtitle": "This world is empty, choose how to create your world",
   "mco.configure.world.title": "Configure realm:",
-  "mco.configure.world.uninvite.question": "Are you sure that you want to uninvite",
   "mco.configure.world.uninvite.player": "Are you sure that you want to uninvite '%s'?",
+  "mco.configure.world.uninvite.question": "Are you sure that you want to uninvite",
   "mco.configure.worlds.title": "Worlds",
   "mco.connect.authorizing": "Logging in...",
   "mco.connect.connecting": "Connecting to the realm...",
@@ -4438,6 +4525,7 @@
   "mco.download.preparing": "Preparing download",
   "mco.download.resourcePack.fail": "Failed to download resource pack!",
   "mco.download.speed": "(%s/s)",
+  "mco.download.speed.narration": "%s/s",
   "mco.download.title": "Downloading latest world",
   "mco.error.invalid.session.message": "Please try restarting Minecraft",
   "mco.error.invalid.session.title": "Invalid session",
@@ -4452,8 +4540,12 @@
   "mco.errorMessage.6009": "Invalid Realm description",
   "mco.errorMessage.connectionFailure": "An error occurred, please try again later.",
   "mco.errorMessage.generic": "An error occurred: ",
+  "mco.errorMessage.noDetails": "No error details provided",
   "mco.errorMessage.realmsService": "An error occurred (%s):",
+  "mco.errorMessage.realmsService.connectivity": "Could not connect to Realms: %s",
   "mco.errorMessage.realmsService.realmsError": "Realms (%s):",
+  "mco.errorMessage.realmsService.unknownCompatibility": "Could not check compatible version, got response: %s",
+  "mco.errorMessage.retry": "Retry operation",
   "mco.errorMessage.serviceBusy": "Realms is busy at the moment.\nPlease try connecting to your Realm again in a couple of minutes.",
   "mco.gui.button": "Button",
   "mco.gui.ok": "Ok",
@@ -4500,6 +4592,7 @@
   "mco.selectServer.configure": "Configure",
   "mco.selectServer.configureRealm": "Configure realm",
   "mco.selectServer.create": "Create realm",
+  "mco.selectServer.create.subtitle": "Select what world to put on your new realm",
   "mco.selectServer.expired": "Expired realm",
   "mco.selectServer.expiredList": "Your subscription has expired",
   "mco.selectServer.expiredRenew": "Renew",
@@ -4509,14 +4602,16 @@
   "mco.selectServer.expires.days": "Expires in %s days",
   "mco.selectServer.expires.soon": "Expires soon",
   "mco.selectServer.leave": "Leave realm",
+  "mco.selectServer.loading": "Loading Realms List",
   "mco.selectServer.mapOnlySupportedForVersion": "This map is unsupported in %s",
   "mco.selectServer.minigame": "Minigame:",
   "mco.selectServer.minigameNotSupportedInVersion": "Can't play this minigame in %s",
+  "mco.selectServer.noRealms": "You don't seem to have a Realm. Add a Realm to play together with your friends.",
   "mco.selectServer.note": "Note:",
   "mco.selectServer.open": "Open realm",
   "mco.selectServer.openserver": "Open realm",
   "mco.selectServer.play": "Play",
-  "mco.selectServer.popup": "Realms is a safe, simple way to enjoy an online Minecraft world with up to ten friends at a time.   It supports loads of minigames and plenty of custom worlds! Only the owner of the realm needs to pay.",
+  "mco.selectServer.popup": "Realms is a safe, simple way to enjoy an online Minecraft world with up to ten friends at a time. It supports loads of minigames and plenty of custom worlds! Only the owner of the realm needs to pay.",
   "mco.selectServer.purchase": "Add Realm",
   "mco.selectServer.trial": "Get a trial!",
   "mco.selectServer.uninitialized": "Click to start your new realm!",
@@ -4539,16 +4634,22 @@
   "mco.terms.sentence.1": "I agree to the Minecraft Realms",
   "mco.terms.sentence.2": "Terms of Service",
   "mco.terms.title": "Realms Terms of Service",
+  "mco.time.daysAgo": "%1$s day(s) ago",
+  "mco.time.hoursAgo": "%1$s hour(s) ago",
+  "mco.time.minutesAgo": "%1$s minute(s) ago",
+  "mco.time.now": "right now",
+  "mco.time.secondsAgo": "%1$s second(s) ago",
   "mco.trial.message.line1": "Want to get your own realm?",
   "mco.trial.message.line2": "Click here for more info!",
   "mco.upload.button.name": "Upload",
   "mco.upload.cancelled": "Upload cancelled",
   "mco.upload.close.failure": "Could not close your realm, please try again later",
   "mco.upload.done": "Upload done",
-  "mco.upload.entry.id": "%1$s (%2$s)",
   "mco.upload.entry.cheats": "%1$s, %2$s",
+  "mco.upload.entry.id": "%1$s (%2$s)",
   "mco.upload.failed": "Upload failed! (%s)",
   "mco.upload.hardcore": "Hardcore worlds can't be uploaded!",
+  "mco.upload.percent": "%s %%",
   "mco.upload.preparing": "Preparing your world",
   "mco.upload.select.world.none": "No singleplayer worlds found!",
   "mco.upload.select.world.subtitle": "Please select a singleplayer world to upload",
@@ -4557,11 +4658,6 @@
   "mco.upload.size.failure.line2": "It is %s. The maximum allowed size is %s.",
   "mco.upload.uploading": "Uploading '%s'",
   "mco.upload.verifying": "Verifying your world",
-  "mco.time.now": "right now",
-  "mco.time.secondsAgo": "%1$s second(s) ago",
-  "mco.time.minutesAgo": "%1$s minute(s) ago",
-  "mco.time.hoursAgo": "%1$s hour(s) ago",
-  "mco.time.daysAgo": "%1$s day(s) ago",
   "mco.warning": "Warning!",
   "mco.worldSlot.minigame": "Minigame",
   "menu.convertingLevel": "Converting world",
@@ -4599,6 +4695,7 @@
   "merchant.level.4": "Expert",
   "merchant.level.5": "Master",
   "merchant.next_level": "Trader's next level",
+  "merchant.title": "%s - %s",
   "merchant.trades": "Trades",
   "mirror.front_back": "\u2191 \u2193",
   "mirror.left_right": "\u2190 \u2192",
@@ -4648,6 +4745,7 @@
   "multiplayer.player.joined": "%s joined the game",
   "multiplayer.player.joined.renamed": "%s (formerly known as %s) joined the game",
   "multiplayer.player.left": "%s left the game",
+  "multiplayer.player.list.hp": "%shp",
   "multiplayer.player.list.narration": "Online players: %s",
   "multiplayer.requiredTexturePrompt.disconnect": "Server requires a custom resource pack",
   "multiplayer.requiredTexturePrompt.line1": "This server requires the use of a custom resource pack.",
@@ -4666,6 +4764,7 @@
   "multiplayer.status.ping": "%s ms",
   "multiplayer.status.ping.narration": "Ping %s milliseconds",
   "multiplayer.status.pinging": "Pinging...",
+  "multiplayer.status.player_count": "%s/%s",
   "multiplayer.status.player_count.narration": "%s out of %s players online",
   "multiplayer.status.quitting": "Quitting",
   "multiplayer.status.request_handled": "Status request has been handled",
@@ -4702,6 +4801,10 @@
   "narration.slider.usage.hovered": "Drag slider to change value",
   "narration.suggestion": "Selected suggestion %d out of %d: %s",
   "narration.suggestion.tooltip": "Selected suggestion %d out of %d: %s (%s)",
+  "narration.suggestion.usage.cycle.fixed": "Press Tab to cycle to the next suggestion",
+  "narration.suggestion.usage.cycle.hidable": "Press Tab to cycle to the next suggestion, or Escape to leave suggestions",
+  "narration.suggestion.usage.fill.fixed": "Press Tab to use suggestion",
+  "narration.suggestion.usage.fill.hidable": "Press Tab to use suggestion, or Escape to leave suggestions",
   "narration.tab_navigation.usage": "Press Ctrl and Tab to switch between tabs",
   "narrator.button.accessibility": "Accessibility",
   "narrator.button.difficulty_lock": "Difficulty lock",
@@ -4731,21 +4834,26 @@
   "optimizeWorld.info.converted": "Upgraded chunks: %s",
   "optimizeWorld.info.skipped": "Skipped chunks: %s",
   "optimizeWorld.info.total": "Total chunks: %s",
+  "optimizeWorld.progress.counter": "%s / %s",
+  "optimizeWorld.progress.percentage": "%s%%",
   "optimizeWorld.stage.counting": "Counting chunks...",
   "optimizeWorld.stage.failed": "Failed! :(",
   "optimizeWorld.stage.finished": "Finishing up...",
   "optimizeWorld.stage.upgrading": "Upgrading all chunks...",
   "optimizeWorld.title": "Optimizing World '%s'",
+  "options.accessibility": "Accessibility Settings...",
   "options.accessibility.high_contrast": "High Contrast",
   "options.accessibility.high_contrast.error.tooltip": "High Contrast resource pack is not available",
   "options.accessibility.high_contrast.tooltip": "Enhances the contrast of UI elements",
   "options.accessibility.link": "Accessibility Guide",
+  "options.accessibility.narrator_hotkey": "Narrator Hotkey",
+  "options.accessibility.narrator_hotkey.tooltip": "Allows the Narrator to be toggled on and off with 'Ctrl+B'",
   "options.accessibility.panorama_speed": "Panorama Scroll Speed",
   "options.accessibility.text_background": "Text Background",
   "options.accessibility.text_background_opacity": "Text Background Opacity",
   "options.accessibility.text_background.chat": "Chat",
   "options.accessibility.text_background.everywhere": "Everywhere",
-  "options.accessibility.title": "Accessibility Settings...",
+  "options.accessibility.title": "Accessibility Settings",
   "options.allowServerListing": "Allow Server Listings",
   "options.allowServerListing.tooltip": "Servers may list online players as part of their public status.\nWith this option off your name will not show up in such lists.",
   "options.ao": "Smooth Lighting",
@@ -4769,6 +4877,7 @@
   "options.biomeBlendRadius.11": "11x11 (Extreme)",
   "options.biomeBlendRadius.13": "13x13 (Showoff)",
   "options.biomeBlendRadius.15": "15x15 (Maximum)",
+  "options.chat": "Chat Settings...",
   "options.chat.color": "Colors",
   "options.chat.delay": "Chat Delay: %s seconds",
   "options.chat.delay_none": "Chat Delay: None",
@@ -4779,7 +4888,7 @@
   "options.chat.links.prompt": "Prompt on Links",
   "options.chat.opacity": "Chat Text Opacity",
   "options.chat.scale": "Chat Text Size",
-  "options.chat.title": "Chat Settings...",
+  "options.chat.title": "Chat Settings",
   "options.chat.visibility": "Chat",
   "options.chat.visibility.full": "Shown",
   "options.chat.visibility.hidden": "Hidden",
@@ -4825,6 +4934,7 @@
   "options.framerateLimit.max": "Unlimited",
   "options.fullscreen": "Fullscreen",
   "options.fullscreen.current": "Current",
+  "options.fullscreen.entry": "%sx%s@%s (%sbit)",
   "options.fullscreen.resolution": "Fullscreen Resolution",
   "options.fullscreen.unavailable": "Setting unavailable",
   "options.gamma": "Brightness",
@@ -4861,6 +4971,8 @@
   "options.key.hold": "Hold",
   "options.key.toggle": "Toggle",
   "options.language": "Language...",
+  "options.language.title": "Language",
+  "options.languageAccuracyWarning": "(Language translations may not be 100%% accurate)",
   "options.languageWarning": "Language translations may not be 100%% accurate",
   "options.mainHand": "Main Hand",
   "options.mainHand.left": "Left",
@@ -4939,12 +5051,14 @@
   "options.viewBobbing": "View Bobbing",
   "options.visible": "Shown",
   "options.vsync": "VSync",
-  "outOfMemory.message": "Minecraft has run out of memory.\n\nThis could be caused by a bug in the game or by the Java Virtual Machine not being allocated enough memory.\n\nTo prevent level corruption, the current game has quit. We've tried to free up enough memory to let you go back to the main menu and back to playing, but this may not have worked.\n\nPlease restart the game if you see this message again.",
+  "outOfMemory.message": "Minecraft has run out of memory.\n\nThis could be caused by a bug in the game or by the Java Virtual Machine not being allocated enough memory.\n\nTo prevent world corruption, the current game has quit. We've tried to free up enough memory to let you go back to the main menu and back to playing, but this may not have worked.\n\nPlease restart the game if you see this message again.",
   "outOfMemory.title": "Out of memory!",
   "pack.available.title": "Available",
   "pack.copyFailure": "Failed to copy packs",
   "pack.dropConfirm": "Do you want to add the following packs to Minecraft?",
   "pack.dropInfo": "Drag and drop files into this window to add packs",
+  "pack.dropRejected.message": "The following entries were not valid packs and were not copied:\n %s",
+  "pack.dropRejected.title": "Non-pack entries",
   "pack.folderInfo": "(Place pack files here)",
   "pack.incompatible": "Incompatible",
   "pack.incompatible.confirm.new": "This pack was made for a newer version of Minecraft and may not work correctly.",
@@ -5165,7 +5279,7 @@
   "selectWorld.import_worldgen_settings.select_file": "Select settings file (.json)",
   "selectWorld.incompatible_series": "Created by an incompatible version",
   "selectWorld.load_folder_access": "Unable to read or access folder where game worlds are saved!",
-  "selectWorld.loading_list": "Loading world list",
+  "selectWorld.loading_list": "Loading World List",
   "selectWorld.locked": "Locked by another running instance of Minecraft",
   "selectWorld.mapFeatures": "Generate Structures",
   "selectWorld.mapFeatures.info": "Villages, Shipwrecks, etc.",
@@ -5313,6 +5427,7 @@
   "stat.minecraft.walk_one_cm": "Distance Walked",
   "stat.minecraft.walk_under_water_one_cm": "Distance Walked under Water",
   "stat.mobsButton": "Mobs",
+  "stats.none": "-",
   "stats.tooltip.type.statistic": "Statistic",
   "structure_block.button.detect_size": "DETECT",
   "structure_block.button.load": "LOAD",
@@ -5454,6 +5569,7 @@
   "subtitles.block.sniffer_egg.crack": "Sniffer Egg cracks",
   "subtitles.block.sniffer_egg.hatch": "Sniffer Egg hatches",
   "subtitles.block.sniffer_egg.plop": "Sniffer plops",
+  "subtitles.block.sponge.absorb": "Sponge sucks",
   "subtitles.block.sweet_berry_bush.pick_berries": "Berries pop",
   "subtitles.block.trapdoor.toggle": "Trapdoor creaks",
   "subtitles.block.tripwire.attach": "Tripwire attaches",
@@ -6094,8 +6210,12 @@
   "subtitles.ui.loom.take_result": "Loom used",
   "subtitles.ui.stonecutter.take_result": "Stonecutter used",
   "subtitles.weather.rain": "Rain falls",
-  "symlink_warning.title": "World folder contains symbolic links",
   "symlink_warning.message": "Loading worlds from folders with symbolic links can be unsafe if you don't know exactly what you are doing. Please visit %s to learn more.",
+  "symlink_warning.message.pack": "Loading packs with symbolic links can be unsafe if you don't know exactly what you are doing. Please visit %s to learn more.",
+  "symlink_warning.message.world": "Loading worlds from folders with symbolic links can be unsafe if you don't know exactly what you are doing. Please visit %s to learn more.",
+  "symlink_warning.title": "World folder contains symbolic links",
+  "symlink_warning.title.pack": "Added pack(s) contain(s) symbolic links",
+  "symlink_warning.title.world": "The world folder contains symbolic links",
   "team.collision.always": "Always",
   "team.collision.never": "Never",
   "team.collision.pushOtherTeams": "Push other teams",
@@ -6106,6 +6226,7 @@
   "team.visibility.hideForOwnTeam": "Hide for own team",
   "team.visibility.never": "Never",
   "telemetry_info.button.give_feedback": "Give Feedback",
+  "telemetry_info.button.privacy_statement": "Privacy Statement",
   "telemetry_info.button.show_data": "Open My Data",
   "telemetry_info.property_title": "Included Data",
   "telemetry_info.screen.description": "Collecting this data helps us improve Minecraft by guiding us in directions that are relevant to our players.\nYou can also send in additional feedback to help us keep improving Minecraft.",
@@ -6159,7 +6280,9 @@
   "title.32bit.deprecation.realms": "Minecraft will soon require a 64-bit system, which will prevent you from playing or using Realms on this device. You will need to manually cancel any Realms subscription.",
   "title.32bit.deprecation.realms.check": "Do not show this screen again",
   "title.32bit.deprecation.realms.header": "32-bit system detected",
+  "title.credits": "Copyright Mojang AB. Do not distribute!",
   "title.multiplayer.disabled": "Multiplayer is disabled. Please check your Microsoft account settings.",
+  "title.multiplayer.disabled.banned.name": "You must change your name before you can play online",
   "title.multiplayer.disabled.banned.permanent": "Your account is permanently suspended from online play",
   "title.multiplayer.disabled.banned.temporary": "Your account is temporarily suspended from online play",
   "title.multiplayer.lan": "Multiplayer (LAN)",