yanwah/cobblemon
1
0
Fork 0
forked from mirrors/cobblemon
Code Pull Requests Activity
15,628 Commits 261 Branches 19 Tags
main
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Polymeta 26386638ad Merge branch 'PathingThresholds' into 'main' 
Fixed wider pokemon being completely unable to hop up ledges

See merge request cable-mc/cobblemon!2304
 2026-06-10 08:21:01 +00:00
Polymeta eb2a5837eb Merge branch 'oops-unsynced-tms' into 'main' 
Sync TM Data

See merge request cable-mc/cobblemon!2303
 2026-06-09 18:35:59 +00:00
Polymeta 4d1f46c37c remove unused config values 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-06-08 14:55:41 +01:00
Polymeta a2101b5759 whoops 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-06-08 09:29:49 +01:00
Polymeta 187a190ec6 fix size categories not working properly on servers with non-default scales 
Closes #2022

Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-06-08 09:16:57 +01:00
Polymeta d873399d05 Merge branch 'implement_pokemon' into 'main' 
for merging when the last of the QA fixes are finished

See merge request cable-mc/cobblemon!2302
 2026-06-05 08:28:27 +00:00
Polymeta 56b5dba911 Merge branch 'stoobid-aram' into 'main' 
Stoobid Aram, Actually Fixed the Processor this time

See merge request cable-mc/cobblemon!2301
 2026-06-04 22:51:01 +00:00
Polymeta 80e593f5c6 Merge branch 'fix-/locate-lie' into 'main' 
Fixed the HeightRangeProcessor

See merge request cable-mc/cobblemon!2297
 2026-06-04 10:43:12 +00:00
Polymeta c86d8f0696 Merge branch '1.8-move-effects-funny' into 'main' 
1.8-move-effects-funny

See merge request cable-mc/cobblemon!2299
 2026-06-03 09:55:40 +00:00
Polymeta e8119198c1 Merge branch 'type_alpha_drops' into 'main' 
Alphas also drop items based on the pokemon types

See merge request cable-mc/cobblemon!2295
 2026-05-31 08:58:53 +00:00
Polymeta ca5c2ba381 Merge branch 'shiny-volume-tweaks' into 'main' 
Update sounds.json and changelog documentation

See merge request cable-mc/cobblemon!2294
 2026-05-28 14:15:12 +00:00
Polymeta 1bd33a0635 Merge branch 'main' into implement_pokemon 
# Conflicts:
#	common/src/main/resources/assets/cobblemon/lang/en_us.json
 2026-05-28 15:13:23 +01:00
Polymeta ff9ca4ee09 Merge branch 'implementation-vibe-check' into 'main' 
Added a script to automatically find implementation issues

See merge request cable-mc/cobblemon!2290
 2026-05-28 14:10:57 +00:00
Polymeta d67669a278 Merge branch 'smol-structure-crash-fix' into 'main' 
Structure crash fix

See merge request cable-mc/cobblemon!2292
 2026-05-26 22:12:37 +00:00
Polymeta 8661f7a01e Merge branch 'z-fighting-b-gone' into 'main' 
Pokedex Z-Fighting Begone

See merge request cable-mc/cobblemon!2289
 2026-05-26 15:17:55 +00:00
Polymeta e933a03e92 Merge branch 'Habitat-Blocks-pt2' into 'main' 
drifting icebergs, volcanic plumes, sketal falls, strange fungal dwellings,...

See merge request cable-mc/cobblemon!2291
 2026-05-26 15:12:31 +00:00
Polymeta d5cff3ba06 Merge branch 'Ghimmighoul' into 'main' 
Made forcebattle identify pokemon

See merge request cable-mc/cobblemon!2288
 2026-05-23 07:35:35 +00:00
Polymeta a91bf60ff8 pokemon that get fished now get marked as "seen" in pokedex 
Closes #2015

Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-05-22 18:05:49 +01:00
Polymeta 2d4c419216 remove unused override for chests 
Closes #2016

Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-05-22 18:01:10 +01:00
Polymeta c04345a789 Merge branch 'autocorrect' into 'main' 
autocorrect

See merge request cable-mc/cobblemon!2284
 2026-05-22 08:07:26 +00:00
Polymeta cc6305bfec Merge branch 'qa-63' into 'main' 
Fixed QA 63 for 1.8 / Ally-move turn skip

See merge request cable-mc/cobblemon!2283
 2026-05-21 09:54:41 +00:00
Polymeta 9a3f5a605a Merge branch 'fix/particle-shader' into 'main' 
Fix use the default minecraft shader instead of our own ( don't want to make...

See merge request cable-mc/cobblemon!2282
 2026-05-21 09:51:30 +00:00
Polymeta d9c765ca53 Merge branch 'hydrapple-fix' into 'main' 
Zero scaled locators don't get alpha eye effects, fixes hydrapple

See merge request cable-mc/cobblemon!2280
 2026-05-21 08:39:49 +00:00
Polymeta 96c3f7764e Merge branch 'CloseSummary' into 'main' 
Added ability to close summary and starter screen with summary button.

See merge request cable-mc/cobblemon!2274
 2026-05-21 08:38:55 +00:00
Polymeta 255930751a Merge branch '1.8-qa-fixes-#3' into 'main' 
Prevent Tera Blast from getting chosen when rolling for TM moves in general...

Closes #58

See merge request cable-mc/cobblemon!2278
 2026-05-21 08:38:22 +00:00
Polymeta d3f32ee645 Merge branch 'mimic-block-json-list-additions' into 'main' 
Mimic block json list additions

See merge request cable-mc/cobblemon!2281
 2026-05-21 08:37:40 +00:00
Polymeta d95db24426 bump packsquash 
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
 2026-05-20 11:54:29 +01:00
Polymeta f7e381924e Merge branch 'sneasler-ride-fix' into 'main' 
Fixed basket sneasler causing crashes upon riding

See merge request cable-mc/cobblemon!2276
 2026-05-20 09:43:30 +00:00
Polymeta e179e044ef Merge branch 'fix-cobblemon-boat-renderer' into 'main' 
Fix cobblemon boat renderer

See merge request cable-mc/cobblemon!2275
 2026-05-19 15:53:50 +00:00
Polymeta 8359b1ade1 Merge branch 'complex-spawn-buckets' into 'main' 
Rebuilt spawn buckets to be controlled by the spawner, allowing new buckets in specific contexts, and flattened habitat configuration classes

See merge request cable-mc/cobblemon!2267
 2026-05-17 23:54:13 +00:00
Polymeta d44126179a Merge branch 'fix/neoforge-shader-init' into 'main' 
Fix Neoforge shader initialization

See merge request cable-mc/cobblemon!2270
 2026-05-16 17:37:47 +00:00
Polymeta a59573073f Merge branch 'sterr/sound' into 'main' 
TMM and TM sound implementation + miscellaneous sound tweaks

See merge request cable-mc/cobblemon!2265
 2026-05-15 21:52:17 +00:00
Polymeta 690ada8271 Merge branch 'my-goodness-more-fixes' into 'main' 
There are more damn 1.8 QA fixes

See merge request cable-mc/cobblemon!2256
 2026-05-15 08:27:44 +00:00
Polymeta b1b06f19b2 Merge branch 'click-to-cry' into 'main' 
Play Pokemon cries from summary screen

See merge request cable-mc/cobblemon!2252
 2026-05-15 08:25:30 +00:00
Polymeta 079e75d828 Merge branch 'alpha-moveset-fix' into 'main' 
Fixed alpha pokemon not using full movesets

See merge request cable-mc/cobblemon!2263
 2026-05-13 10:10:51 +00:00
Polymeta 0e93682457 Merge branch 'updated-spawns-and-drops' into 'main' 
Scrapes for spawns and drops and habitat pools

See merge request cable-mc/cobblemon!2262
 2026-05-12 09:06:32 +00:00
Polymeta a3498fe03b Merge branch 'small-fix' into 'main' 
Remove Unused ClientDataSynchronizer

See merge request cable-mc/cobblemon!2240
 2026-05-11 14:46:26 +00:00
Polymeta af4af3395c Merge branch 'two-sorting-tweaks' into 'main' 
Two Sorting Tweaks

See merge request cable-mc/cobblemon!2259
 2026-05-11 14:29:57 +00:00
Polymeta 4f0eb16ab0 Merge branch 'interact-wheel-qol' into 'main' 
Pressing the inventory key now closes the interact wheel gui

See merge request cable-mc/cobblemon!2247
 2026-05-06 06:20:00 +00:00
Polymeta 5004b61967 Merge branch 'Structure-Fixes-Part-4' into 'main' 
Structure fixes part 4

See merge request cable-mc/cobblemon!2251
 2026-05-06 06:16:34 +00:00
Polymeta 333d8fa732 Merge branch 'sterr/sound' into 'main' 
Couple of sound tweaks

See merge request cable-mc/cobblemon!2245
 2026-05-04 19:43:06 +00:00
Polymeta ed732429b9 Merge branch 'pokedex-firmware-update' into 'main' 
Fix to 1.8 breaking older version dex data and failing to load it

See merge request cable-mc/cobblemon!2244
 2026-05-04 09:47:45 +00:00
Polymeta ca7e2054fe Merge branch '1.8-qa-fixes-#2' into 'main' 
1.8 qa fixes #2

Closes #2

See merge request cable-mc/cobblemon!2241
 2026-05-02 20:43:11 +00:00
Polymeta 14ea73332f Merge branch 'Structure-Fixes-Part-3' into 'main' 
Round 3 of structure fixes. Rates adjusted for fossil structures and nether...

See merge request cable-mc/cobblemon!2242
 2026-05-02 20:42:07 +00:00
Polymeta 8022bfefc8 Merge branch 'command-anim' into 'main' 
[Enhancement] Let NPCBattleActors trigger the "Command" animation in battle

See merge request cable-mc/cobblemon!2152
 2026-04-30 23:39:25 +00:00
Polymeta 0a0532c8cc Merge branch 'trade_friendship' into 'main' 
Caching trade friendships to player data

Closes #1898

See merge request cable-mc/cobblemon!2119
 2026-04-30 22:55:22 +00:00
Polymeta 586ced7bfb Merge branch 'main' into 'implement_pokemon' 
# Conflicts:
#   common/src/main/resources/data/cobblemon/recipe/metal_alloy.json
 2026-04-30 22:43:58 +00:00
Polymeta 9e05ef3e8c Merge branch 'alpha-bait-changes' into 'main' 
Size Modifying Bait effect

See merge request cable-mc/cobblemon!2237
 2026-04-30 21:55:18 +00:00
Polymeta 045ddb30ca Merge branch 'Structure-Fixes-Round-2' into 'main' 
Series 2 of 1.8 Structure Fixes

See merge request cable-mc/cobblemon!2238
 2026-04-30 17:40:19 +00:00
Polymeta 457c2ab84d Merge branch 'unlag-your-tmm-slots' into 'main' 
Fix occasionally slots 'lagging' and not reading your input properly

See merge request cable-mc/cobblemon!2236
 2026-04-29 20:36:15 +00:00
Polymeta 44c9ca3c6b Merge branch 'advancing-advancements-returns-in-1.8' into 'main' 
Advancing Advancements into 1.8

See merge request cable-mc/cobblemon!2223
 2026-04-29 08:27:14 +00:00
Polymeta c9c5488be7 Merge branch 'type-gem-feature-gaslighting-max-fix' into 'main' 
Fix to Type Gem Feature having a chance to cause an infinite loop during generation, stalling world gen

See merge request cable-mc/cobblemon!2233
 2026-04-28 18:46:06 +00:00
Polymeta 49fe33f9db Merge branch 'sterr/log-cleaning' into 'main' 
Return of the log

See merge request cable-mc/cobblemon!2231
 2026-04-28 10:57:56 +00:00
Polymeta 32ff4557a7 Merge branch 'main-crab-1.8-fixes' into 'main' 
1.8 fixes from QA Doc

See merge request cable-mc/cobblemon!2230
 2026-04-28 10:27:30 +00:00
Polymeta e888012b8b Merge branch 'implement_pokemon' into 'main' 
Implement pokemon

See merge request cable-mc/cobblemon!2228
 2026-04-27 17:22:57 +00:00
Polymeta 7b5eb7c869 Merge branch '1.8.0' into 'main' 
time to get technical

See merge request cable-mc/cobblemon!2227
 2026-04-27 14:03:08 +00:00
Polymeta 538bf148bc Merge branch 'tm-sprite-addon-compat' into '1.8.0' 
Replaced TM rendering to use designated textures instead of dynamically colouring them, included addon support

See merge request cable-mc/cobblemon!2226
 2026-04-27 08:54:17 +00:00
Polymeta df67a6659b change fallback to normal 2026-04-27 08:04:29 +00:00
Polymeta 84d5634b79 Merge branch 'fix-grepa-berry' into 'main' 
Fix Grepa Berry sweetness value from 15 to 10 as per internal spreadsheet

See merge request cable-mc/cobblemon!2210
 2026-04-27 08:00:44 +00:00
Polymeta d6f208366e Merge branch 'sterr/sound' into '1.8.0' 
Some block sounds and alpha cry tweaks

See merge request cable-mc/cobblemon!2220
 2026-04-25 21:40:22 +00:00
Polymeta 6105d15a03 Merge branch 'battle-lockup-fix' into 'main' 
Battle lockup fix

See merge request cable-mc/cobblemon!2199
 2026-04-17 12:23:40 +00:00
Polymeta 1176af0641 Merge branch 'vera-bait-changes' into 'main' 
Bait Changes

See merge request cable-mc/cobblemon!2189
 2026-04-17 12:23:18 +00:00
Polymeta a77a6d21eb Merge branch 'fix/full-heal-not-working-in-battle' into 'main' 
Fix: Full Heal not working (Lum berry works)

Closes #1950

See merge request cable-mc/cobblemon!2195
 2026-04-13 11:00:21 +00:00
Polymeta 58286d8bb5 Merge branch 'particle-slide-fix' into 'main' 
Fix sliding particles incorrectly handling block collision

See merge request cable-mc/cobblemon!2180
 2026-04-13 08:51:16 +00:00
Polymeta e54b22409a Merge branch 'clamp-structure-height' into '1.8.0' 
Allow Slippy to define a range in which the structure will spawn

See merge request cable-mc/cobblemon!2185
 2026-03-25 23:20:08 +00:00
Polymeta 5aeae2b350 Merge branch '1971-fix-recall-console-warning' into 'main' 
Prevent calling `Entity.remove(DISCARDED)` if the entity is already being discarded

Closes #1971

See merge request cable-mc/cobblemon!2184
 2026-03-25 21:24:58 +00:00
Polymeta f2d2ceb422 Merge branch 'patch-3' into 'main' 
Fix incorrect spelling of "Pokémon" in some translation strings

See merge request cable-mc/cobblemon!2171
 2026-03-08 21:35:45 +00:00
Polymeta a921d55812 fix campfirepot crash 2026-03-06 09:37:07 +00:00
Polymeta 79688ebdad Merge branch 'oh-hi-mark' into 'main' 
Added `marks`, `has_mark`, & `remove_marks` as available Molang functions for pokemon

See merge request cable-mc/cobblemon!2173
 2026-03-04 09:20:33 +00:00
Polymeta 34e64da0c6 Merge branch 'sigma-pokemon' into 'sigma-pokemon' 
Alpha boost implementation

See merge request cable-mc/cobblemon!2114
 2026-03-02 23:38:04 +00:00
Polymeta e6d2430405 Merge branch 'BWG-tag-updates' into 'main' 
Fixes to BWG compat.

See merge request cable-mc/cobblemon!2172
 2026-03-02 09:42:03 +00:00
Polymeta a505bad554 [skip-ci] tidy up changelog 2026-02-27 10:56:57 +00:00
Polymeta e27e5a1d92 Merge branch 'ai-switch-fix' into 'main' 
Stop the constant switching from AI NPC Trainers

See merge request cable-mc/cobblemon!2128
 2026-02-27 10:55:00 +00:00
Polymeta 08912fd53f Merge branch '#1945-brewing-stand-crash' into 'main' 
#1945 Brewing Stand Shift Click Crash NeoForge 1.7.3 [1.21.1]

See merge request cable-mc/cobblemon!2163
 2026-02-27 00:08:36 +00:00
Polymeta fae6bdb782 Merge branch 'main' into 'main' 
Move BYG compat to Biomes We've Gone and Nether Descent

See merge request cable-mc/cobblemon!2149
 2026-02-26 22:52:33 +00:00
Polymeta 0b83128aa0 Merge branch 'main' into 'main' 
Fixes brushing for neoforge

Closes #1939

See merge request cable-mc/cobblemon!2154
 2026-02-26 15:43:03 +00:00
Polymeta e2b04ff770 Merge branch 'ufo-fixes-and-improvements' into 'main' 
UFO Fixes and Improvements

See merge request cable-mc/cobblemon!2156
 2026-02-26 15:29:38 +00:00
Polymeta 3ac18cce6e Merge branch 'main' into 'main' 
Berry Growth Performance Optimization

See merge request cable-mc/cobblemon!2142
 2026-02-26 12:15:32 +00:00
Polymeta aa0a0672d0 Merge branch 'show-my-pokemon-exp-gain' into 'main' 
Party Overlay EXP display and evoltion unlocked Sound

See merge request cable-mc/cobblemon!2140
 2026-02-26 11:59:48 +00:00
Polymeta fcb6bea78b Merge branch 'selecting-starters-in-style' into 'main' 
The Cooler Starter Selection GUI

See merge request cable-mc/cobblemon!2164
 2026-02-26 11:58:31 +00:00
Polymeta 9e8e80965b Merge branch 'fix/missing-botanypots-entries' into 'main' 
Updated Botany Pots integration

See merge request cable-mc/cobblemon!2166
 2026-02-26 07:41:03 +00:00
Polymeta 95aa99e18c Merge branch 'fix/particle-disapearing' into 'main' 
fix: adapting the boundingBox to the visual if it's a beam it should have a...

See merge request cable-mc/cobblemon!2167
 2026-02-26 01:16:09 +00:00
Polymeta 719addf633 Merge branch 'molang-or-dishonor' into 'main' 
Added `has_chosen_starter` & `get_starter_uuid` as available Molang functions

See merge request cable-mc/cobblemon!2159
 2026-02-25 23:05:54 +00:00
Polymeta 31e386871f Merge branch 'little-dose-of-molang' into 'main' 
Enchanting Molang

See merge request cable-mc/cobblemon!2162
 2026-02-25 23:00:15 +00:00
Polymeta 3c2bf0e2b3 Merge branch 'cobblemon-structure' into '1.8.0' 
Slippy can Cook now!

See merge request cable-mc/cobblemon!2144
 2026-01-30 09:45:31 +00:00
Polymeta e7d2a46cc0 Bumping snapshot version 2026-01-25 06:57:31 +00:00
Polymeta f450d9d2d6 Merge branch 'fix-bucket-reuse' into '1.8.0' 
Fixed multi-spawns in a single pass using the same bucket for all of them

See merge request cable-mc/cobblemon!2104
 2026-01-22 13:21:39 +00:00
Polymeta a568d45d75 [skip-ci] tidy up changelog take two 2026-01-22 09:58:38 +00:00
Polymeta 616e438f17 [skip-ci] tidy up changelog 2026-01-22 09:40:47 +00:00