Merge branch 'dev' into dev

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
This commit is contained in:
Redeix 2025-04-25 22:49:01 -05:00 committed by GitHub
commit 29bf80dba4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 260 additions and 163 deletions

View file

@ -12,13 +12,13 @@
{
"function": "minecraft:set_count",
"count": {
"min": 3,
"max": 9,
"min": 6,
"max": 12,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -33,7 +33,7 @@
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -48,7 +48,7 @@
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -57,43 +57,63 @@
{
"function": "minecraft:set_count",
"count": {
"min": 5,
"min": 6,
"max": 12,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
"name": "gtceu:tin_ingot",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 1,
"max": 3,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
"name": "minecraft:copper_ingot",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 1,
"max": 3,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
"name": "gtceu:silver_ingot",
"weight": 100
},
{
"type": "minecraft:item",
"name": "gtceu:bronze_ingot",
"weight": 100
},
{
"type": "minecraft:item",
"name": "gtceu:bismuth_bronze_ingot",
"weight": 100
},
{
"type": "minecraft:item",
"name": "minecraft:iron_ingot",
"weight": 100
},
{
"type": "minecraft:item",
"name": "create:zinc_ingot",
"weight": 100
},
{
"type": "minecraft:item",
"name": "create:brass_ingot",
"weight": 100
},
{
"type": "minecraft:item",
"name": "gtceu:bismuth_ingot",
"weight": 100
},
{
"type": "minecraft:item",
"name": "gtceu:nickel_ingot",
"weight": 100
},
{
"type": "minecraft:item",
@ -108,7 +128,7 @@
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -123,7 +143,7 @@
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -138,7 +158,7 @@
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -153,7 +173,7 @@
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -162,28 +182,13 @@
{
"function": "minecraft:set_count",
"count": {
"min": 4,
"min": 6,
"max": 12,
"type": "minecraft:uniform"
}
}
],
"weight": 2
},
{
"type": "minecraft:item",
"name": "gtceu:raw_graphite",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 1,
"max": 2,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -198,22 +203,7 @@
}
}
],
"weight": 2
},
{
"type": "minecraft:item",
"name": "tfc:kaolin_clay",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 2,
"max": 4,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -222,13 +212,13 @@
{
"function": "minecraft:set_count",
"count": {
"min": 4,
"max": 8,
"min": 12,
"max": 18,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -237,13 +227,13 @@
{
"function": "minecraft:set_count",
"count": {
"min": 2,
"max": 4,
"min": 6,
"max": 8,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -252,28 +242,13 @@
{
"function": "minecraft:set_count",
"count": {
"min": 2,
"max": 4,
"min": 4,
"max": 6,
"type": "minecraft:uniform"
}
}
],
"weight": 2
},
{
"type": "minecraft:item",
"name": "minecraft:glow_berries",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 8,
"max": 16,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
@ -282,28 +257,28 @@
{
"function": "minecraft:set_count",
"count": {
"min": 2,
"max": 4,
"min": 4,
"max": 6,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
},
{
"type": "minecraft:item",
"name": "minecraft:glowstone_dust",
"name": "minecraft:gunpowder",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 2,
"max": 4,
"min": 4,
"max": 6,
"type": "minecraft:uniform"
}
}
],
"weight": 2
"weight": 100
}
]
}