dhi_holo
6cfe3fd39d
Merge branch 'main' into data-fixings
2026-08-03 19:13:53 +10:00
Hiroku
d4b6e36aab
Merge branch 'gamemasters' into 'main'
...
Interaction Fix
See merge request cable-mc/cobblemon!2339
2026-08-03 08:49:25 +00:00
dhi_holo
338cb819af
Craft to Obtain
...
Update Craft TM Advancement to be Obtain TM Advancement
2026-08-03 17:41:04 +10:00
dhi_holo
1a75d4b2e8
Budding Tag
...
Added the item form of the budding blocks tag (block form already existed)
2026-08-03 15:50:03 +10:00
dhi_holo
5c4c7b2995
Fixes
...
Fixed #2008 to the best of my understanding
Corrected compatibility numbers to match updated loot tables
2026-08-03 14:58:17 +10:00
dhi_holo
0fb721702d
Interaction Fix
...
Solves interaction problem reported https://discord.com/channels/725110639554592879/1481053968716009493/1533385403170820148
Habitat Block acts like a block without interactions if right clicked by a player in survival, or without operator permissions of level 2 or higher (same as command blocks, known as Gamemaster)
With those permissions, it works as usual
Also removed Habitat Block from the Cobblemon Blocks tab, leaving it solely in the Operator Items Tab, like Command Blocks.
2026-08-02 21:08:13 +10:00
Polymeta
0e5053b787
Merge branch 'config-screen-scrolling-labels' into 'main'
...
Labels on the config screen now scroll instead of overflowing
See merge request cable-mc/cobblemon!2338
2026-08-01 22:09:46 +00:00
lion
f3867e0b1d
Labels on the config screen now scroll instead of overflowing
2026-08-01 22:09:46 +00:00
Hiroku
a4fcd1ae7b
Merge branch 'transparent-occlusion' into 'main'
...
Fix translucent draw order
See merge request cable-mc/cobblemon!2337
2026-08-01 01:56:58 +00:00
Jordan
ed9aff2448
Fix translucent draw order
2026-08-01 01:56:57 +00:00
Nick
8497a2a083
Merge branch 'trade-dupe-fix' into 'main'
...
Trade dupe fix
See merge request cable-mc/cobblemon!2336
2026-07-31 15:22:15 -07:00
Deltric
b389a95b5e
Trade dupe fix
2026-07-31 17:03:33 -05:00
Polymeta
c310027ce1
Merge branch 'Habitat-Bug-Fixes' into 'main'
...
Fixin some things
See merge request cable-mc/cobblemon!2335
2026-07-31 20:34:24 +00:00
Slippy
5ddb01df36
More Bug Fixes
2026-07-31 14:25:33 -05:00
Slippy
5a6f49aad5
found one more thing
2026-07-31 02:54:16 -05:00
Slippy
793efcfa3d
Fixin some things
2026-07-31 02:49:24 -05:00
Polymeta
d671c5a8b8
[skip-ci] tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-07-29 11:59:10 +01:00
Polymeta
69b31dd9b9
fix up null checks to prevent crashes during ticks in BerryBlock
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-07-29 11:45:50 +01:00
Polymeta
fc94bbac4c
Merge branch 'dandelion-sinistertea-fix' into 'main'
...
Dandelion Sinister Tea Fix
See merge request cable-mc/cobblemon!2324
2026-07-28 15:53:25 +00:00
Ceejay
f7d315fa33
Dandelion Sinister Tea Fix
2026-07-28 15:53:25 +00:00
Paul
7c30fd81f3
Scraped behaviours for updated AI behaviour
2026-07-28 20:10:29 +10:00
Paul
7f1704d573
Fixed habitat spelling beheeyem wrong
2026-07-28 19:49:22 +10:00
Paul
0c2ec3ca81
Scraped habitat spawns, deduplicated fixes in changelog, update wildlife -> wildfire in habitat pool
2026-07-28 19:43:09 +10:00
Paul
33d3e156cc
Merge remote-tracking branch 'origin/lang-updates'
2026-07-28 19:06:49 +10:00
arvid6
415642a8ba
Translated using Weblate (Spanish)
...
Currently translated at 99.6% (9432 of 9467 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/es/
2026-07-27 18:45:01 +00:00
arvid6
dd12081cd1
Translated using Weblate (Spanish)
...
Currently translated at 99.5% (9425 of 9467 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/es/
2026-07-27 11:20:52 +00:00
arvid6
b7de84acfd
Translated using Weblate (Spanish)
...
Currently translated at 99.1% (9384 of 9467 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/es/
2026-07-27 11:06:54 +00:00
Hiroku
8efda8c47b
Merge branch 'main' into 'main'
...
Fix load time deadlock between ElementalType and ElementalTypes
Closes #2034
See merge request cable-mc/cobblemon!2332
2026-07-26 02:24:21 +00:00
Naitronbomb
6baf96f83b
Add changelog entry for load time deadlock fix
2026-07-25 11:13:18 -07:00
Naitronbomb
009a9c3f15
Fix load time deadlock between ElementalType and ElementalTypes
2026-07-25 09:29:47 -07:00
Polymeta
fc0a6c0c8b
Merge branch 'gem-unbalance' into 'main'
...
Type Gem Loot Table Tweaks
See merge request cable-mc/cobblemon!2322
2026-07-25 16:14:44 +00:00
Hiroku
041e080cd4
Merge branch 'fix-starter-toast-dismissal' into 'main'
...
Fix starter toast not being dismissed when capturing a pokemon
See merge request cable-mc/cobblemon!2331
2026-07-25 03:13:11 +00:00
lion
65bbadcfa8
Fix starter toast not being dismissed when capturing a pokemon
2026-07-25 03:13:11 +00:00
阿鱼
a70d5e200a
Translated using Weblate (Chinese (Simplified Han script))
...
Currently translated at 99.5% (9420 of 9467 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/zh_Hans/
2026-07-25 00:24:55 +00:00
阿鱼
4d0ee751a3
Translated using Weblate (Chinese (Simplified Han script))
...
Currently translated at 97.2% (9206 of 9467 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/zh_Hans/
2026-07-24 22:42:33 +00:00
Hiroku
d87438e53d
I'll try changing the repo URL, that's a good trick
2026-07-24 16:57:53 +10:00
Hiroku
3efef07afa
Merge remote-tracking branch 'origin/main'
2026-07-24 16:27:11 +10:00
Hiroku
9ff227fbef
Fix pipelines maybe with findutils installs?
2026-07-24 16:27:01 +10:00
Hiroku
55ef5fd537
Merge branch 'fix-forms-riding-camera-offset' into 'main'
...
Fix riding camera offset defined on Pokemon forms not being applied
See merge request cable-mc/cobblemon!2326
2026-07-24 06:23:29 +00:00
lion
b3cdfb579c
Fix riding camera offset defined on Pokemon forms not being applied
2026-07-24 06:23:28 +00:00
Hiroku
29588f1fde
Merge branch 'implement_pokemon' into 'main'
...
the last of 1.8 (merge once ride stats are in)
See merge request cable-mc/cobblemon!2329
2026-07-24 06:19:25 +00:00
Polymeta
24c10d1a4f
Merge branch 'riding-scrape-1.8' into 'implement_pokemon'
...
Riding scrape
See merge request cable-mc/cobblemon!2330
2026-07-24 06:10:15 +00:00
Carmendar
ac0d9d4d74
Seat fixes
2026-07-24 00:53:00 -05:00
Nico Merenq
d33974b19e
Translated using Weblate (Russian)
...
Currently translated at 78.8% (7467 of 9467 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ru/
2026-07-24 05:48:29 +00:00
Carmendar
1dcdfe309e
Correcting Goodra ride stats
2026-07-24 00:03:33 -05:00
Landon Wills
6ce1990145
Fix issues with scraper
2026-07-24 00:54:33 -04:00
Landon Wills
1203721889
Remove pidgeotto scrape
2026-07-24 00:54:01 -04:00
Landon Wills
333672f993
Push pidgeot riding scrape
2026-07-24 00:53:33 -04:00
Carmendar
f0f9a9596f
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2026-07-23 23:52:58 -05:00
Carmendar
80b8aa2b8c
Hisuian Goodra anim updates
2026-07-23 23:52:41 -05:00