Merge branch 'master' into modern-world-support

creativeitems.json

@@ -2569,6 +2569,9 @@
     {
         "name": "minecraft:tadpole_spawn_egg"
     },
+    {
+        "name": "minecraft:trader_llama_spawn_egg"
+    },
     {
         "name": "minecraft:ghast_spawn_egg"
     },

entity_id_map.json

@@ -116,6 +116,7 @@
     "minecraft:frog": 132,
     "minecraft:tadpole": 133,
     "minecraft:allay": 134,
+    "minecraft:trader_llama": 157,
     "minecraft:chest_boat": 218,
     "minecraft:player": 257
 }

level_sound_id_map.json

@@ -157,6 +157,7 @@
     "disappeared": 430,
     "drink": 30,
     "drink.honey": 294,
+    "drink.milk": 432,
     "drip.lava.pointed_dripstone": 335,
     "drip.water.pointed_dripstone": 334,
     "drop.slot": 80,

recipes/shaped_crafting.json

@@ -18067,9 +18067,9 @@
         },
         "output": [
             {
-                "block_states": "CgAACAsAcGlsbGFyX2F4aXMBAHkBDABzdHJpcHBlZF9iaXQAAA==",
+                "block_states": "CgAACAsAcGlsbGFyX2F4aXMBAHkA",
                 "count": 3,
-                "name": "minecraft:mangrove_wood"
+                "name": "minecraft:stripped_mangrove_wood"
             }
         ],
         "priority": 0,

required_item_list.json

@@ -140,7 +140,7 @@
         "component_based": false
     },
     "minecraft:banner_pattern": {
-        "runtime_id": 650,
+        "runtime_id": 651,
         "component_based": false
     },
     "minecraft:barrel": {
@@ -328,7 +328,7 @@
         "component_based": false
     },
     "minecraft:boat": {
-        "runtime_id": 648,
+        "runtime_id": 649,
         "component_based": false
     },
     "minecraft:bone": {
@@ -1192,7 +1192,7 @@
         "component_based": false
     },
     "minecraft:dye": {
-        "runtime_id": 649,
+        "runtime_id": 650,
         "component_based": false
     },
     "minecraft:echo_shard": {
@@ -1724,7 +1724,7 @@
         "component_based": false
     },
     "minecraft:end_crystal": {
-        "runtime_id": 652,
+        "runtime_id": 653,
         "component_based": false
     },
     "minecraft:end_gateway": {
@@ -1932,7 +1932,7 @@
         "component_based": false
     },
     "minecraft:glow_berries": {
-        "runtime_id": 653,
+        "runtime_id": 654,
         "component_based": false
     },
     "minecraft:glow_frame": {
@@ -3780,7 +3780,7 @@
         "component_based": false
     },
     "minecraft:spawn_egg": {
-        "runtime_id": 651,
+        "runtime_id": 652,
         "component_based": false
     },
     "minecraft:spider_eye": {
@@ -4079,6 +4079,10 @@
         "runtime_id": 568,
         "component_based": false
     },
+    "minecraft:trader_llama_spawn_egg": {
+        "runtime_id": 648,
+        "component_based": false
+    },
     "minecraft:trapdoor": {
         "runtime_id": 96,
         "component_based": false