Merge remote-tracking branch 'origin/1.21' into 1.21

This commit is contained in:
patience 2026-03-25 16:48:46 +00:00
commit f72fe4b778
No known key found for this signature in database
26 changed files with 229 additions and 2 deletions

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:chiseled_deepslate"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:cobbled_deepslate"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 2,
"id": "minecraft:cobbled_deepslate_slab"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:cobbled_deepslate_stairs"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:cobbled_deepslate_wall"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 2,
"id": "minecraft:deepslate_brick_slab"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:deepslate_brick_stairs"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:deepslate_brick_wall"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:deepslate_bricks"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 2,
"id": "minecraft:deepslate_tile_slab"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:deepslate_tile_stairs"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:deepslate_tile_wall"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:deepslate_tiles"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:polished_deepslate"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 2,
"id": "minecraft:polished_deepslate_slab"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:polished_deepslate_stairs"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:deepslate"
},
"result": {
"count": 1,
"id": "minecraft:polished_deepslate_wall"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:stone"
},
"result": {
"count": 1,
"id": "minecraft:cobblestone"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:stone"
},
"result": {
"count": 2,
"id": "minecraft:cobblestone_slab"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:stone"
},
"result": {
"count": 1,
"id": "minecraft:cobblestone_stairs"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:stone"
},
"result": {
"count": 1,
"id": "minecraft:cobblestone_wall"
}
}

View file

@ -1,25 +1,31 @@
{
"values": [
"minecraft:bane_of_arthropods",
"minecraft:breach",
"minecraft:channeling",
"mc_rebalance:collapse",
"mc_rebalance:crumble",
"minecraft:density",
"minecraft:depth_strider",
"minecraft:efficiency",
"mc_rebalance:exploit",
"minecraft:feather_falling",
"minecraft:fire_aspect",
"minecraft:flame",
"minecraft:frost_walker",
"minecraft:impaling",
"minecraft:looting",
"minecraft:luck_of_the_sea",
"minecraft:lunge",
"minecraft:multishot",
"minecraft:piercing",
"minecraft:punch",
"minecraft:quick_charge",
"minecraft:respiration",
"minecraft:riptide",
"mc_rebalance:smack",
"minecraft:smite",
"minecraft:soul_speed",
"mc_rebalance:stepping",
"minecraft:sweeping_edge",
"minecraft:swift_sneak",

View file

@ -4,6 +4,8 @@
"minecraft:blast_protection",
"minecraft:fire_protection",
"minecraft:fortune",
"minecraft:infinity",
"minecraft:knockback",
"minecraft:loyalty",
"minecraft:lure",
"minecraft:projectile_protection",

View file

@ -0,0 +1,9 @@
{
"values": [
"#minecraft:axes",
"#minecraft:pickaxes",
"#minecraft:hoes",
"#mc_rebalance:paxels",
"minecraft:shears"
]
}

View file

@ -6,7 +6,6 @@
"mc_rebalance:exploit",
"mc_rebalance:windup",
"mc_rebalance:smack",
"mc_rebalance:collapse",
"mc_rebalance:reach"
]
}

View file

@ -1,5 +1,6 @@
{
"values": [
"mc_rebalance:crumble"
"mc_rebalance:crumble",
"mc_rebalance:collapse"
]
}