Commit Graph
12918 Commits
Author SHA1 Message Date
Polymeta 25bcd1dec2 alphas have two tms for sure 2026-09-05 19:18:24 +00:00
Polymeta 7ec7152ec3 Merge branch 'display-case-cull-fix' into 'main'
Fixed incorrect culling of display case

See merge request cable-mc/cobblemon!2370
2026-09-05 16:33:11 +00:00
Slippy 4550cf31ed fixing some blockstate frozen water 2026-09-05 09:34:12 -05:00
Gertimoshka 4d783b2d15 Fixed incorrect culling of display case 2026-09-05 15:27:30 +02:00
Polymeta c0fc28d61d Merge branch 'move-sound-implementation' into 'main'
Quick sound implementation

See merge request cable-mc/cobblemon!2367
2026-09-05 12:41:14 +00:00
Jerzykv eb83d11952 Bergmite typo fix 2026-09-05 14:02:57 +02:00
Sterrezo 7c1c0dd3c8 Merge branch 'main' into move-sound-implementation 2026-09-05 10:58:07 +02:00
Sterrezo 320f5f7090 Added sounds to Blizzard and Horn Drill 2026-09-05 10:57:55 +02:00
Paul beed7a322c Merge remote-tracking branch 'origin/main' 2026-09-05 16:47:31 +10:00
Paul b58e9c6de5 Updated best-spawner-config version so it auto re-exports on new version 2026-09-05 16:47:16 +10:00
Slippy 1ab5f13704 fixing the false persistent leaves 2026-09-04 18:40:03 -05:00
Paul 782f0b8a5a Merge remote-tracking branch 'origin/main' 2026-09-05 07:24:59 +10:00
Paul 9dbd27b23c Fixed alphas not being stronger than you if your highest level party member is level 41-50, rescaled alpha level boost 2026-09-05 07:24:44 +10:00
Frank The Farmer 1c38433dda Many movelist changes and pokemon bug fixes 2026-09-04 20:44:52 +00:00
Paul d9d3583cb1 Wrong operator chief (closes #2057) 2026-09-05 05:35:33 +10:00
Paul f6a833a5fd Fixed drops script not pointing to the right sheet, allow flower species feature to be used without a key, scraped spawns 2026-09-04 23:24:10 +10:00
gruxor 37e526614f Update showdown zip 2026-09-04 06:29:26 -04:00
Sterrezo bbfe6bd143 Revert "Added Cry SFX for Surskit, Duskull, Dusclops, Applin, Flapple, Duraludon (w/ bonk), Dipplin, Archaludon, & Hydrapple. Added Move SFX for Play Rough."
This reverts commit 562418e324.
2026-09-04 10:05:21 +02:00
Polymeta aa68ef640d Merge branch 'tm-fix' into 'main'
Fixed TM serializing dummy move components and not being usable when first retrieved from a loot chest

See merge request cable-mc/cobblemon!2363
2026-09-04 05:25:29 +00:00
SplashOfAzure 562418e324 Added Cry SFX for Surskit, Duskull, Dusclops, Applin, Flapple, Duraludon (w/ bonk), Dipplin, Archaludon, & Hydrapple. Added Move SFX for Play Rough. 2026-09-03 21:37:41 -07:00
Hiroku 47a6d450cf Merge branch 'mp-ride-fix' into 'main'
Fixed crash when passenger packet arrives before seat assignment packet

See merge request cable-mc/cobblemon!2362
2026-09-04 04:25:35 +00:00
Crater 14e4abca27 Fixed crash when passenger packet arrives before seat assignment packet 2026-09-04 04:25:35 +00:00
Hiroku 108716eb84 Merge branch 'temp-showdown-update' into 'main'
Update showdown version

See merge request cable-mc/cobblemon!2334
2026-09-04 04:08:34 +00:00
Paul 8c6ef80cf5 Fixed TM serializing dummy move components and not being usable when first retrieved from a loot chest 2026-09-04 14:07:52 +10:00
JPAKx4 3e89e2b9ad Alpha particles no longer render on pokemon without eyes and Alpha eye trails no longer render on pokemon mid capture. 2026-09-03 21:12:09 -05:00
SplashOfAzure 016db10de7 Added Sound for Light Screen 2026-09-03 13:41:46 -07:00
Sterrezo 61d01d3731 Added sounds for Hydro Pump, updated Kinesis 2026-09-03 22:14:07 +02:00
Polymeta ba5529e401 Merge branch 'adorn-compat-update' into 'main'
Update Adorn minimum compatibility version to 6.3.1.

See merge request cable-mc/cobblemon!2351
2026-09-03 16:09:14 +00:00
Jackson Bowes e0a4a72f9c Merge branch 'stamina-doubling-the-squeakuel' into 'main'
return stamina mins to previous and raise stamina regen where it matters

See merge request cable-mc/cobblemon!2360
2026-09-03 11:07:29 -05:00
Paul 59c922dee0 Merge remote-tracking branch 'origin/main' 2026-09-03 20:52:37 +10:00
Paul e5dda3e975 In herds, levelRangeOffset applies last in the process instead of near the start, fixes Unowns 2026-09-03 20:52:29 +10:00
jackowes 7d75993562 return stamina mins to previous and raise stamina regen where it matters 2026-09-02 20:28:49 -05:00
Jackson Bowes 54c64d3dfe Merge branch 'double-stams' into 'main'
double all ride stams

See merge request cable-mc/cobblemon!2359
2026-09-02 18:09:46 -05:00
jackowes ddf1396abb double all ride stams 2026-09-02 17:36:39 -05:00
Paul e3b2220813 Only wild alphas hide their items 2026-09-03 08:29:32 +10:00
Hiroku f982a94ebb Merge branch 'some-fixes' into 'main'
A few bug fixes

See merge request cable-mc/cobblemon!2358
2026-09-02 22:28:53 +00:00
Jackson Bowes dac42f1971 Merge branch 'issue-1738' into 'main'
Fixed bird mounts flickering between their fly and glide animations

Closes #1738

See merge request cable-mc/cobblemon!2346
2026-09-02 14:37:25 -05:00
Paul 455b6bde43 Merge remote-tracking branch 'origin/lang-updates' 2026-09-02 21:12:20 +10:00
Paul 8b4326a82d Logic cleanup 2026-09-02 21:05:45 +10:00
Paul a51ccb1a86 Merge remote-tracking branch 'origin/main' into random-starter
# Conflicts:
#	common/src/main/resources/data/cobblemon/callbacks/pokemon_entity_spawn/apply_marks.molang
2026-09-02 20:57:59 +10:00
Paul 3bb61dd649 Alphas don't show their held items 2026-09-02 20:51:42 +10:00
Paul b55d4d576d Merge remote-tracking branch 'origin/main' into some-fixes 2026-09-02 20:31:10 +10:00
Paul 99d818d11e Fixed syncing of battle victory count not running, leading to R to battle prompt staying after first victory 2026-09-02 20:28:51 +10:00
Paul 48b546fad4 Fixed (hackily) gender selection for strictly gender-formed pokemon 2026-09-02 20:13:38 +10:00
Paul 2ee04e3b1c Ensure healthy pokemon appear earlier in the party list when converting a party to a battle team 2026-09-02 19:18:02 +10:00
Hiroku fbef8ff0dc Merge branch 'fix/battle-faint-enhancements' into 'main'
🐛 fix: battle faint enhancement

See merge request cable-mc/cobblemon!2323
2026-09-01 12:02:22 +00:00
Polymeta c25a8ca8b5 Merge branch 'Added-TM-Loot-and-Bug-Fixes' into 'main'
Added tm loot and bug fixes

See merge request cable-mc/cobblemon!2357
2026-09-01 09:22:47 +00:00
Slippy d07729abfc adjusted deep sea spire location 2026-08-31 21:56:25 -05:00
Slippy 945c34ccd6 woops. small issue 2026-08-31 12:23:15 -05:00
Hiroku 8af45c01d8 Merge branch 'they-are-jumbo-sized-alphas' into 'main'
Fixed Alphas and other pokemon getting improper size marks

See merge request cable-mc/cobblemon!2349
2026-08-31 10:21:45 +00:00