Create/Update assets for version 1.16.5

.github\FUNDING.yml

@@ -1,3 +0,0 @@
-github: InventivetalentDev
-patreon: inventivetalent
-custom: ["https://www.paypal.me/inventivetalent", "https://donation.inventivetalent.org"]

assets/minecraft/blockstates/chain.json

@@ -1,7 +1,16 @@
 {
   "variants": {
-    "": {
+    "axis=x": {
+      "model": "minecraft:block/chain",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
       "model": "minecraft:block/chain"
+    },
+    "axis=z": {
+      "model": "minecraft:block/chain",
+      "x": 90
     }
   }
 }

assets/minecraft/blockstates/redstone_wire.json

@@ -4,8 +4,8 @@
       "when": {
         "OR": [
           {
-            "south": "none",
             "north": "none",
+            "south": "none",
             "east": "none",
             "west": "none"
           },

assets/minecraft/font/default.json

@@ -67,7 +67,9 @@
                 "\u01bd\u01be\u0221\u0234\u0235\u0236\u023a\u2c65\u023b\u023c\u0246\u0247\u023e\u2c66\u0241\u0242",
                 "\u0243\u0244\u0248\u0249\u024a\u024b\u024c\u024d\u024e\u024f\u1e9c\u1e9d\u1efc\u1efd\u1efe\u1eff",
                 "\ua7a8\ua7a9\ud800\udf30\ud800\udf31\ud800\udf32\ud800\udf33\ud800\udf34\ud800\udf35\ud800\udf36\ud800\udf37\ud800\udf38\ud800\udf39\ud800\udf3a\ud800\udf3b\ud800\udf3c\ud800\udf3d",
-                "\ud800\udf3e\ud800\udf3f\ud800\udf40\ud800\udf41\ud800\udf42\ud800\udf43\ud800\udf44\ud800\udf45\ud800\udf46\ud800\udf47\ud800\udf48\ud800\udf49\ud800\udf4a\ud83c\udf27\ud83d\udd25\ud83c\udf0a"
+                "\ud800\udf3e\ud800\udf3f\ud800\udf40\ud800\udf41\ud800\udf42\ud800\udf43\ud800\udf44\ud800\udf45\ud800\udf46\ud800\udf47\ud800\udf48\ud800\udf49\ud800\udf4a\ud83c\udf27\ud83d\udd25\ud83c\udf0a",
+                "\u2150\u2151\u2155\u2156\u2157\u2159\u215a\u215f\u2189\ud83d\udde1\ud83c\udff9\ud83e\ude93\ud83d\udd31\ud83c\udfa3\ud83e\uddea\u2697",
+                "\u2bea\u2beb\u2c6d\ud83d\udee1\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
             ]
         },
         {
@@ -150,7 +152,7 @@
                 "\u1faf\u1fa7\u1ffc\u1ff3\u1ff2\u1ff4\u1ff6\u1ff7\u262f\u2610\u2611\u2612\u018d\u01ba\u2c7e\u023f",
                 "\u2c7f\u0240\u1d80\ua7c4\ua794\u1d81\u1d82\u1d83\ua795\u1d84\u1d85\u1d86\u1d87\u1d88\u1d89\u1d8a",
                 "\u1d8b\u1d8c\u1d8d\ua7c6\u1d8e\u1d8f\u1d90\u1d92\u1d93\u1d94\u1d95\u1d96\u1d97\u1d98\u1d99\u1d9a",
-                "\u1e9a\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+                "\u1e9a\u2152\u2158\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
             ]
         },
         {

assets/minecraft/gpu_warnlist.json

@@ -1,13 +1,7 @@
 {
-  "renderer" : [
-    "\\bMesa\\b",
-    "\\bGallium\\b"
-  ],
+  "renderer" : [],
   "version" : [
-    "^([0-2]\\.[0-9])",
-    "\\bMesa\\b"
+    "^([0-2]\\.[0-9])"
   ],
-  "vendor" : [
-    "\\bX\\.Org\\b"
-  ]
+  "vendor" : []
 }

assets/minecraft/lang/en_us.json

@@ -21,8 +21,8 @@
   "gui.done": "Done",
   "gui.cancel": "Cancel",
   "gui.back": "Back",
-  "gui.toTitle": "Back to title screen",
-  "gui.toMenu": "Back to server list",
+  "gui.toTitle": "Back to Title Screen",
+  "gui.toMenu": "Back to Server List",
   "gui.up": "Up",
   "gui.down": "Down",
   "gui.yes": "Yes",
@@ -31,13 +31,35 @@
   "gui.all": "All",
   "gui.ok": "Ok",
   "gui.proceed": "Proceed",
-  "gui.recipebook.moreRecipes": "Right Click for more",
+  "gui.recipebook.moreRecipes": "Right Click for More",
   "gui.recipebook.search_hint": "Search...",
-  "gui.recipebook.toggleRecipes.all": "Showing all",
-  "gui.recipebook.toggleRecipes.craftable": "Showing craftable",
-  "gui.recipebook.toggleRecipes.smeltable": "Showing smeltable",
-  "gui.recipebook.toggleRecipes.blastable": "Showing blastable",
-  "gui.recipebook.toggleRecipes.smokable": "Showing smokable",
+  "gui.recipebook.toggleRecipes.all": "Showing All",
+  "gui.recipebook.toggleRecipes.craftable": "Showing Craftable",
+  "gui.recipebook.toggleRecipes.smeltable": "Showing Smeltable",
+  "gui.recipebook.toggleRecipes.blastable": "Showing Blastable",
+  "gui.recipebook.toggleRecipes.smokable": "Showing Smokable",
+  "gui.socialInteractions.title": "Social Interactions",
+  "gui.socialInteractions.tab_all": "All",
+  "gui.socialInteractions.tab_hidden": "Hidden",
+  "gui.socialInteractions.tab_blocked": "Blocked",
+  "gui.socialInteractions.blocking_hint": "Manage with Microsoft account",
+  "gui.socialInteractions.status_hidden": "Hidden",
+  "gui.socialInteractions.status_blocked": "Blocked",
+  "gui.socialInteractions.status_offline": "Offline",
+  "gui.socialInteractions.status_hidden_offline": "Hidden - Offline",
+  "gui.socialInteractions.status_blocked_offline": "Blocked - Offline",
+  "gui.socialInteractions.server_label.single": "%s - %s player",
+  "gui.socialInteractions.server_label.multiple": "%s - %s players",
+  "gui.socialInteractions.search_hint": "Search...",
+  "gui.socialInteractions.search_empty": "Couldn't find any players with that name",
+  "gui.socialInteractions.empty_hidden": "No players hidden in chat",
+  "gui.socialInteractions.empty_blocked": "No blocked players in chat",
+  "gui.socialInteractions.hide": "Hide in Chat",
+  "gui.socialInteractions.show": "Show in Chat",
+  "gui.socialInteractions.hidden_in_chat": "Chat messages from %s will be hidden",
+  "gui.socialInteractions.shown_in_chat": "Chat messages from %s will be shown",
+  "gui.socialInteractions.tooltip.hide": "Hide messages from %s in chat",
+  "gui.socialInteractions.tooltip.show": "Show messages from %s in chat",
   "gui.narrate.button": "%s button",
   "gui.narrate.slider": "%s slider",
   "gui.narrate.editBox": "%s edit box: %s",
@@ -70,9 +92,9 @@
   "menu.shareToLan": "Open to LAN",
   "menu.sendFeedback": "Give Feedback",
   "menu.reportBugs": "Report Bugs",
-  "menu.paused": "Game paused",
+  "menu.paused": "Game Paused",
   "menu.modded": " (Modded)",
-  "optimizeWorld.confirm.title": "Optimize world",
+  "optimizeWorld.confirm.title": "Optimize World",
   "optimizeWorld.confirm.description": "This will attempt to optimize your world by making sure all data is stored in the most recent game format. This can take a very long time, depending on your world. Once done, your world may play faster but will no longer be compatible with older versions of the game. Are you sure you wish to proceed?",
   "optimizeWorld.title": "Optimizing World '%s'",
   "optimizeWorld.stage.counting": "Counting chunks...",
@@ -231,7 +253,7 @@
   "createWorld.customize.custom.preset.caveChaos": "Caves of Chaos",
   "createWorld.customize.custom.preset.goodLuck": "Good Luck",
   "createWorld.preparing": "Preparing for world creation...",
-  "datapackFailure.title":  "Errors in currently selected datapacks prevented world from loading.\nYou can either try to load only with vanilla datapack (\"safe mode\") or go back to title screen and fix it manually.",
+  "datapackFailure.title":  "Errors in currently selected datapacks 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.",
   "datapackFailure.safeMode": "Safe Mode",
   "editGamerule.title": "Edit Game Rules",
   "editGamerule.default": "Default: %s",
@@ -267,16 +289,14 @@
   "selectWorld.gameMode.adventure.line2": "be added or removed",
   "selectWorld.moreWorldOptions": "More World Options...",
   "selectWorld.gameRules": "Game Rules",
-  "selectWorld.mapFeatures": "Generate Structures:",
+  "selectWorld.mapFeatures": "Generate Structures",
   "selectWorld.mapFeatures.info": "Villages, dungeons etc.",
   "selectWorld.mapType": "World Type:",
   "selectWorld.mapType.normal": "Normal",
-  "selectWorld.allowCommands": "Allow Cheats:",
+  "selectWorld.allowCommands": "Allow Cheats",
   "selectWorld.allowCommands.info": "Commands like /gamemode, /experience",
   "selectWorld.dataPacks": "Data Packs",
-  "selectWorld.hardcoreMode": "Hardcore:",
-  "selectWorld.hardcoreMode.info": "World is deleted upon death",
-  "selectWorld.bonusItems": "Bonus Chest:",
+  "selectWorld.bonusItems": "Bonus Chest",
   "selectWorld.import_worldgen_settings": "Import Settings",
   "selectWorld.import_worldgen_settings.select_file": "Select settings file (.json)",
   "selectWorld.import_worldgen_settings.failure": "Error importing settings",
@@ -321,7 +341,7 @@
   "lanServer.start": "Start LAN World",
   "lanServer.otherPlayers": "Settings for Other Players",
   "multiplayerWarning.header": "Caution: Third-Party Online Play",
-  "multiplayerWarning.message": "Caution: Online play is offered by third-party servers that are not owned, operated, or supervised by Mojang or Microsoft. During online play, you may be exposed to unmoderated chat messages or other types of user-generated content that may not be suitable for everyone.",
+  "multiplayerWarning.message": "Caution: Online play is offered by third-party servers that are not owned, operated, or supervised by Mojang Studios or Microsoft. During online play, you may be exposed to unmoderated chat messages or other types of user-generated content that may not be suitable for everyone.",
   "multiplayerWarning.check": "Do not show this screen again",
   "multiplayer.title": "Play Multiplayer",
   "multiplayer.texturePrompt.line1": "This server recommends the use of a custom resource pack.",
@@ -337,14 +357,13 @@
   "multiplayer.status.cancelled": "Cancelled",
   "multiplayer.status.cannot_connect": "Can't connect to server",
   "multiplayer.status.cannot_resolve": "Can't resolve hostname",
-  "multiplayer.status.client_out_of_date": "Client out of date!",
   "multiplayer.status.finished": "Finished",
+  "multiplayer.status.incompatible": "Incompatible version!",
   "multiplayer.status.no_connection": "(no connection)",
   "multiplayer.status.ping": "%s ms",
   "multiplayer.status.old": "Old",
   "multiplayer.status.pinging": "Pinging...",
   "multiplayer.status.quitting": "Quitting",
-  "multiplayer.status.server_out_of_date": "Server out of date!",
   "multiplayer.status.unknown": "???",
   "multiplayer.status.unrequested": "Received unrequested status",
   "multiplayer.status.request_handled": "Status request has been handled",
@@ -364,8 +383,9 @@
   "multiplayer.disconnect.invalid_vehicle_movement": "Invalid move vehicle packet received",
   "multiplayer.disconnect.ip_banned": "You have been IP banned from this server",
   "multiplayer.disconnect.kicked": "Kicked by an operator",
-  "multiplayer.disconnect.outdated_client": "Outdated client! Please use %s",
-  "multiplayer.disconnect.outdated_server": "Outdated server! I'm still on %s",
+  "multiplayer.disconnect.incompatible": "Incompatible client! Please use %s",
+  "multiplayer.disconnect.outdated_client": "Incompatible client! Please use %s",
+  "multiplayer.disconnect.outdated_server": "Incompatible client! Please use %s",
   "multiplayer.disconnect.server_shutdown": "Server closed",
   "multiplayer.disconnect.slow_login": "Took too long to log in",
   "multiplayer.disconnect.unverified_username": "Failed to verify username!",
@@ -373,6 +393,8 @@
   "multiplayer.disconnect.server_full": "The server is full!",
   "multiplayer.disconnect.name_taken": "That name is already taken",
   "multiplayer.disconnect.unexpected_query_response": "Unexpected custom data from client",
+  "multiplayer.disconnect.missing_tags": "Incomplete set of tags received from server.\nPlease contact server operator.",
+  "multiplayer.socialInteractions.not_available": "Social Interactions are only available in Multiplayer worlds",
   "chat.editBox": "chat",
   "chat.cannotSend": "Cannot send chat message",
   "chat.type.text": "<%s> %s",
@@ -395,6 +417,7 @@
   "chat.coordinates": "%s, %s, %s",
   "chat.coordinates.tooltip": "Click to teleport",
   "chat.queue": "[+%s pending lines]",
+  "chat.square_brackets": "[%s]",
   "menu.playdemo": "Play Demo World",
   "menu.resetdemo": "Reset Demo World",
   "demo.day.1": "This demo will last five game days. Do your best!",
@@ -433,10 +456,12 @@
   "disconnect.loginFailedInfo": "Failed to log in: %s",
   "disconnect.loginFailedInfo.serversUnavailable": "The authentication servers are currently down for maintenance.",
   "disconnect.loginFailedInfo.invalidSession": "Invalid session (Try restarting your game and the launcher)",
+  "disconnect.loginFailedInfo.insufficientPrivileges": "Multiplayer is disabled. Please check your Microsoft account settings.",
   "disconnect.quitting": "Quitting",
   "disconnect.endOfStream": "End of stream",
   "disconnect.overflow": "Buffer overflow",
   "disconnect.spam": "Kicked for spamming",
+  "disconnect.exceeded_packet_rate": "Kicked for exceeding packet rate limit",
   "soundCategory.master": "Master Volume",
   "soundCategory.music": "Music",
   "soundCategory.record": "Jukebox/Note Blocks",
@@ -447,9 +472,15 @@
   "soundCategory.block": "Blocks",
   "soundCategory.ambient": "Ambient/Environment",
   "soundCategory.voice": "Voice/Speech",
-  "record.nowPlaying": "Now playing: %s",
+  "record.nowPlaying": "Now Playing: %s",
   "options.off": "OFF",
   "options.on": "ON",
+  "options.off.composed": "%s: OFF",
+  "options.on.composed": "%s: ON",
+  "options.generic_value": "%s: %s",
+  "options.pixel_value": "%s: %spx",
+  "options.percent_value": "%s: %s%%",
+  "options.percent_add_value": "%s: +%s%%",
   "options.visible": "Shown",
   "options.hidden": "Hidden",
   "options.title": "Options",
@@ -467,6 +498,12 @@
   "options.fov": "FOV",
   "options.fov.min": "Normal",
   "options.fov.max": "Quake Pro",
+  "options.screenEffectScale": "Distortion Effects",
+  "options.screenEffectScale.off": "Off",
+  "options.screenEffectScale.tooltip": "Strength of nausea and Nether portal screen distortion effects.\nAt lower values, the nausea effect is replaced with a green overlay.",
+  "options.fovEffectScale": "FOV Effects",
+  "options.fovEffectScale.off": "Off",
+  "options.fovEffectScale.tooltip": "Controls how much the field of view can change with speed effects.",
   "options.biomeBlendRadius": "Biome Blend",
   "options.biomeBlendRadius.1": "OFF (Fastest)",
   "options.biomeBlendRadius.3": "3x3 (Fast)",
@@ -484,7 +521,6 @@
   "options.sensitivity.max": "HYPERSPEED!!!",
   "options.renderDistance": "Render Distance",
   "options.entityDistanceScaling": "Entity Distance",
-  "options.entityDistancePercent": "%s%%",
   "options.viewBobbing": "View Bobbing",
   "options.ao": "Smooth Lighting",
   "options.ao.off": "OFF",
@@ -501,19 +537,19 @@
   "options.difficulty.hard": "Hard",
   "options.difficulty.hardcore": "Hardcore",
   "options.graphics": "Graphics",
-  "options.graphics.fabulous.tooltip": "%s graphics uses screen shaders for drawing weather, clouds and particles behind translucent blocks and water.\nThis may severely impact performance for portable devices and 4K displays.",
+  "options.graphics.fabulous.tooltip": "%s graphics uses screen shaders for drawing weather, clouds, and particles behind translucent blocks and water.\nThis may severely impact performance for portable devices and 4K displays.",
   "options.graphics.fabulous": "Fabulous!",
-  "options.graphics.fancy.tooltip": "Fancy graphics balances performance and quality for the majority of machines.\nWeather, clouds and particles may not appear behind translucent blocks or water.",
+  "options.graphics.fancy.tooltip": "Fancy graphics balances performance and quality for the majority of machines.\nWeather, clouds, and particles may not appear behind translucent blocks or water.",
   "options.graphics.fancy": "Fancy",
-  "options.graphics.fast.tooltip": "Fast graphics reduces the amount of visible rain and snow.\nTransparency effects are disabled for various blocks such as tree-leaves.",
+  "options.graphics.fast.tooltip": "Fast graphics reduces the amount of visible rain and snow.\nTransparency effects are disabled for various blocks such as leaves.",
   "options.graphics.fast": "Fast",
   "options.graphics.warning.title": "Graphics Device Unsupported",
   "options.graphics.warning.message": "Your graphics device is detected as unsupported for the %s graphics option.\n\nYou may ignore this and continue, however support will not be provided for your device if you choose to use %s graphics.",
   "options.graphics.warning.renderer": "Renderer detected: [%s]",
   "options.graphics.warning.vendor": "Vendor detected: [%s]",
   "options.graphics.warning.version": "OpenGL Version detected: [%s]",
-  "options.graphics.warning.accept": "Continue without support",
-  "options.graphics.warning.cancel": "Take me back",
+  "options.graphics.warning.accept": "Continue without Support",
+  "options.graphics.warning.cancel": "Take me Back",
   "options.clouds.fancy": "Fancy",
   "options.clouds.fast": "Fast",
   "options.guiScale": "GUI Scale",
@@ -545,6 +581,7 @@
   "options.accessibility.text_background.chat": "Chat",
   "options.accessibility.text_background.everywhere": "Everywhere",
   "options.accessibility.text_background_opacity": "Text Background Opacity",
+  "options.accessibility.link": "Accessibility Guide",
   "options.key.toggle": "Toggle",
   "options.key.hold": "Hold",
   "options.skinCustomisation": "Skin Customization...",
@@ -591,6 +628,8 @@
   "options.fullscreen.current": "Current",
   "options.mipmapLevels": "Mipmap Levels",
   "options.forceUnicodeFont": "Force Unicode Font",
+  "options.hideMatchedNames": "Hide Matched Names",
+  "options.hideMatchedNames.tooltip": "3rd-party Servers may send chat messages in non-standard formats.\nWith this option on: hidden players will be matched based on chat sender names.",
   "narrator.toast.disabled": "Narrator Disabled",
   "narrator.toast.enabled": "Narrator Enabled",
   "difficulty.lock.title": "Lock World Difficulty",
@@ -599,7 +638,7 @@
   "title.oldgl.eol.line2": "playing future updates as OpenGL 2.0 will be required!",
   "title.oldgl.deprecation.line1": "Old graphics card detected; this may prevent you from",
   "title.oldgl.deprecation.line2": "playing in the future as OpenGL 3.2 will be required!",
-  "title.multiplayer.disabled": "Multiplayer is disabled, please check your launcher settings.",
+  "title.multiplayer.disabled": "Multiplayer is disabled. Please check your Microsoft account settings.",
   "controls.title": "Controls",
   "controls.reset": "Reset",
   "controls.resetAll": "Reset Keys",
@@ -619,6 +658,7 @@
   "key.use": "Use Item/Place Block",
   "key.pickItem": "Pick Block",
   "key.command": "Open Command",
+  "key.socialInteractions": "Social Interactions Screen",
   "key.screenshot": "Take Screenshot",
   "key.togglePerspective": "Toggle Perspective",
   "key.smoothCamera": "Toggle Cinematic Camera",
@@ -739,9 +779,9 @@
   "pack.incompatible.new": "(Made for a newer version of Minecraft)",
   "pack.incompatible.confirm.title": "Are you sure you want to load this pack?",
   "pack.incompatible.confirm.old": "This pack was made for an older version of Minecraft and may no longer work correctly.",
-  "pack.incompatible.confirm.new": "This pack was made for a newer version of Minecraft and may no longer work correctly.",
+  "pack.incompatible.confirm.new": "This pack was made for a newer version of Minecraft and may not work correctly.",
   "pack.dropInfo": "Drag and drop files into this window to add packs",
-  "pack.dropConfirm": "Do you want to add following packs to Minecraft?",
+  "pack.dropConfirm": "Do you want to add the following packs to Minecraft?",
   "pack.copyFailure": "Failed to copy packs",
   "pack.nameAndSource": "%s (%s)",
   "pack.openFolder": "Open Pack Folder",
@@ -1750,6 +1790,7 @@
   "item.minecraft.parrot_spawn_egg": "Parrot Spawn Egg",
   "item.minecraft.pig_spawn_egg": "Pig Spawn Egg",
   "item.minecraft.piglin_spawn_egg": "Piglin Spawn Egg",
+  "item.minecraft.piglin_brute_spawn_egg": "Piglin Brute Spawn Egg",
   "item.minecraft.pillager_spawn_egg": "Pillager Spawn Egg",
   "item.minecraft.phantom_spawn_egg": "Phantom Spawn Egg",
   "item.minecraft.polar_bear_spawn_egg": "Polar Bear Spawn Egg",
@@ -1901,7 +1942,7 @@
   "container.enchant.lapis.many": "%s Lapis Lazuli",
   "container.enchant.level.one": "1 Enchantment Level",
   "container.enchant.level.many": "%s Enchantment Levels",
-  "container.enchant.level.requirement": "Level requirement: %s",
+  "container.enchant.level.requirement": "Level Requirement: %s",
   "container.enchant.clue": "%s . . . ?",
   "container.repair": "Repair & Name",
   "container.repair.cost": "Enchantment Cost: %1$s",
@@ -1938,10 +1979,10 @@
   "structure_block.hover.load": "Load: %s",
   "structure_block.hover.data": "Data: %s",
   "structure_block.hover.corner": "Corner: %s",
-  "structure_block.mode_info.save": "Save mode - write to file",
-  "structure_block.mode_info.load": "Load mode - load from file",
-  "structure_block.mode_info.data": "Data mode - game logic marker",
-  "structure_block.mode_info.corner": "Corner mode - placement and size marker",
+  "structure_block.mode_info.save": "Save Mode - Write to File",
+  "structure_block.mode_info.load": "Load mode - Load from File",
+  "structure_block.mode_info.data": "Data mode - Game Logic Marker",
+  "structure_block.mode_info.corner": "Corner Mode - Placement and Size Marker",
   "structure_block.structure_name": "Structure Name",
   "structure_block.custom_data": "Custom Data Tag Name",
   "structure_block.position": "Relative Position",
@@ -1960,16 +2001,16 @@
   "structure_block.button.detect_size": "DETECT",
   "structure_block.button.save": "SAVE",
   "structure_block.button.load": "LOAD",
-  "structure_block.show_air": "Show invisible blocks:",
-  "structure_block.show_boundingbox": "Show bounding box:",
-  "jigsaw_block.pool": "Target pool:",
+  "structure_block.show_air": "Show Invisible Blocks:",
+  "structure_block.show_boundingbox": "Show Bounding Box:",
+  "jigsaw_block.pool": "Target Pool:",
   "jigsaw_block.name": "Name:",
-  "jigsaw_block.target": "Target name:",
+  "jigsaw_block.target": "Target Name:",
   "jigsaw_block.final_state": "Turns into:",
   "jigsaw_block.levels": "Levels: %s",
-  "jigsaw_block.keep_jigsaws": "Keep Jigsaws: ",
+  "jigsaw_block.keep_jigsaws": "Keep Jigsaws",
   "jigsaw_block.generate": "Generate",
-  "jigsaw_block.joint_label": "Joint type:",
+  "jigsaw_block.joint_label": "Joint Type:",
   "jigsaw_block.joint.rollable": "Rollable",
   "jigsaw_block.joint.aligned": "Aligned",
   "item.dyed": "Dyed",
@@ -2049,6 +2090,7 @@
   "entity.minecraft.phantom": "Phantom",
   "entity.minecraft.pig": "Pig",
   "entity.minecraft.piglin": "Piglin",
+  "entity.minecraft.piglin_brute": "Piglin Brute",
   "entity.minecraft.pillager": "Pillager",
   "entity.minecraft.player": "Player",
   "entity.minecraft.polar_bear": "Polar Bear",
@@ -2187,7 +2229,7 @@
   "death.attack.message_too_long": "Actually, message was too long to deliver fully. Sorry! Here's stripped version: %s",
   "death.attack.wither": "%1$s withered away",
   "death.attack.wither.player": "%1$s withered away whilst fighting %2$s",
-  "death.attack.witherSkull": "%1$s was shot by a %2$s's skull",
+  "death.attack.witherSkull": "%1$s was shot by a skull from %2$s",
   "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.fallingBlock": "%1$s was squashed by a falling block",
@@ -2226,11 +2268,11 @@
   "death.attack.sting": "%1$s was stung to death",
   "death.attack.sting.player": "%1$s was stung to death by %2$s",
   "deathScreen.respawn": "Respawn",
-  "deathScreen.spectate": "Spectate world",
-  "deathScreen.titleScreen": "Title screen",
+  "deathScreen.spectate": "Spectate World",
+  "deathScreen.titleScreen": "Title Screen",
   "deathScreen.score": "Score",
-  "deathScreen.title.hardcore": "Game over!",
-  "deathScreen.title": "You died!",
+  "deathScreen.title.hardcore": "Game Over!",
+  "deathScreen.title": "You Died!",
   "deathScreen.quit.confirm": "Are you sure you want to quit?",
   "effect.none": "No Effects",
   "effect.minecraft.speed": "Speed",
@@ -2266,7 +2308,7 @@
   "effect.minecraft.bad_omen": "Bad Omen",
   "effect.minecraft.hero_of_the_village": "Hero of the Village",
   "event.minecraft.raid": "Raid",
-  "event.minecraft.raid.raiders_remaining": "Raiders remaining: %s",
+  "event.minecraft.raid.raiders_remaining": "Raiders Remaining: %s",
   "event.minecraft.raid.victory": "Victory",
   "event.minecraft.raid.defeat": "Defeat",
   "item.minecraft.tipped_arrow.effect.empty": "Uncraftable Tipped Arrow",
@@ -2292,6 +2334,8 @@
   "item.minecraft.tipped_arrow.effect.turtle_master": "Arrow of the Turtle Master",
   "item.minecraft.tipped_arrow.effect.slow_falling": "Arrow of Slow Falling",
   "potion.whenDrank": "When Applied:",
+  "potion.withAmplifier": "%s %s",
+  "potion.withDuration": "%s (%s)",
   "item.minecraft.potion.effect.empty": "Uncraftable Potion",
   "item.minecraft.potion.effect.water": "Water Bottle",
   "item.minecraft.potion.effect.mundane": "Mundane Potion",
@@ -2416,6 +2460,7 @@
   "gui.stats": "Statistics",
   "gui.entity_tooltip.type": "Type: %s",
   "advancements.empty": "There doesn't seem to be anything here...",
+  "advancements.sad_label": ":(",
   "advancements.toast.task": "Advancement Made!",
   "advancements.toast.challenge": "Challenge Complete!",
   "advancements.toast.goal": "Goal Reached!",
@@ -2546,14 +2591,14 @@
   "advMode.mode.autoexec.bat": "Always Active",
   "advMode.notEnabled": "Command blocks are not enabled on this server",
   "advMode.notAllowed": "Must be an opped player in creative mode",
-  "mount.onboard": "Press %1$s to dismount",
+  "mount.onboard": "Press %1$s to Dismount",
   "build.tooHigh": "Height limit for building is %s blocks",
-  "item.modifiers.mainhand": "When in main hand:",
-  "item.modifiers.offhand": "When in off hand:",
-  "item.modifiers.feet": "When on feet:",
-  "item.modifiers.legs": "When on legs:",
-  "item.modifiers.chest": "When on body:",
-  "item.modifiers.head": "When on head:",
+  "item.modifiers.mainhand": "When in Main Hand:",
+  "item.modifiers.offhand": "When in Off Hand:",
+  "item.modifiers.feet": "When on Feet:",
+  "item.modifiers.legs": "When on Legs:",
+  "item.modifiers.chest": "When on Body:",
+  "item.modifiers.head": "When on Head:",
   "attribute.unknown": "Unknown attribute",
   "attribute.modifier.plus.0": "+%s %s",
   "attribute.modifier.plus.1": "+%s%% %s",
@@ -3573,6 +3618,7 @@
   "subtitles.entity.parrot.imitate.magma_cube": "Parrot squishes",
   "subtitles.entity.parrot.imitate.phantom": "Parrot screeches",
   "subtitles.entity.parrot.imitate.piglin": "Parrot snorts",
+  "subtitles.entity.parrot.imitate.piglin_brute": "Parrot snorts mightily",
   "subtitles.entity.parrot.imitate.pillager": "Parrot murmurs",
   "subtitles.entity.parrot.imitate.ravager": "Parrot grunts",
   "subtitles.entity.parrot.imitate.shulker": "Parrot lurks",
@@ -3609,6 +3655,12 @@
   "subtitles.entity.piglin.jealous": "Piglin snorts enviously",
   "subtitles.entity.piglin.retreat": "Piglin retreats",
   "subtitles.entity.piglin.step": "Piglin steps",
+  "subtitles.entity.piglin_brute.ambient": "Piglin Brute snorts",
+  "subtitles.entity.piglin_brute.angry": "Piglin Brute snorts angrily",
+  "subtitles.entity.piglin_brute.death": "Piglin Brute dies",
+  "subtitles.entity.piglin_brute.hurt": "Piglin Brute hurts",
+  "subtitles.entity.piglin_brute.step": "Piglin Brute steps",
+  "subtitles.entity.piglin_brute.converted_to_zombified": "Piglin Brute converts to Zombified Piglin",
   "subtitles.entity.pillager.ambient": "Pillager murmurs",
   "subtitles.entity.pillager.celebrate": "Pillager cheers",
   "subtitles.entity.pillager.death": "Pillager dies",
@@ -3807,7 +3859,7 @@
   "subtitles.item.armor.equip_iron": "Iron armor clanks",
   "subtitles.item.armor.equip_leather": "Leather armor rustles",
   "subtitles.item.armor.equip_netherite": "Netherite armor clanks",
-  "subtitles.item.armor.equip_turtle": "Turtle shell thunks",
+  "subtitles.item.armor.equip_turtle": "Turtle Shell thunks",
   "subtitles.item.axe.strip": "Axe scrapes",
   "subtitles.item.berries.pick": "Berries pop",
   "subtitles.item.book.page_turn": "Page rustles",
@@ -3848,7 +3900,7 @@
   "debug.reload_chunks.help": "F3 + A = Reload chunks",
   "debug.show_hitboxes.help": "F3 + B = Show hitboxes",
   "debug.clear_chat.help": "F3 + D = Clear chat",
-  "debug.cycle_renderdistance.help": "F3 + F = Cycle render distance (Shift to invert)",
+  "debug.cycle_renderdistance.help": "F3 + F = Cycle render distance (shift to invert)",
   "debug.chunk_boundaries.help": "F3 + G = Show chunk boundaries",
   "debug.advanced_tooltips.help": "F3 + H = Advanced tooltips",
   "debug.creative_spectator.help": "F3 + N = Cycle previous gamemode <-> spectator",
@@ -3872,8 +3924,8 @@
   "debug.chunk_boundaries.off": "Chunk borders: hidden",
   "debug.advanced_tooltips.on": "Advanced tooltips: shown",
   "debug.advanced_tooltips.off": "Advanced tooltips: hidden",
-  "debug.creative_spectator.error": "Unable to switch gamemode, no permission",
-  "debug.gamemodes.error": "Unable to open game mode switcher, no permission",
+  "debug.creative_spectator.error": "Unable to switch gamemode; no permission",
+  "debug.gamemodes.error": "Unable to open game mode switcher; no permission",
   "debug.pause_focus.on": "Pause on lost focus: enabled",
   "debug.pause_focus.off": "Pause on lost focus: disabled",
   "debug.help.message": "Key bindings:",
@@ -3897,6 +3949,8 @@
   "tutorial.open_inventory.description": "Press %s",
   "tutorial.craft_planks.title": "Craft wooden planks",
   "tutorial.craft_planks.description": "The recipe book can help",
+  "tutorial.socialInteractions.title": "Social Interactions",
+  "tutorial.socialInteractions.description": "Press %s to open",
   "advancements.adventure.adventuring_time.title": "Adventuring Time",
   "advancements.adventure.adventuring_time.description": "Discover every biome",
   "advancements.adventure.arbalistic.title": "Arbalistic",
@@ -3986,7 +4040,7 @@
   "advancements.nether.all_effects.title": "How Did We Get Here?",
   "advancements.nether.all_effects.description": "Have every effect applied at the same time",
   "advancements.nether.create_beacon.title": "Bring Home the Beacon",
-  "advancements.nether.create_beacon.description": "Construct and place a Beacon",
+  "advancements.nether.create_beacon.description": "Construct and place a beacon",
   "advancements.nether.create_full_beacon.title": "Beaconator",
   "advancements.nether.create_full_beacon.description": "Bring a beacon to full power",
   "advancements.nether.find_fortress.title": "A Terrible Fortress",
@@ -4010,7 +4064,7 @@
   "advancements.nether.netherite_armor.title": "Cover Me in Debris",
   "advancements.nether.netherite_armor.description": "Get a full suit of Netherite armor",
   "advancements.nether.use_lodestone.title": "Country Lode, Take Me Home",
-  "advancements.nether.use_lodestone.description": "Use a Compass on a Lodestone",
+  "advancements.nether.use_lodestone.description": "Use a compass on a Lodestone",
   "advancements.nether.obtain_crying_obsidian.title": "Who is Cutting Onions?",
   "advancements.nether.obtain_crying_obsidian.description": "Obtain Crying Obsidian",
   "advancements.nether.charge_respawn_anchor.title": "Not Quite \"Nine\" Lives",
@@ -4094,6 +4148,7 @@
   "argument.entity.options.predicate.description": "Custom predicate",
   "command.failed": "An unexpected error occurred trying to execute that command",
   "command.context.here": "<--[HERE]",
+  "command.context.parse_error": "%s at position %s: %s",
   "commands.publish.started": "Local game hosted on port %s",
   "commands.publish.failed": "Unable to host local game",
   "commands.advancement.advancementNotFound": "No advancement was found by the name '%1$s'",
@@ -4190,6 +4245,7 @@
   "commands.playsound.success.multiple": "Played sound %s to %s players",
   "commands.publish.success": "Multiplayer game is now hosted on port %s",
   "commands.list.players": "There are %s of a max of %s players online: %s",
+  "commands.list.nameAndId": "%s (%s)",
   "commands.kill.success.single": "Killed %s",
   "commands.kill.success.multiple": "Killed %s entities",
   "commands.kick.success": "Kicked %s: %s",
@@ -4257,13 +4313,13 @@
   "commands.weather.set.clear": "Set the weather to clear",
   "commands.weather.set.rain": "Set the weather to rain",
   "commands.weather.set.thunder": "Set the weather to rain & thunder",
-  "commands.spawnpoint.success.single": "Set spawn point to %s, %s, %s in %s for %s",
-  "commands.spawnpoint.success.multiple": "Set spawn point to %s, %s, %s in %s for %s players",
+  "commands.spawnpoint.success.single": "Set spawn point to %s, %s, %s [%s] in %s for %s",
+  "commands.spawnpoint.success.multiple": "Set spawn point to %s, %s, %s [%s] in %s for %s players",
   "commands.stopsound.success.source.sound": "Stopped sound '%s' on source '%s'",
   "commands.stopsound.success.source.any": "Stopped all '%s' sounds",
   "commands.stopsound.success.sourceless.sound": "Stopped sound '%s'",
   "commands.stopsound.success.sourceless.any": "Stopped all sounds",
-  "commands.setworldspawn.success": "Set the world spawn point to %s, %s, %s",
+  "commands.setworldspawn.success": "Set the world spawn point to %s, %s, %s [%s]",
   "commands.spreadplayers.success.teams": "Spread %s teams around %s, %s with an average distance of %s blocks apart",
   "commands.spreadplayers.success.entities": "Spread %s players around %s, %s with an average distance of %s blocks apart",
   "commands.setblock.success": "Changed the block at %s, %s, %s",
@@ -4361,7 +4417,7 @@
   "commands.scoreboard.players.operation.success.multiple": "Updated %s for %s entities",
   "commands.scoreboard.players.get.success": "%s has %s %s",
   "commands.reload.success": "Reloading!",
-  "commands.reload.failure": "Reload failed, keeping old data",
+  "commands.reload.failure": "Reload failed; keeping old data",
   "commands.data.entity.modified": "Modified entity data of %s",
   "commands.data.entity.query": "%s has the following entity data: %s",
   "commands.data.entity.get": "%s on %s after scale factor of %s is %s",
@@ -4386,6 +4442,7 @@
   "argument.range.swapped": "Min cannot be bigger than max",
   "permissions.requires.player": "A player is required to run this command here",
   "permissions.requires.entity": "An entity is required to run this command here",
+  "argument.angle.incomplete": "Incomplete (expected 1 angle)",
   "argument.entity.toomany": "Only one entity is allowed, but the provided selector allows more than one",
   "argument.player.toomany": "Only one player is allowed, but the provided selector allows more than one",
   "argument.player.entities": "Only players may be affected by this command, but the provided selector includes entities",
@@ -4469,6 +4526,7 @@
   "commands.scoreboard.players.enable.invalid": "Enable only works on trigger-objectives",
   "commands.setblock.failed": "Could not set the block",
   "commands.summon.failed": "Unable to summon entity",
+  "commands.summon.failed.uuid": "Unable to summon entity due to duplicate UUIDs",
   "commands.summon.invalidPosition": "Invalid position for summon",
   "commands.tag.add.failed": "Target either already has the tag or has too many tags",
   "commands.tag.remove.failed": "Target does not have this tag",
@@ -4704,7 +4762,7 @@
   "gamerule.commandBlockOutput": "Broadcast command block output",
   "gamerule.disableElytraMovementCheck": "Disable elytra movement check",
   "gamerule.disableRaids": "Disable raids",
-  "gamerule.doDaylightCycle": "Advance in-game time",
+  "gamerule.doDaylightCycle": "Advance time of day",
   "gamerule.doEntityDrops": "Drop entity equipment",
   "gamerule.doEntityDrops.description": "Controls drops from minecarts (including inventories), item frames, boats, etc.",
   "gamerule.doFireTick": "Update fire",
@@ -4744,7 +4802,7 @@
   "gamerule.universalAnger.description": "Angered neutral mobs attack any nearby player, not just the player that angered them. Works best if forgiveDeadPlayers is disabled.",
   "gamerule.category.chat": "Chat",
   "gamerule.category.spawning": "Spawning",
-  "gamerule.category.updates": "World updates",
+  "gamerule.category.updates": "World Updates",
   "gamerule.category.drops": "Drops",
   "gamerule.category.mobs": "Mobs",
   "gamerule.category.player": "Player",

assets/minecraft/models/block/potted_cactus.json

@@ -10,7 +10,7 @@
         {   "from": [ 5, 0, 5 ],
             "to": [ 11, 6, 11 ],
             "faces": {
-                "down":  { "texture": "#flowerpot", "cullface": "down" },
+                "down":  { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot", "cullface": "down" },
                 "up":    { "texture": "#flowerpot" },
                 "north": { "texture": "#flowerpot" },
                 "south": { "texture": "#flowerpot" },
@@ -18,14 +18,14 @@
                 "east":  { "texture": "#flowerpot" }
             }
         },
-        {   "from": [ 6, 6, 6 ],
+        {   "from": [ 6, 5, 6 ],
             "to": [ 10, 16, 10  ],
             "faces": {
-                "up":    { "texture": "#cactus_top" },
-                "north": { "uv": [ 6, 0, 10, 10 ], "texture": "#cactus" },
-                "south": { "uv": [ 6, 0, 10, 10 ], "texture": "#cactus" },
-                "west":  { "uv": [ 6, 0, 10, 10 ], "texture": "#cactus" },
-                "east":  { "uv": [ 6, 0, 10, 10 ], "texture": "#cactus" }
+                "up":    { "texture": "#cactus_top", "cullface": "up" },
+                "north": { "uv": [ 6, 0, 10, 12 ], "texture": "#cactus" },
+                "south": { "uv": [ 6, 0, 10, 12 ], "texture": "#cactus" },
+                "west":  { "uv": [ 6, 0, 10, 12 ], "texture": "#cactus" },
+                "east":  { "uv": [ 6, 0, 10, 12 ], "texture": "#cactus" }
             }
         }
     ]

assets/minecraft/models/item/piglin_brute_spawn_egg.json

@@ -0,0 +1,3 @@
+{
+  "parent": "minecraft:item/template_spawn_egg"
+}

assets/minecraft/models/item/template_banner.json

@@ -1,5 +1,6 @@
 {
     "parent": "builtin/entity",
+    "gui_light": "front",
     "textures": {
         "particle": "block/oak_planks"
     },

assets/minecraft/texts/credits.txt

@@ -247,7 +247,7 @@
 §f          Sheila Ho
 
 §7Production Manager
-§f 			Klas Hammarström
+§f          Klas Hammarström
 
 §7Producers
 §f          Adele Major

assets/minecraft/texts/splashes.txt

@@ -407,3 +407,11 @@ Also try Minecraft Dungeons!
 Vanilla!
 May contain traces of citrus!
 Zoglin!?
+Black lives matter!
+Be anti-racist!
+Learn about allyship!
+Speak OUT against injustice and UP for equality!
+Amplify and listen to BIPOC voices!
+Educate your friends on anti-racism!
+Support the BIPOC community and creators!
+Stand up for equality in your community!

assets/realms/lang/en_us.json

@@ -72,10 +72,10 @@
   "mco.configure.world.subscription.expired": "Expired",
   "mco.configure.world.subscription.start": "Start date",
   "mco.configure.world.subscription.extend": "Extend subscription",
-  "mco.configure.world.subscription.day": "Day",
-  "mco.configure.world.subscription.month": "Month",
-  "mco.configure.world.subscription.days": "Days",
-  "mco.configure.world.subscription.months": "Months",
+  "mco.configure.world.subscription.day": "day",
+  "mco.configure.world.subscription.month": "month",
+  "mco.configure.world.subscription.days": "days",
+  "mco.configure.world.subscription.months": "months",
   "mco.configure.world.pvp": "PVP",
   "mco.configure.world.spawnAnimals": "Spawn animals",
   "mco.configure.world.spawnNPCs": "Spawn NPCs",

data/minecraft/advancements/adventure/kill_a_mob.json

@@ -241,6 +241,20 @@
         ]
       }
     },
+    "minecraft:piglin_brute": {
+      "trigger": "minecraft:player_killed_entity",
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "predicate": {
+              "type": "minecraft:piglin_brute"
+            },
+            "entity": "this"
+          }
+        ]
+      }
+    },
     "minecraft:pillager": {
       "trigger": "minecraft:player_killed_entity",
       "conditions": {
@@ -498,6 +512,7 @@
       "minecraft:magma_cube",
       "minecraft:phantom",
       "minecraft:piglin",
+      "minecraft:piglin_brute",
       "minecraft:pillager",
       "minecraft:ravager",
       "minecraft:shulker",

data/minecraft/advancements/adventure/kill_all_mobs.json

@@ -244,6 +244,20 @@
         ]
       }
     },
+    "minecraft:piglin_brute": {
+      "trigger": "minecraft:player_killed_entity",
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "predicate": {
+              "type": "minecraft:piglin_brute"
+            },
+            "entity": "this"
+          }
+        ]
+      }
+    },
     "minecraft:pillager": {
       "trigger": "minecraft:player_killed_entity",
       "conditions": {
@@ -532,6 +546,9 @@
     [
       "minecraft:piglin"
     ],
+    [
+      "minecraft:piglin_brute"
+    ],
     [
       "minecraft:pillager"
     ],

data/minecraft/advancements/recipes/decorations/furnace.json

@@ -11,7 +11,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:furnace_materials"
+            "tag": "minecraft:stone_crafting_materials"
           }
         ]
       }

data/minecraft/loot_tables/chests/bastion_bridge.json

@@ -45,8 +45,8 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 2.0,
-                "max": 12.0,
+                "min": 10.0,
+                "max": 28.0,
                 "type": "minecraft:uniform"
               }
             }
@@ -59,8 +59,8 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 5.0,
-                "max": 8.0,
+                "min": 8.0,
+                "max": 12.0,
                 "type": "minecraft:uniform"
               }
             }
@@ -97,8 +97,8 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 2.0,
-                "max": 8.0,
+                "min": 4.0,
+                "max": 9.0,
                 "type": "minecraft:uniform"
               }
             }
@@ -111,8 +111,8 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 2.0,
-                "max": 8.0,
+                "min": 4.0,
+                "max": 9.0,
                 "type": "minecraft:uniform"
               }
             }
@@ -180,6 +180,19 @@
             }
           ],
           "name": "minecraft:golden_boots"
+        },
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            },
+            {
+              "function": "minecraft:enchant_randomly"
+            }
+          ],
+          "name": "minecraft:golden_axe"
         }
       ]
     },

data/minecraft/loot_tables/chests/bastion_hoglin_stable.json

@@ -6,13 +6,13 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "weight": 5,
+          "weight": 15,
           "functions": [
             {
               "function": "minecraft:set_damage",
               "damage": {
                 "min": 0.15,
-                "max": 0.45
+                "max": 0.8
               }
             },
             {
@@ -23,7 +23,28 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 2,
+          "weight": 12,
+          "functions": [
+            {
+              "function": "minecraft:set_damage",
+              "damage": {
+                "min": 0.15,
+                "max": 0.95
+              }
+            },
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            },
+            {
+              "function": "minecraft:enchant_randomly"
+            }
+          ],
+          "name": "minecraft:diamond_pickaxe"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 8,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -34,7 +55,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 3,
+          "weight": 12,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -45,7 +66,18 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 10,
+          "weight": 5,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 2
+            }
+          ],
+          "name": "minecraft:ancient_debris"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 12,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -56,7 +88,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 25,
+          "weight": 16,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -71,21 +103,29 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 15,
+          "weight": 10,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 8.0,
+                "max": 17.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:golden_carrot"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 10,
           "functions": [
             {
               "function": "minecraft:set_count",
               "count": 1
-            },
-            {
-              "function": "minecraft:enchant_randomly"
             }
           ],
-          "name": "minecraft:golden_hoe"
-        },
-        {
-          "type": "minecraft:empty",
-          "weight": 45
+          "name": "minecraft:golden_apple"
         }
       ]
     },
@@ -96,6 +136,19 @@
         "type": "minecraft:uniform"
       },
       "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            },
+            {
+              "function": "minecraft:enchant_randomly"
+            }
+          ],
+          "name": "minecraft:golden_axe"
+        },
         {
           "type": "minecraft:item",
           "functions": [
@@ -108,6 +161,20 @@
               }
             }
           ],
+          "name": "minecraft:crying_obsidian"
+        },
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 6.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
           "name": "minecraft:glowstone"
         },
         {
@@ -116,7 +183,7 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 1.0,
+                "min": 2.0,
                 "max": 5.0,
                 "type": "minecraft:uniform"
               }

data/minecraft/loot_tables/chests/bastion_other.json

@@ -6,13 +6,38 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "weight": 12,
+          "weight": 6,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            },
+            {
+              "function": "minecraft:enchant_randomly"
+            }
+          ],
+          "name": "minecraft:diamond_pickaxe"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 6,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            }
+          ],
+          "name": "minecraft:diamond_shovel"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 6,
           "functions": [
             {
               "function": "minecraft:set_damage",
               "damage": {
                 "min": 0.1,
-                "max": 0.5
+                "max": 0.9
               }
             },
             {
@@ -23,7 +48,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 2,
+          "weight": 12,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -34,7 +59,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 2,
+          "weight": 4,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -45,13 +70,13 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 16,
+          "weight": 10,
           "functions": [
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 2.0,
-                "max": 15.0,
+                "min": 10.0,
+                "max": 22.0,
                 "type": "minecraft:uniform"
               }
             }
@@ -60,7 +85,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 5,
+          "weight": 9,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -71,7 +96,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 3,
+          "weight": 5,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -80,6 +105,32 @@
           ],
           "name": "minecraft:music_disc_pigstep"
         },
+        {
+          "type": "minecraft:item",
+          "weight": 12,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 6.0,
+                "max": 17.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:golden_carrot"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 9,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            }
+          ],
+          "name": "minecraft:golden_apple"
+        },
         {
           "type": "minecraft:item",
           "weight": 10,
@@ -92,16 +143,44 @@
             }
           ],
           "name": "minecraft:book"
-        },
-        {
-          "type": "minecraft:empty",
-          "weight": 50
         }
       ]
     },
     {
       "rolls": 2,
       "entries": [
+        {
+          "type": "minecraft:item",
+          "weight": 2,
+          "functions": [
+            {
+              "function": "minecraft:set_damage",
+              "damage": {
+                "min": 0.1,
+                "max": 0.9
+              }
+            },
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            },
+            {
+              "function": "minecraft:enchant_randomly"
+            }
+          ],
+          "name": "minecraft:iron_sword"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 2,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            }
+          ],
+          "name": "minecraft:iron_block"
+        },
         {
           "type": "minecraft:item",
           "functions": [
@@ -120,6 +199,20 @@
         },
         {
           "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            },
+            {
+              "function": "minecraft:enchant_randomly"
+            }
+          ],
+          "name": "minecraft:golden_axe"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -140,6 +233,7 @@
         },
         {
           "type": "minecraft:item",
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -154,6 +248,7 @@
         },
         {
           "type": "minecraft:item",
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -216,21 +311,9 @@
           ],
           "name": "minecraft:golden_boots"
         },
-        {
-          "type": "minecraft:empty",
-          "weight": 2
-        }
-      ]
-    },
-    {
-      "rolls": {
-        "min": 3.0,
-        "max": 5.0,
-        "type": "minecraft:uniform"
-      },
-      "entries": [
         {
           "type": "minecraft:item",
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -242,9 +325,19 @@
             }
           ],
           "name": "minecraft:crying_obsidian"
-        },
+        }
+      ]
+    },
+    {
+      "rolls": {
+        "min": 3.0,
+        "max": 4.0,
+        "type": "minecraft:uniform"
+      },
+      "entries": [
         {
           "type": "minecraft:item",
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -273,6 +366,7 @@
         },
         {
           "type": "minecraft:item",
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -369,6 +463,16 @@
             }
           ],
           "name": "minecraft:arrow"
+        },
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            }
+          ],
+          "name": "minecraft:cooked_porkchop"
         }
       ]
     }

data/minecraft/loot_tables/chests/bastion_treasure.json

@@ -2,15 +2,11 @@
   "type": "minecraft:chest",
   "pools": [
     {
-      "rolls": {
-        "min": 1.0,
-        "max": 2.0,
-        "type": "minecraft:uniform"
-      },
+      "rolls": 3,
       "entries": [
         {
           "type": "minecraft:item",
-          "weight": 10,
+          "weight": 15,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -21,7 +17,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 14,
+          "weight": 10,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -32,7 +28,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 10,
+          "weight": 8,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -43,6 +39,7 @@
         },
         {
           "type": "minecraft:item",
+          "weight": 4,
           "functions": [
             {
               "function": "minecraft:set_count",
@@ -53,13 +50,13 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 10,
+          "weight": 6,
           "functions": [
             {
               "function": "minecraft:set_damage",
               "damage": {
-                "min": 0.2,
-                "max": 0.65
+                "min": 0.8,
+                "max": 1.0
               }
             },
             {
@@ -75,8 +72,8 @@
             {
               "function": "minecraft:set_damage",
               "damage": {
-                "min": 0.2,
-                "max": 0.65
+                "min": 0.8,
+                "max": 1.0
               }
             },
             {
@@ -92,8 +89,8 @@
             {
               "function": "minecraft:set_damage",
               "damage": {
-                "min": 0.2,
-                "max": 0.65
+                "min": 0.8,
+                "max": 1.0
               }
             },
             {
@@ -109,8 +106,8 @@
             {
               "function": "minecraft:set_damage",
               "damage": {
-                "min": 0.2,
-                "max": 0.65
+                "min": 0.8,
+                "max": 1.0
               }
             },
             {
@@ -126,8 +123,8 @@
             {
               "function": "minecraft:set_damage",
               "damage": {
-                "min": 0.2,
-                "max": 0.65
+                "min": 0.8,
+                "max": 1.0
               }
             },
             {
@@ -139,71 +136,26 @@
         {
           "type": "minecraft:item",
           "weight": 6,
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.2,
-                "max": 0.65
-              }
-            }
-          ],
           "name": "minecraft:diamond_sword"
         },
         {
           "type": "minecraft:item",
           "weight": 5,
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.2,
-                "max": 0.65
-              }
-            }
-          ],
           "name": "minecraft:diamond_chestplate"
         },
         {
           "type": "minecraft:item",
           "weight": 5,
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.2,
-                "max": 0.65
-              }
-            }
-          ],
           "name": "minecraft:diamond_helmet"
         },
         {
           "type": "minecraft:item",
           "weight": 5,
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.2,
-                "max": 0.65
-              }
-            }
-          ],
           "name": "minecraft:diamond_boots"
         },
         {
           "type": "minecraft:item",
           "weight": 5,
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.2,
-                "max": 0.65
-              }
-            }
-          ],
           "name": "minecraft:diamond_leggings"
         },
         {
@@ -213,19 +165,30 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 1.0,
-                "max": 3.0,
+                "min": 2.0,
+                "max": 6.0,
                 "type": "minecraft:uniform"
               }
             }
           ],
           "name": "minecraft:diamond"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 2,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": 1
+            }
+          ],
+          "name": "minecraft:enchanted_golden_apple"
         }
       ]
     },
     {
       "rolls": {
-        "min": 2.0,
+        "min": 3.0,
         "max": 4.0,
         "type": "minecraft:uniform"
       },
@@ -236,8 +199,8 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 5.0,
-                "max": 21.0,
+                "min": 12.0,
+                "max": 25.0,
                 "type": "minecraft:uniform"
               }
             }
@@ -258,6 +221,20 @@
           ],
           "name": "minecraft:gold_block"
         },
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 2.0,
+                "max": 5.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:iron_block"
+        },
         {
           "type": "minecraft:item",
           "functions": [
@@ -292,7 +269,7 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 1.0,
+                "min": 3.0,
                 "max": 5.0,
                 "type": "minecraft:uniform"
               }
@@ -320,8 +297,8 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 1.0,
-                "max": 5.0,
+                "min": 5.0,
+                "max": 15.0,
                 "type": "minecraft:uniform"
               }
             }
@@ -334,27 +311,13 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 2.0,
+                "min": 3.0,
                 "max": 8.0,
                 "type": "minecraft:uniform"
               }
             }
           ],
           "name": "minecraft:magma_cream"
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": {
-                "min": 8.0,
-                "max": 16.0,
-                "type": "minecraft:uniform"
-              }
-            }
-          ],
-          "name": "minecraft:iron_nugget"
         }
       ]
     }

data/minecraft/loot_tables/chests/shipwreck_supply.json

@@ -98,10 +98,17 @@
                   }
                 },
                 {
-                  "type": "minecraft:weakness",
+                  "type": "minecraft:saturation",
                   "duration": {
-                    "min": 6.0,
-                    "max": 8.0
+                    "min": 7.0,
+                    "max": 10.0
+                  }
+                },
+                {
+                  "type": "minecraft:blindness",
+                  "duration": {
+                    "min": 5.0,
+                    "max": 7.0
                   }
                 },
                 {
@@ -119,17 +126,10 @@
                   }
                 },
                 {
-                  "type": "minecraft:blindness",
+                  "type": "minecraft:weakness",
                   "duration": {
-                    "min": 5.0,
-                    "max": 7.0
-                  }
-                },
-                {
-                  "type": "minecraft:saturation",
-                  "duration": {
-                    "min": 7.0,
-                    "max": 10.0
+                    "min": 6.0,
+                    "max": 8.0
                   }
                 }
               ]

data/minecraft/loot_tables/entities/piglin_brute.json

@@ -0,0 +1,3 @@
+{
+  "type": "minecraft:entity"
+}

data/minecraft/loot_tables/gameplay/piglin_bartering.json

@@ -32,7 +32,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 10,
+          "weight": 8,
           "functions": [
             {
               "function": "minecraft:set_nbt",
@@ -43,7 +43,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 10,
+          "weight": 8,
           "functions": [
             {
               "function": "minecraft:set_nbt",
@@ -52,6 +52,17 @@
           ],
           "name": "minecraft:splash_potion"
         },
+        {
+          "type": "minecraft:item",
+          "weight": 10,
+          "functions": [
+            {
+              "function": "minecraft:set_nbt",
+              "tag": "{Potion:\"minecraft:water\"}"
+            }
+          ],
+          "name": "minecraft:potion"
+        },
         {
           "type": "minecraft:item",
           "weight": 10,
@@ -59,7 +70,7 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 9.0,
+                "min": 10.0,
                 "max": 36.0,
                 "type": "minecraft:uniform"
               }
@@ -67,6 +78,21 @@
           ],
           "name": "minecraft:iron_nugget"
         },
+        {
+          "type": "minecraft:item",
+          "weight": 10,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 2.0,
+                "max": 4.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:ender_pearl"
+        },
         {
           "type": "minecraft:item",
           "weight": 20,
@@ -74,13 +100,13 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 8.0,
-                "max": 16.0,
+                "min": 3.0,
+                "max": 9.0,
                 "type": "minecraft:uniform"
               }
             }
           ],
-          "name": "minecraft:quartz"
+          "name": "minecraft:string"
         },
         {
           "type": "minecraft:item",
@@ -95,112 +121,7 @@
               }
             }
           ],
-          "name": "minecraft:glowstone_dust"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 20,
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": {
-                "min": 2.0,
-                "max": 6.0,
-                "type": "minecraft:uniform"
-              }
-            }
-          ],
-          "name": "minecraft:magma_cream"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 20,
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": {
-                "min": 4.0,
-                "max": 8.0,
-                "type": "minecraft:uniform"
-              }
-            }
-          ],
-          "name": "minecraft:ender_pearl"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 20,
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": {
-                "min": 8.0,
-                "max": 24.0,
-                "type": "minecraft:uniform"
-              }
-            }
-          ],
-          "name": "minecraft:string"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 40,
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": {
-                "min": 1.0,
-                "max": 5.0,
-                "type": "minecraft:uniform"
-              }
-            }
-          ],
-          "name": "minecraft:fire_charge"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 40,
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": {
-                "min": 8.0,
-                "max": 16.0,
-                "type": "minecraft:uniform"
-              }
-            }
-          ],
-          "name": "minecraft:gravel"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 40,
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": {
-                "min": 4.0,
-                "max": 10.0,
-                "type": "minecraft:uniform"
-              }
-            }
-          ],
-          "name": "minecraft:leather"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 40,
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": {
-                "min": 4.0,
-                "max": 16.0,
-                "type": "minecraft:uniform"
-              }
-            }
-          ],
-          "name": "minecraft:nether_brick"
+          "name": "minecraft:quartz"
         },
         {
           "type": "minecraft:item",
@@ -222,6 +143,11 @@
           ],
           "name": "minecraft:crying_obsidian"
         },
+        {
+          "type": "minecraft:item",
+          "weight": 40,
+          "name": "minecraft:fire_charge"
+        },
         {
           "type": "minecraft:item",
           "weight": 40,
@@ -229,13 +155,88 @@
             {
               "function": "minecraft:set_count",
               "count": {
-                "min": 4.0,
-                "max": 16.0,
+                "min": 2.0,
+                "max": 4.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:leather"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 40,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 2.0,
+                "max": 8.0,
                 "type": "minecraft:uniform"
               }
             }
           ],
           "name": "minecraft:soul_sand"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 40,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 2.0,
+                "max": 8.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:nether_brick"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 40,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 6.0,
+                "max": 12.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:spectral_arrow"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 40,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 8.0,
+                "max": 16.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:gravel"
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 40,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 8.0,
+                "max": 16.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "name": "minecraft:blackstone"
         }
       ]
     }

data/minecraft/recipes/brewing_stand.json

@@ -9,7 +9,7 @@
       "item": "minecraft:blaze_rod"
     },
     "#": {
-      "item": "minecraft:cobblestone"
+      "tag": "minecraft:stone_crafting_materials"
     }
   },
   "result": {

data/minecraft/recipes/furnace.json

@@ -7,7 +7,7 @@
   ],
   "key": {
     "#": {
-      "tag": "minecraft:furnace_materials"
+      "tag": "minecraft:stone_crafting_materials"
     }
   },
   "result": {