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,258 Commits 222 Branches 22 Tags
e9c6580230f4fd67a8e8ca3ca984b8412676ffae
Commit Graph
16258 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
CraterandPolymeta 911a95e873 Neoforge resource fix 2026-09-21 08:30:53 +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
Gertimoshka fe433d1417 Fixed Mochis and Feathers dropping glass bottles when they shouldn't 2026-09-20 20:10:25 +02: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
Gertimoshka 081e370bfd User friendlier changelog 2026-09-20 11:13:08 +02:00
Gertimoshka 3ef0567287 simplifications 2026-09-20 11:05:26 +02:00
Gertimoshka 3cad9e5481 Forgor the Changelog 2026-09-20 11:01:52 +02:00
Gertimoshka dc8b7908be Fixed impropper rendering culling of entries, and random starter not being part of height calculation of the category 2026-09-20 10:52:15 +02:00
Slippy 85085a1eca Decaying Crypt tombstones now will generate with TMs in the gidled chest 2026-09-19 22:40:20 -05:00
Slippy bff59dee6e Fix Snowy burrows spawns and some floating water in one difting iceberg 2026-09-19 22:01:17 -05: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
Deltric cd08e98c28 Fix typo and update changelog. 2026-09-19 21:09:32 -05: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
jackowes 9a7f97f11f changelog 2026-09-12 21:52:56 -05:00
jackowes 95b8d62e4a Fix issue with quat spring and replace orientation controller tick slerp with quat spring 2026-09-12 21:45:26 -05: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