mirrors/cobblemon
1
0
Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-20 14:16:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Slippy-1.8.2-Fixes' into 'main'

Browse Source 
Slippy 1.8.2 fixes

See merge request cable-mc/cobblemon!2458
This commit is contained in:
Polymeta
2026-10-07 17:25:48 +00:00
parent 9af99d16f7 68f4117e29
commit dfb9ee755e
50 changed files with 27 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/resources/data/cobblemon/loot_table/alpha/alpha_rewards_tier1.json
+1 -12
View File
@@ -28,21 +28,10 @@
"function": "set_count",
"count": {
"min": 1,
"max": 2
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:exp_candy_m",
"weight": 10,
"functions": [
{
"function": "set_count",
"count": 1
}
]
}
]
}
common/src/main/resources/data/cobblemon/loot_table/alpha/alpha_rewards_tier2.json
+3 -14
View File
@@ -5,7 +5,7 @@
"rolls": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
"max": 1
},
"bonus_rolls": 0.0,
"entries": [
@@ -18,7 +18,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
@@ -32,21 +32,10 @@
"function": "set_count",
"count": {
"min": 1,
"max": 2
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:exp_candy_l",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": 1
}
]
}
]
}
common/src/main/resources/data/cobblemon/loot_table/alpha/alpha_rewards_tier3.json
+3 -97
View File
@@ -5,7 +5,7 @@
"rolls": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
"max": 1
},
"bonus_rolls": 0.0,
"entries": [
@@ -18,7 +18,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
@@ -32,101 +32,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
}
]
},
{
"rolls": 1,
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:empty",
"weight": 30
},
{
"type": "minecraft:item",
"name": "cobblemon:health_candy",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:mighty_candy",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:tough_candy",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:smart_candy",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:courage_candy",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:quick_candy",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
"max": 1
}
}
]
common/src/main/resources/data/cobblemon/loot_table/alpha/alpha_rewards_tier4.json
+10 -10
View File
@@ -4,8 +4,8 @@
{
"rolls": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
"min": 1,
"max": 1
},
"bonus_rolls": 0.0,
"entries": [
@@ -18,7 +18,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
@@ -51,7 +51,7 @@
"rolls": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
"max": 1
},
"bonus_rolls": 0.0,
"entries": [
@@ -68,7 +68,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
@@ -82,7 +82,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
@@ -96,7 +96,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
@@ -110,7 +110,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
@@ -124,7 +124,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
@@ -138,7 +138,7 @@
"function": "set_count",
"count": {
"min": 1,
"max": 3
"max": 1
}
}
]
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/deserted_monument_ruins.json
+1 -1
View File
@@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 5
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/deserted_town_center_ruins.json
+1 -1
View File
@@ -46,7 +46,7 @@
},
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 10
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/fallen_statue_ruins.json
+1 -1
View File
@@ -16,7 +16,7 @@
},
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 10
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/gimmi_tower_deserted.json
+1 -1
View File
@@ -16,7 +16,7 @@
},
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 10
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/gimmi_tower_junk.json
+1 -1
View File
@@ -16,7 +16,7 @@
},
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 15
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/gimmi_tower_lush.json
+1 -1
View File
@@ -11,7 +11,7 @@
},
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 10
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/gimmi_tower_temperate.json
+1 -1
View File
@@ -16,7 +16,7 @@
},
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 10
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/hidden_bunker_ruins.json
+1 -1
View File
@@ -16,7 +16,7 @@
},
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 10
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/overgrown_trial_ruins.json
+1 -1
View File
@@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 5
},
{
common/src/main/resources/data/cobblemon/loot_table/ruins/uncommon/unstable_cave_ruins.json
+1 -1
View File
@@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:focus_sash",
"name": "cobblemon:focus_band",
"weight": 10
},
{
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector1.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector2.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector3.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector4.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector5.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector6.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector7.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector8.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_bog_connector9.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog1.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog2.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog3.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog4.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog5.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog6.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog7.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog8.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/lush_peat_bog_start.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog1.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog2.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog3.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog4.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog5.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog6.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog7.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog8.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/parched_peat_bog_start.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector1.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector2.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector3.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector4.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector5.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector6.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector7.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector8.nbt
BIN
View File
Binary file not shown.
common/src/main/resources/data/cobblemon/structure/habitats/peat_bog_connector9.nbt
BIN
View File
Binary file not shown.