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
16,756 Commits 222 Branches 22 Tags
main
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hiroku aa39c1906e Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2495
 2026-10-17 23:48:54 +00:00
Hiroku 2f87d53af6 Merge remote-tracking branch 'origin/lang-updates' 2026-10-13 17:34:12 +10:00
Hiroku 49886389cf Fine the snapshot can be true again 2026-10-11 12:57:43 +10:00
Hiroku 643bf9068b But what if the snapshot was false 2026-10-11 10:54:55 +10:00
Hiroku 53f3258246 Merge remote-tracking branch 'origin/lang-updates' 2026-10-11 10:53:42 +10:00
Hiroku 1e9895ec84 buncha changelog updates [skip-ci] 2026-10-11 10:49:11 +10:00
Hiroku 0dc662d295 Merge branch 'starter-screen-fixes' into 'main' 
Fixes minor but annoying starter screen fixes

See merge request cable-mc/cobblemon!2424
 2026-09-20 09:33:15 +00:00
Hiroku bb5828531a Merge branch 'type-gem-fix' into 'main' 
Fix typo and update changelog.

See merge request cable-mc/cobblemon!2422
 2026-09-20 02:29:36 +00:00
Hiroku 0bd7b4dab3 Merge branch 'decorative-items-restored' into 'main' 
Decorative Items Project Returns

See merge request cable-mc/cobblemon!2343
 2026-09-13 02:24:00 +00:00
Hiroku 8cbada0cf5 Fix changelog whackiness [skip-ci] 2026-09-13 12:23:40 +10:00
Hiroku f0784fec2d Merge remote-tracking branch 'origin/main' into decorative-items-restored 2026-09-13 12:21:54 +10:00
Hiroku cfe0c5e0a5 Snap on 2026-09-13 11:27:40 +10:00
Hiroku 0bc5bb5caa Snap off and changelog updates 2026-09-13 08:03:56 +10:00
Hiroku 3330941a2c Merge remote-tracking branch 'origin/lang-updates' 2026-09-13 07:58:31 +10:00
Paul ef8b4fd3cd Fixed Pokémon on shoulders not animating if they are visibly holding a held item. 
Closes #1859
 2026-09-10 19:20:36 +10:00
Paul 1c720793c4 Rescraped spawns 2026-09-10 18:56:17 +10:00
Paul 0d9a4f9392 Some changelog [skip-ci] 2026-09-07 20:04:41 +10:00
Hiroku 9a0648d956 Merge branch 'issue-2061' into 'main' 
Fixed the TM Machine rejecting moves unlocked by unlockAllMoveDexMovesByDefault

Closes #2061

See merge request cable-mc/cobblemon!2383
 2026-09-07 01:43:53 +00:00
Paul 91187ce952 Fixed NPCs getting their own TM progress file. Closes #2059 2026-09-07 11:42:33 +10:00
Hiroku 686bc62996 Merge branch 'refactor/molang-fn-code-smell' into 'main' 
style: MoLang functions autumn codestyle cleanup

See merge request cable-mc/cobblemon!2368
 2026-09-07 01:22:48 +00:00
Hiroku 5925247ace Merge branch 'wing_flap_fix' into 'main' 
Removed incorrect sound keyframes from Rufflet, Braviary and Hisuian Braviary

See merge request cable-mc/cobblemon!2381
 2026-09-07 01:05:11 +00:00
Hiroku 7e582090f8 Merge branch 'issue-1774v2' into 'main' 
Fixed stat_compare and stat_equal evolution requirements crashing on special stats (Version 2)

Closes #1774

See merge request cable-mc/cobblemon!2373
 2026-09-07 00:25:47 +00:00
Paul 4eb39566fa Resnap your shot 2026-09-06 11:52:33 +10:00
Paul b33536e872 Not snapshot 2026-09-06 11:24:44 +10:00
Paul 5957ddae58 Merge remote-tracking branch 'origin/main' 2026-09-06 10:54:43 +10:00
Paul fcb798161e A bunch more changelog cleanup [skip-ci] 2026-09-06 10:54:30 +10:00
Paul 25c6fb6d31 Merge remote-tracking branch 'origin/lang-updates' 2026-09-06 09:18:08 +10:00
Paul a80689609c Merge remote-tracking branch 'origin/main' into implement_pokemon 2026-09-05 19:28:24 +10:00
Paul 42c2eab418 A bunch of changelog cleanup [skip-ci] 2026-09-05 19:26:19 +10: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
Hiroku 85f80c530e Merge branch 'berry-patch-persistent-leaves-fix' into 'main' 
fixing the false persistent leaves

See merge request cable-mc/cobblemon!2366
 2026-09-05 00:05:08 +00: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
Hiroku 2faf669ace Merge branch 'implement_pokemon' into 'main' 
Many movelist changes and pokemon bug fixes

Closes #2049 and #2050

See merge request cable-mc/cobblemon!2365
 2026-09-04 20:44:52 +00:00
Paul d9d3583cb1 Wrong operator chief (closes #2057) 2026-09-05 05:35:33 +10:00
Paul adaa852b59 Data scrape for deerling, sawsbuck, psyduck 2026-09-04 23:30:37 +10:00
Paul c17c48caec Merge remote-tracking branch 'origin/main' into implement_pokemon 2026-09-04 23:28:10 +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
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
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
Hiroku 2d61cb5979 Merge branch 'alpha-eye-fixes' into 'main' 
Alpha particles no longer render on pokemon without eyes and Alpha eye trails...

See merge request cable-mc/cobblemon!2361
 2026-09-04 03:32:06 +00: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
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
Paul 297fa6f9b0 Changelog 2026-09-02 21:13:18 +10:00
Paul 455b6bde43 Merge remote-tracking branch 'origin/lang-updates' 2026-09-02 21:12:20 +10:00
Hiroku b3f32404cb Merge branch 'random-starter' into 'main' 
Random Starters

See merge request cable-mc/cobblemon!2354
 2026-09-02 11:10:13 +00:00
Paul 8b4326a82d Logic cleanup 2026-09-02 21:05:45 +10:00
Paul fb45d110bc Merge remote-tracking branch 'origin/random-starter' into random-starter 2026-09-02 20:58:07 +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
Hiroku e3cfb7199d Merge branch 'main' into 'random-starter' 
# Conflicts:
#   common/src/main/resources/data/cobblemon/callbacks/pokemon_entity_spawn/apply_marks.molang
 2026-09-02 10:54:05 +00: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
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
Hiroku a51db63d86 Merge branch 'level-spawning' into 'main' 
Add ability to blocklist worlds from spawning Pokemon

See merge request cable-mc/cobblemon!2356
 2026-08-31 09:27:48 +00:00
Paul efd77e1337 Scraped more spawns 2026-08-31 19:04:43 +10:00
Paul acc4f341b6 Fixed dudunsparce and maushold always having the same form instead of having randomization 2026-08-31 19:03:56 +10:00
Paul 53b712f8a2 Added isPokeSnack condition to spawning 2026-08-31 19:02:31 +10:00
Paul 61181f3f1c Clamping probably goes the other way around for herds 2026-08-30 12:03:53 +10:00
Hiroku b2b5a8f715 Merge branch 'whoopsies' into 'main' 
Fix parents

See merge request cable-mc/cobblemon!2355
 2026-08-28 04:57:52 +00:00
Hiroku 4a3f3b0d3f Merge branch '1.8-tag-updates' into 'main' 
Edits to a few tags.

See merge request cable-mc/cobblemon!2353
 2026-08-27 16:18:58 +00:00
Paul bc423515fb Merge remote-tracking branch 'origin/main' 2026-08-28 01:10:36 +10:00
Paul 13e8e39d43 Rescraped spawns 2026-08-28 01:10:25 +10:00
Paul 8dd6446b6a Fixed uncommon herds not spawning more than a leader most of the time, improved(?) herd members spawning in walls 2026-08-28 01:07:54 +10:00
Hiroku 8fc9b46ce7 Merge branch 'implement_pokemon' into 'main' 
e

See merge request cable-mc/cobblemon!2352
 2026-08-27 10:52:13 +00:00
Hiroku 832d315501 The possessive pronoun is without the apostrophe 
(Otherwise it is a contraction)
 2026-08-27 10:34:29 +00:00
Hiroku d4da62adb5 Merge branch 'More-Habitat-Bug-Fixes' into 'main' 
Increased the rarity of fossil structures again. Adjusted so type gems should...

See merge request cable-mc/cobblemon!2344
 2026-08-27 10:31:33 +00:00
Hiroku f7f6e9d2ee Merge branch 'patch-2' into 'main' 
Fixed a typo causing the AI to not recognize surging strikes as a multi hit move.

See merge request cable-mc/cobblemon!2342
 2026-08-27 10:30:20 +00:00
Paul cf36db419d Oopsy on level clamping 2026-08-25 20:17:50 +10:00
Paul f634d7fae0 missed a file 2026-08-25 19:49:55 +10:00
Paul dddb3b3d48 Koffing and Sudowoodo herd fixes 2026-08-25 19:49:47 +10:00
Paul 2468f8a8e6 Fixed spawn scraper not processing Leader = "only" properly from the sheet, leading to impossible spawns 2026-08-25 19:45:27 +10:00
Paul c6ce359736 Fixed herdable pokemon levelRange field not being used to clamp the resulting level possibilities 2026-08-25 19:40:48 +10:00
Paul e053d2864e Merge remote-tracking branch 'origin/main' 2026-08-24 23:15:09 +10:00
Paul e098426a6d Fixed issue in behaviour scraper, fixed see sky condition on herds not being interpreted, rescraped herds and species data 2026-08-24 23:14:58 +10:00
Hiroku 069f483552 Merge branch 'compost-this' into 'main' 
Composting Fixes

Closes #2008 and #2043

See merge request cable-mc/cobblemon!2348
 2026-08-24 11:18:40 +00:00
Paul 82ba0334a7 open keyword not needed 2026-08-24 18:14:44 +10:00
Paul bfed3ad52f Fixed habitat natural-mode injecting spawns into all buckets 2026-08-24 18:13:52 +10:00
Paul a7dd139c14 More script rescraping but bombing existing spawns first, correctly purging removed spawns 2026-08-24 18:00:42 +10:00
Paul 840762c00d Some scraping of spawns 2026-08-24 17:53:29 +10:00
Paul 93515777b8 oop put that back 2026-08-22 17:40:15 +10:00
Paul 16e327bd27 Rescraped behaviours, scraped spawns 2026-08-22 17:40:00 +10:00
Hiroku 0edb9ad115 Merge branch 'pasture-block-performance-optimization' into 'main' 
Index Pokémon stores by UUID for O(1) lookup

See merge request cable-mc/cobblemon!2345
 2026-08-22 02:18:14 +00:00
Hiroku 8189e5d819 Merge branch 'Habitat-Adjustments' into 'main' 
bunch of fixes

See merge request cable-mc/cobblemon!2350
 2026-08-22 00:39:34 +00:00
Paul 1f9c632883 Fixed scraper for behaviours skipping no-form records, rescraped 2026-08-15 14:38:56 +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
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
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
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
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