mirrors/cobblemon
1
0 Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-11-06 08:18:53 -05:00
Code Issues Packages Projects Releases Wiki Activity
16,271 Commits 221 Branches 24 Tags
form_changes
Commit Graph
16271 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hiroku 45a9ad866e Fixed heaps of transformations passively activating outside of battle 2026-09-26 18:46:42 +10:00
Hiroku 9c3066e787 Labelled many more forms as temporary 2026-09-20 11:34:59 +10:00
Hiroku eb8598278f Various form change corrections and marked cherrim sunshine as a temporary form in the data 2026-09-20 11:02:04 +10:00
Hiroku 6777c8d57d Merge remote-tracking branch 'origin/main' into form_changes 
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/api/molang/function/EvolutionMoLangFunctions.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/molang/function/PokemonMoLangFunctions.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PPUpItem.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/requirements/StatCompareRequirement.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/requirements/StatEqualRequirement.kt
#	gradle.properties
 2026-09-20 10:23:05 +10: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
Gitoido 975ad8186a chore: dangling variable 2026-09-18 18:03:41 +00:00
Gitoido 26b6419f04 fix: reintroduce delete_variables general molang fn 2026-09-18 18:00:44 +00:00
Aram 89e43945a3 Edit CobblemonBlocks.kt 2026-09-16 14:25:26 +02:00
Aram bd8dcddf35 Edit CobblemonBlocks.kt 2026-09-16 14:24:31 +02: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
dhi_holo c56aab28d4 Recipe Book Tweaks 
Closes #2088 as well as fixes a lot of similar issues for gameplay consistency
 2026-09-16 18:41:05 +10: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
Slippy c6fb18ea51 I'm never doing an update hwere I have to keep track of 650+ structure files again 2026-09-14 10:48:01 -05: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
dhi_holo f685be0aab TM Recipes 
Corrected two incorrect TM recieps, both in the jsons and the spreadsheets
 2026-09-14 16:30:06 +10: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
PieDuck 079b2ae766 Merge branch 'typegem-advancement-trigger' of https://gitlab.com/dmnaru/cobblemon into typegem-advancement-trigger 2026-09-13 21:51:29 +01:00
PieDuck 34eea827e7 changelog 2026-09-13 21:51:09 +01:00
PieDuck 06c6ee5a9c Merge branch cobblemon:main into typegem-advancement-trigger 2026-09-13 21:37:22 +01:00
PieDuck 54748c20ea Add type gem item advancement trigger 2026-09-13 21:36:18 +01: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
dhi_holo 49a5f716b7 Fixed Missing Recipe Advancements 
Why were the advancements in the recipes..?
 2026-09-13 22:05:44 +10: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 1.8.1 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
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
Kenji_64 3d78929ff0 Entire Applin line has placeholder anims now! + other Applin related minor fixes 2026-09-12 21:36:12 +02:00
Kenji_64 5d94b03f7a Fixed Lucario's aura particles not emitting 2026-09-12 21:32:48 +02:00
Kenji_64 587305eb52 Added Fickle Beam's double damage text to en_us 2026-09-12 21:28:52 +02: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
Slippy e49b704200 Fixed console spam with carved_ice_spikes. Fixed air pockets in deep sea spires 2026-09-12 11:39:48 -05: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
ewwww 74c49bf2da fixed sableye's shoulder mount animations (thanks @kiteman.exe from discord) 2026-09-11 22:39:37 -04:00
Gustavo Puerari c03e7d9ed3 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 96.8% (9175 of 9472 strings)

Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/
 2026-09-10 18:30:26 +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
Jerzykv 62c0545ea7 Moved recent implement_pokemon fixes to this branch 2026-09-10 13:49:26 +02:00
Polymeta f821abd7e5 fix helditem notation in spawn file 2026-09-10 11:04:04 +00:00
Gustavo Puerari 2652e53e0c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 96.0% (9097 of 9472 strings)

Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/
 2026-09-10 10:03:46 +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
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
FrankTheFarmer f55972c190 Mantyke, Mantine, Quaxly recoil expression changelog 2026-09-10 19:15:14 +10:00
FrankTheFarmer 2dbf304ebe Merge branch 'main' into 1.8.1-implementation-fixes 2026-09-10 19:08:55 +10:00
FrankTheFarmer 1c5feab9c9 Removed recoil animation from Mantyke, Mantine, and Quaxly 2026-09-10 19:08:35 +10:00
Paul 1c720793c4 Rescraped spawns 2026-09-10 18:56:17 +10:00