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
Polymeta f9dd1448e5 Merge branch 'item-2072' into 'main' 
Added tab completion for the alpha property and three missing property aliases

Closes #2072

See merge request cable-mc/cobblemon!2388
 2026-10-18 22:33:30 +00:00
Polymeta 8663888abc Merge branch 'item-2013' into 'main' 
Fixed GUI Pokémon cries playing on the Master category instead of Friendly Creatures

Closes #2013

See merge request cable-mc/cobblemon!2389
 2026-10-18 22:14:04 +00:00
Polymeta f452cd9a05 Merge branch 'fix/ride-interact-checks' into 'main' 
fix: stricter riding checks on server side

Closes #2124

See merge request cable-mc/cobblemon!2499
 2026-10-18 22:12:19 +00:00
Polymeta b1066671f5 Merge branch 'quick-fix' into 'main' 
Flowerbed Clearning jigsaw fix, dripstone oasis jigsaw removal

See merge request cable-mc/cobblemon!2497
 2026-10-18 12:09:48 +00:00
Polymeta 387e85d4ad Merge branch 'fix/preset-conditions-mergers' into 'main' 
fix: Some spawn conditions merge minHeight/Depth data into max instead

Closes #2111

See merge request cable-mc/cobblemon!2498
 2026-10-18 12:07:55 +00:00
Polymeta a07ff7f442 Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2494
 2026-10-17 23:37:18 +00:00
Polymeta 5374569ea1 [skip-ci] tidy up changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-18 00:15:37 +01:00
Polymeta af9c1196bf youre meant to be looking the other way 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-18 00:08:51 +01:00
Polymeta 09d5543469 Merge branch 'fix/haters-gonna-hate-properly' into 'main' 
fix: Anger should be directed at proper target

Closes #2112

See merge request cable-mc/cobblemon!2492
 2026-10-17 23:03:41 +00:00
Polymeta c8e408c50a actually copy components when building up evolution displays 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-17 23:57:05 +01:00
Polymeta 86153419ee Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2480
 2026-10-17 17:36:00 +00:00
Polymeta 6e57d77d10 Merge branch 'More-Structure-Fixes' into 'main' 
More structure fixes

See merge request cable-mc/cobblemon!2491
 2026-10-16 22:54:46 +00:00
Polymeta bcdfef4886 Merge branch 'lights-out' into 'main' 
Bye Bye Magmarizer Glow

See merge request cable-mc/cobblemon!2490
 2026-10-16 06:49:58 +00:00
Polymeta 5004edbbb6 Merge branch 'fix/party-overlay-hide-nf' into 'main' 
fix: party overlay not hiding when player opens the pokedex scanner

Closes #2071

See merge request cable-mc/cobblemon!2467
 2026-10-15 15:37:49 +00:00
Polymeta 910551ee70 Merge branch 'fix/berry-pots' into 'main' 
fix: flower pots require some tending on neoforge

Closes #2126

See merge request cable-mc/cobblemon!2486
 2026-10-15 07:17:23 +00:00
Polymeta 6f3894f27b fix playermolang sometimes failing when they die 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-14 13:33:40 +01:00
Polymeta bbc9a5e62e Merge branch 'campfire-book-lies' into 'main' 
Recipe Book Lies No More

See merge request cable-mc/cobblemon!2487
 2026-10-14 11:32:52 +00:00
Polymeta 542839ba69 bump neoforge version 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-12 14:36:24 +01:00
Polymeta e155d32aaf small pokeball fix 
Closes #1601

Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-12 08:54:52 +01:00
Polymeta 743e0b7d66 changelog [skip-ci] 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-12 07:49:14 +01:00
Polymeta 1518d703f9 Merge branch 'restore-the-menu' into 'main' 
Fixed Mixins for Recipe Book causing conflict issues with other mods.

See merge request cable-mc/cobblemon!2484
 2026-10-12 06:44:16 +00:00
Polymeta 20ca91f1c9 fix friendship booster item tag location 
Closes #2125

Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-11 21:15:53 +01:00
Polymeta 6fb3c0e49a more evo dex fixes and crashes 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-11 21:12:22 +01:00
Polymeta 760f48d850 Merge branch 'evo-tree-fumble' into 'main' 
Evo tree now throws a warning instead of crashing when failing to build a mon's evo tree

See merge request cable-mc/cobblemon!2481
 2026-10-11 06:41:08 +00:00
Polymeta 52dacb03ae Merge branch 'evo-tree-pls-behave' into 'main' 
Evo tree small adjustments

See merge request cable-mc/cobblemon!2479
 2026-10-10 23:47:53 +00:00
Polymeta a04a91bf24 Merge branch 'feature/evolution-mania' into 'main' 
tweak some evo requirements

See merge request cable-mc/cobblemon!2476
 2026-10-10 21:25:13 +00:00
Polymeta 5e814f7ab5 tweak some evo requirements 2026-10-10 21:25:13 +00:00
Polymeta 2780f491d6 Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2478
 2026-10-10 19:44:59 +00:00
Polymeta 5cc069df78 Merge branch 'implement_pokemon' into 'main' 
Dipplin and Hydrapple shiny fixes

See merge request cable-mc/cobblemon!2477
 2026-10-10 16:03:26 +00:00
Polymeta 9222476c1f Merge branch 'fix/qa-bundle' into 'main' 
fix: an assortment of qa bugs

Closes #2070

See merge request cable-mc/cobblemon!2473
 2026-10-10 15:40:51 +00:00
Polymeta c5a802eaf6 changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-10 15:04:26 +01:00
Polymeta 2e27875460 Merge branch 'lang-updates' 2026-10-10 15:04:06 +01:00
Polymeta cd66887faa [skip-ci] tidy up changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-10 14:11:50 +01:00
Polymeta d665c87c21 more spawn tweaks 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-10 14:02:26 +01:00
Polymeta 044d3102b6 Merge branch 'fix-evo-tree-crash' into 'main' 
Fix grotle evolution crashing evo tree and species features not synching to the client

See merge request cable-mc/cobblemon!2456
 2026-10-10 12:51:04 +00:00
Polymeta 2865aa2272 Merge branch 'implement_pokemon' into 'main' 
poser tweaks + jellicent placeholders

See merge request cable-mc/cobblemon!2474
 2026-10-10 12:15:04 +00:00
Polymeta 7c4aae3e9d Merge branch '1.8.2-tag-fixes' into 'main' 
Fixes to regional tags.

See merge request cable-mc/cobblemon!2475
 2026-10-10 12:14:09 +00:00
Polymeta ed67142379 Merge branch '1.8.2-tag-fixes' into 'main' 
Updates to some tags to fix some errors and add future biome support.

See merge request cable-mc/cobblemon!2472
 2026-10-10 05:46:36 +00:00
Polymeta b82c27754f Merge branch 'fix/minior-random-core-color' into 'main' 
fix: minior core color should be decided randomly

See merge request cable-mc/cobblemon!2471
 2026-10-09 16:57:27 +00:00
Polymeta 63afec184e Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2463
 2026-10-09 16:41:24 +00:00
Polymeta d02441a273 Merge branch 'fix/mooshtank-checks' into 'main' 
fix: added checks for mooshtank aspect, denying usage of bowl on common miltanks

See merge request cable-mc/cobblemon!2468
 2026-10-09 15:25:11 +00:00
Polymeta a566e36754 Merge branch 'fix/tms-consumption-tmm-screen' into 'main' 
fix: tm stack not consumed on use in tmm screen

See merge request cable-mc/cobblemon!2466
 2026-10-09 14:31:51 +00:00
Polymeta ef1479fde6 Merge branch 'fix/equip-one-not-whole' into 'main' 
fix: equipping stackable items now equips one item of stack

See merge request cable-mc/cobblemon!2469
 2026-10-09 14:31:02 +00:00
Polymeta 9d7fc8435e scraped spawns again and pokemon that are part of herd will also get their specific drops 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-09 08:23:40 +01:00
Polymeta 5ec5cfbc4a Merge branch 'fix/bees-grow-apricorns-galarica' into 'main' 
Fixed bees not growing Apricorns or the Galarica Nut Bush

Closes #2095

See merge request cable-mc/cobblemon!2427
 2026-10-08 14:59:41 +00:00
Polymeta 1ef65449a8 Merge branch 'fix/addon-species-namespaces' into 'main' 
Fix crashes with addon-namespace species in evolution, bait and Pokédex lookups

Closes #1353

See merge request cable-mc/cobblemon!2465
 2026-10-08 14:56:31 +00:00
Polymeta cbfa8d3e78 Merge branch 'fix/alpha-chance-config-category' into 'main' 
fix: config category for alpha/shiny chance config fields for fossil machine...

See merge request cable-mc/cobblemon!2464
 2026-10-08 09:45:34 +00:00
Polymeta 7c32b07d3f scraped spawns 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-08 08:42:43 +01:00
Polymeta 6fba0f55c1 Merge branch 'fix/recall-beam-3rdperson' into 'main' 
fix: optimize condition checker for recall beam source position

See merge request cable-mc/cobblemon!2462
 2026-10-08 06:48:03 +00:00
Polymeta 0be617b8ab Merge branch 'fix/1359-sweep-fire-owned-pokemon' into 'main' 
Fix sweeping attacks igniting owned Pokémon

Closes #1359

See merge request cable-mc/cobblemon!2460
 2026-10-08 06:08:35 +00:00
Polymeta c02d22f449 Merge branch 'fix/1492-edible-medicinal-leek' into 'main' 
Fix Medicinal Leek not being edible

Closes #1492

See merge request cable-mc/cobblemon!2459
 2026-10-08 06:03:59 +00:00
Polymeta 846b645856 Merge branch 'type-gem-min-growth-fix' into 'main' 
fix wrong value in CobblemonConfig for type gem min growth

See merge request cable-mc/cobblemon!2461
 2026-10-08 06:01:53 +00:00
Polymeta a3920413ac fix TMM UI not closing when supposed to 2026-10-07 21:48:28 +00:00
Polymeta dfb9ee755e Merge branch 'Slippy-1.8.2-Fixes' into 'main' 
Slippy 1.8.2 fixes

See merge request cable-mc/cobblemon!2458
 2026-10-07 17:25:48 +00:00
Polymeta 9af99d16f7 Merge branch 'feature/the-center-of-attention' into 'main' 
constraining should start from center of spawn area

Closes #2119

See merge request cable-mc/cobblemon!2457
 2026-10-07 07:17:30 +00:00
Polymeta 2cc17d3280 constraining should start from center of spawn area 2026-10-07 07:17:30 +00:00
Polymeta 20b2bcaa5a Merge branch 'implement_pokemon' into 'main' 
Implement pokemon

See merge request cable-mc/cobblemon!2455
 2026-10-06 11:47:36 +00:00
Polymeta d37f73626d Merge branch 'type-gem-growth-rework' into 'main' 
Type gem growth rework

See merge request cable-mc/cobblemon!2451
 2026-10-06 07:07:32 +00:00
Polymeta 73a94cb02e Merge branch 'burmy-cloak-change' into 'implement_pokemon' 
Burmy Cloak Changing & Battle Ended Event Refinements

See merge request cable-mc/cobblemon!2452
 2026-10-06 07:04:32 +00:00
Polymeta 5a48945e50 Merge branch 'fix/particles-respecting-graphics-setting' into 'main' 
fix: particle density should respect minecraft particle density settings

See merge request cable-mc/cobblemon!2446
 2026-10-06 05:49:29 +00:00
Polymeta 476448a2ce Merge branch 'more-block-noises' into 'main' 
More more item blocks sounds

See merge request cable-mc/cobblemon!2450
 2026-10-06 05:48:55 +00:00
Polymeta bcba4f7fb7 Merge branch 'implement_pokemon' into 'main' 
implement_pokemon

See merge request cable-mc/cobblemon!2445
 2026-10-06 05:47:25 +00:00
Polymeta 20fac724f6 Merge branch 'testing-fixes' into 'main' 
Small Fixes

See merge request cable-mc/cobblemon!2448
 2026-10-05 07:02:45 +00:00
Polymeta 7511facebc Merge branch 'decorative-items-for-all' into 'main' 
More Decorative Items

See merge request cable-mc/cobblemon!2430
 2026-10-04 06:58:14 +00:00
Polymeta fdafa3435c Merge branch 'flora-heals-an-aching-soul-' into 'main' 
Flora Update

See merge request cable-mc/cobblemon!2412
 2026-10-04 00:02:50 +00:00
Polymeta cad39d8802 Merge branch 'form-move-fix' into 'implement_pokemon' 
Form Move Fix

See merge request cable-mc/cobblemon!2420
 2026-10-03 22:33:27 +00:00
Polymeta 422f60f587 Merge branch 'feat/tm-creative-tab' into 'main' 
Add Technical Machines creative tab

See merge request cable-mc/cobblemon!2443
 2026-10-03 22:31:41 +00:00
Polymeta 5b9d5cbb55 [skip-ci] tidy up changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-02 08:34:22 +01:00
Polymeta ff890307c2 Merge branch 'feature/change-the-rules' into 'main' 
change how item interaction evolutions are processed

Closes #1864 and #1874

See merge request cable-mc/cobblemon!2399
 2026-10-02 07:07:29 +00:00
Polymeta dda9d3e790 [skip-ci] tidy up changelog 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-10-02 08:02:57 +01:00
Polymeta 1acc02a2ec Merge branch 'more-block-noises' into 'main' 
Added sounds for liquid bottle, pill bottle and dice blocks

See merge request cable-mc/cobblemon!2441
 2026-10-02 06:56:17 +00:00
Polymeta d86021e2a1 Merge branch 'fix/safari-ball-catchrate' into 'main' 
fix: change safari ball catchrate modifier

See merge request cable-mc/cobblemon!2440
 2026-10-01 05:26:45 +00:00
Polymeta 5955547c6f Merge branch 'evolution-tree' into 'main' 
Evolution tree

See merge request cable-mc/cobblemon!2385
 2026-09-29 10:14:09 +00:00
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