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,366 Commits 222 Branches 22 Tags
1674cb0913173b0b99971f6b0461a7ac16e8096f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Polymeta 1674cb0913 fix typo 
Closes #2115
 2026-09-29 06:44:27 +00:00
Polymeta 152ce4e923 Merge branch 'shoulder-mount-armor-clipping' into 'main' 
Shoulder Mount Enhancements

See merge request cable-mc/cobblemon!2410
 2026-09-29 06:42:36 +00:00
Polymeta f2fcc5ba79 Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

Closes #2106

See merge request cable-mc/cobblemon!2428
 2026-09-28 20:25:03 +00:00
Polymeta 6bc974f90f Merge branch 'keyframe-super-ghostbusters' into 'main' 
Fix for doubled effect keyframes

Closes #2107

See merge request cable-mc/cobblemon!2436
 2026-09-28 13:14:51 +00:00
Polymeta a4b7ee3b38 follow-up fix from registry change 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-28 09:01:58 +01:00
Polymeta a0e732dc6e Merge branch 'perf/build-speed' into 'main' 
Speed up the Gradle build

See merge request cable-mc/cobblemon!2429
 2026-09-24 14:35:25 +00:00
Polymeta a785e574e0 Merge branch 'feature/data-registries' into 'main' 
26.1.2 backport of dataregistry

See merge request cable-mc/cobblemon!2285
 2026-09-22 21:08:14 +00:00
Polymeta 4b236b0268 Merge branch 'feature/remember-your-tm' into 'main' 
load features a lot sooner to avoid form switching

Closes #2085

See merge request cable-mc/cobblemon!2406
 2026-09-22 21:07:44 +00:00
Polymeta 1cd86ae5d6 small fixes 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-22 16:43:33 +01:00
Polymeta b7489a0b14 tidy up changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-22 15:32:25 +01:00
Polymeta f7554425dc Merge branch 'tm-shelf-mipmap-correction' into 'main' 
Fix mip map of TM shelf disc textures to be 16x16

Closes #2081

See merge request cable-mc/cobblemon!2398
 2026-09-22 14:26:41 +00:00
Polymeta 858d2e908a I tidied up too well 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 22:12:18 +01:00
Polymeta b61e0b0c82 tidy up changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 22:11:43 +01:00
Polymeta 4d9a6e71c9 use correct texture for upgrade and dubious disc 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 22:07:52 +01:00
Polymeta 9a7536b068 you were not supposed to be there 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 14:42:23 +01:00
Polymeta bd973e702e per type texture for disc shelf tms 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 14:40:24 +01:00
Polymeta cdb8ee0d8e [skip-ci] tidy up changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 12:07:55 +01:00
Polymeta e7d86a382c Merge branch 'dex_molang' into 'main' 
Molang: Individual Dex molang

See merge request cable-mc/cobblemon!2273
 2026-09-21 09:16:10 +00:00
Polymeta 1c30acc53c Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2417
 2026-09-21 09:14:23 +00:00
Polymeta 32b0699235 load features a lot sooner to avoid form switching 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 10:13:59 +01:00
Polymeta e9c6580230 fix merge conflicts 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 10:13:27 +01:00
Polymeta f893eb48fd fix some errors I forgot about 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 09:38:51 +01:00
Polymeta 232e2f18bf MR feedback 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 09:38:51 +01:00
Polymeta c266c99710 26.1.2 backport of dataregistry 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 09:38:49 +01:00
Polymeta 2a0e8f6d47 [skip-ci] tidy up changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 09:32:44 +01:00
Polymeta e6bd8ec529 Merge branch 'neoforge-reload-fix' into 'main' 
Neoforge resource fix

See merge request cable-mc/cobblemon!2333
 2026-09-21 08:30:54 +00:00
Polymeta 447cfc2ae5 Merge branch 'useful-misc-functions' into 'main' 
Smoother ride rotations.

See merge request cable-mc/cobblemon!2407
 2026-09-21 08:28:50 +00:00
Polymeta 8dfeb0d260 Merge branch 'no-glass-bottles-in-those' into 'main' 
Fixed Mochis and Feathers dropping glass bottles when they shouldn't

See merge request cable-mc/cobblemon!2425
 2026-09-21 08:24:28 +00:00
Polymeta caa7b19833 Merge branch 'Snowy-Burrow-Spawns-Fix' into 'main' 
Fix Snowy burrows spawns and some floating water in one difting iceberg

See merge request cable-mc/cobblemon!2423
 2026-09-21 08:23:17 +00:00
Polymeta 64dd8ae193 fix license header 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 09:17:44 +01:00
Polymeta 156ee6f290 new negate requirement 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-21 08:23:04 +01:00
Polymeta bf7d40c9b5 Merge branch 'small-jvm-fix' into 'main' 
Added JvmField to Some values in Cobblemon Blocks cause it was forgotten

See merge request cable-mc/cobblemon!2419
 2026-09-18 18:30:24 +00:00
Polymeta 5abb3d7f97 Merge branch 'fix/molang-delete-variables-fn' into 'main' 
fix: reintroduce `delete_variables` general molang fn

See merge request cable-mc/cobblemon!2421
 2026-09-18 18:29:23 +00:00
Polymeta dd372f3160 Merge branch 'recipe-booking' into 'main' 
Recipe Book Tweaks

Closes #2088

See merge request cable-mc/cobblemon!2418
 2026-09-16 10:03:42 +00:00
Polymeta 3cdf28ffdd Merge branch 'Chorus-Briar-Fix' into 'main' 
I'm never doing an update where I have to keep track of 650+ structure files again

See merge request cable-mc/cobblemon!2414
 2026-09-14 21:18:29 +00:00
Polymeta 2d851cb134 Merge branch 'tm-crafting-corrections' into 'main' 
TM Recipes

See merge request cable-mc/cobblemon!2413
 2026-09-14 13:03:40 +00:00
Polymeta 6ab5ad52ec Merge branch 'typegem-advancement-trigger' into 'main' 
Adds typegem item advancement trigger

Closes #2086

See merge request cable-mc/cobblemon!2411
 2026-09-13 20:58:08 +00:00
Polymeta 02e63b6fc8 Merge branch 'gem-block-alert' into 'main' 
Fixed Missing Recipe Advancements

See merge request cable-mc/cobblemon!2409
 2026-09-13 14:41:13 +00:00
Polymeta 3aebcf66ec rename lang file to match convention 2026-09-13 14:26:44 +00:00
Polymeta 79ea082d7e Merge branch '1.8.1-final-engi-fixes' into 'main' 
1.8.1 final engi fixes

See merge request cable-mc/cobblemon!2404
 2026-09-12 20:09:26 +00:00
Polymeta e363ce5e0e Merge branch 'Log-Spam-Fix' into 'main' 
Fixed console spam with carved_ice_spikes. Fixed air pockets in deep sea spires

See merge request cable-mc/cobblemon!2403
 2026-09-12 17:14:50 +00:00
Polymeta ec8b35860c Merge branch '1.8.1-implementation-fixes' into 'main' 
fixed sableye's shoulder mount animations (thanks @kiteman.exe from discord)

See merge request cable-mc/cobblemon!2402
 2026-09-12 06:40:07 +00:00
Polymeta b54f2442c9 Merge branch '1.8.1-implementation-fixes' into 'main' 
1.8.1 implementation fixes (again)

See merge request cable-mc/cobblemon!2393
 2026-09-10 12:07:05 +00:00
Polymeta f821abd7e5 fix helditem notation in spawn file 2026-09-10 11:04:04 +00:00
Polymeta 08ac7d478d Merge branch 'shoulder-fix' into 'main' 
Fixed Pokémon on shoulders not animating if they are visibly holding a held item.

Closes #1859

See merge request cable-mc/cobblemon!2392
 2026-09-10 09:37:54 +00:00
Polymeta 4f51016ca9 Merge branch '1.8.1-implementation-fixes' into 'main' 
1.8.1-implementation-fixes

See merge request cable-mc/cobblemon!2390
 2026-09-10 09:34:16 +00:00
Polymeta b4aba94f89 bump neoforge.mods.toml loaderVersion to be in line with what cobblemon is built against 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-10 08:22:19 +01:00
Polymeta 9832730f5c Merge branch 'Ancient-Wellspring-&-Chorus-Briar-Fixes' into 'main' 
Ancient Wellsprings now how the correct habitat spawn pool. Chorus Briars no...

See merge request cable-mc/cobblemon!2391
 2026-09-10 06:53:35 +00:00
Polymeta b5468a4a4f Merge branch 'main' into implement_pokemon 2026-09-09 09:06:51 +01:00
Polymeta 5055e3926c Merge branch '1.8.1-engi-fixes' into 'main' 
ampharos + alolan raticate fixes

See merge request cable-mc/cobblemon!2387
 2026-09-09 08:05:11 +00:00
Polymeta ab9851fd12 fixed size altering effect and ensure pokemon dont get too small to live 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-09 08:05:55 +01:00
Polymeta a9df6bc709 Merge branch 'pokeball-catchrate-fix' into 'main' 
Fixed Beast, Moon, Love, Timer and Luxury Ball behaviour not matching their tooltips

Closes #2062, #2063, #2064, #2065, and #2066

See merge request cable-mc/cobblemon!2384
 2026-09-09 06:33:15 +00:00
Polymeta 3681813976 Merge branch 'misc-bug-fixes' into 'main' 
Fix spawn file typos and type gem cluster bug.

See merge request cable-mc/cobblemon!2386
 2026-09-08 14:38:12 +00:00
Polymeta 333d234dbe [skip-ci] push new tag documentation for 1.8 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-09-08 10:21:46 +01:00
Polymeta 357ac35802 Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2380
 2026-09-05 23:27:50 +00:00
Polymeta 7fd9b678f1 Merge branch 'implement_pokemon_local' into 'implement_pokemon' 
Quick-fix a few learnset gaps

See merge request cable-mc/cobblemon!2371
 2026-09-05 23:12:55 +00:00
Polymeta ecfc71bfd1 Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2379
 2026-09-05 23:01:10 +00:00
Polymeta f2919aa75d Merge branch 'tm-machine-loop-sound-fix' into 'main' 
Fix TM Machine sound not looping properly when UI is open

See merge request cable-mc/cobblemon!2378
 2026-09-05 23:00:56 +00:00
Polymeta 336b076eee Merge branch 'tm-drop-fix' into 'main' 
Fixed neoforge tms being dropped in GUI when applied to pokemon through TMM

See merge request cable-mc/cobblemon!2377
 2026-09-05 23:00:15 +00:00
Polymeta c6e217dda7 Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2376
 2026-09-05 21:24:33 +00:00
Polymeta b0886449bb Merge branch 'move-sync-fix' into 'main' 
Fix learnset not syncing TMs or Egg moves.

Closes #2058

See merge request cable-mc/cobblemon!2375
 2026-09-05 21:00:54 +00:00
Polymeta 5667ddf6a2 Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2374
 2026-09-05 20:10:27 +00:00
Polymeta 096136b48e bucket tweaks 2026-09-05 19:21:55 +00:00
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
Polymeta 0ac7f664f1 Merge branch 'rocky-tidepool-water-fix' into 'main' 
fixing some blockstate frozen water

See merge request cable-mc/cobblemon!2372
 2026-09-05 14:52:37 +00: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
Polymeta 3701ae7dac Merge branch 'implement_pokemon' into 'main' 
Implement pokemon typo fix

Closes #2049 and #2050

See merge request cable-mc/cobblemon!2369
 2026-09-05 12:39:41 +00:00
Polymeta ab3d26dee6 Merge branch 'showdown-zip' into 'main' 
Update showdown zip

See merge request cable-mc/cobblemon!2364
 2026-09-04 10:34:25 +00:00
Polymeta 612b75d3e5 Merge branch 'main' into implement_pokemon 2026-09-04 09:39:15 +01: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
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
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
Polymeta c6cb98cabd Delete 0460_abomasnow_alpha.json 2026-08-22 14:23:00 +00:00
Polymeta 95f56fc1f8 Delete 0738_vikavolt_alpha.json 2026-08-22 14:12:58 +00:00
Polymeta a328c54dda Edit 0629_vullaby_herd.json 2026-08-22 13:58:54 +00:00
Polymeta 058c06f56b Merge branch 'implement_pokemon' into 'main' 
some ride stats and other stuff

See merge request cable-mc/cobblemon!2341
 2026-08-08 19:14:42 +00: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
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
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
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
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
Polymeta 280e1ae820 Merge branch 'implement_these_dumbfuck_birds' into 'implement_pokemon' 
Implement these dumbfuck birds

See merge request cable-mc/cobblemon!2328
 2026-07-20 08:02:19 +00:00
Polymeta 7cf1f5a4e5 Merge branch 'habitats-crash-fix' into 'main' 
Fixed some crashes that happened due to invalid processor referencing and structure

See merge request cable-mc/cobblemon!2327
 2026-07-18 22:12:10 +00:00
Polymeta ce584bd403 Merge branch 'tm-unlock-utilities' into 'main' 
Move Data Monitor Learn to Helper, Add Utility and MoLang Functions for Unlocking TMs + Impossible Obtain Method

See merge request cable-mc/cobblemon!2321
 2026-07-09 08:09:45 +00:00
Polymeta 03b74d4b72 Merge branch 'implement_pokemon' into 'main' 
various asset updates

See merge request cable-mc/cobblemon!2319
 2026-07-02 06:16:52 +00:00
Polymeta 2047f4f461 Merge branch 'my-stupid-tmm-bug' into 'main' 
Fix for TMM putting burn screen tab when no tm is selected

See merge request cable-mc/cobblemon!2320
 2026-06-30 08:08:37 +00:00
Polymeta 7ccd0bbe11 Merge branch 'multiplayer_mount_sync' into 'main' 
Multiplayer mount sync

Closes #2023

See merge request cable-mc/cobblemon!2315
 2026-06-22 12:23:42 +00:00
Polymeta d289880cc8 Merge branch 'tmm-fixes-n-changes' into 'main' 
TMM Fixes and Changes

See merge request cable-mc/cobblemon!2316
 2026-06-20 19:43:21 +00:00
Polymeta 6148b58fdc Merge branch 'qa-fixes-84' into 'main' 
Qa fixes 84

See merge request cable-mc/cobblemon!2314
 2026-06-17 11:17:33 +00:00
Polymeta 3c3d4e4552 [skip-ci] changelogging 2026-06-16 17:43:50 +00:00
Polymeta 796e416578 Merge branch 'fix-auto-third-person-mod-compat' into 'main' 
Add check for remember ride camera config when dismounting

Closes #2012

See merge request cable-mc/cobblemon!2308
 2026-06-16 17:37:08 +00:00
Polymeta b2b871617a Merge branch 'qa-fixes-85' into 'main' 
Qa fixes 85

See merge request cable-mc/cobblemon!2313
 2026-06-16 17:19:16 +00:00
Polymeta 2c2623e0f9 Merge branch 'summary-and-pokedex-profile-translations' into 'main' 
Add profile translation and scale properties specific to the Pokédex and summary

See merge request cable-mc/cobblemon!2309
 2026-06-16 13:44:41 +00:00
Polymeta 420cbd2c99 Merge branch 'fix-pvn-fainted-party-battle' into 'main' 
Fix PvN battle start with fainted parties

See merge request cable-mc/cobblemon!2311
 2026-06-16 09:45:36 +00:00
Polymeta e15ac73b1b Merge branch 'fix-enchanted-fossil-items' into 'main' 
Fix crash when using enchanted items in the ressurection machine

Closes #1973

See merge request cable-mc/cobblemon!2307
 2026-06-11 21:48:56 +00:00
Polymeta ebdfa7edc0 Merge branch 'fix-pokemon-properties-nickname-parsing-to-json' into 'main' 
Add pokémon nickname when serializing and deserializing to json on pokémon properties

Closes #1981

See merge request cable-mc/cobblemon!2306
 2026-06-11 13:48:21 +00:00
Polymeta ea8179018d Merge branch 'modded-discs-compat' into 'main' 
Add modded discs compatibility with disc shelves

See merge request cable-mc/cobblemon!2305
 2026-06-11 08:20:18 +00:00