1
0
mirror of https://github.com/pmmp/BedrockData.git synced 2024-07-04 16:00:07 -03:00

Merge branch 'master' into modern-world-support

This commit is contained in:
Dylan K. Taylor 2022-07-12 20:40:28 +01:00
commit 5d7add6b08
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
6 changed files with 17 additions and 8 deletions

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

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

Binary file not shown.

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

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

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