Polymeta
|
2ed6f89d09
|
[skip-ci] changelog cleanup
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-30 23:57:57 +00:00 |
|
Polymeta
|
5947468cd9
|
Merge branch 'version/1.9' into bag-of-plenty
# Conflicts:
# common/src/main/java/com/cobblemon/mod/common/mixin/PlayerMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/ServerPlayerMixin.java
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/world/gamerules/CobblemonGameRules.kt
# common/src/main/resources/cobblemon-common.accesswidener
|
2026-10-30 23:55:24 +00:00 |
|
Polymeta
|
7ba1507ac8
|
[skip-ci] changelog cleanup
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-30 23:51:39 +00:00 |
|
Polymeta
|
9fdffdc392
|
[skip-ci] changelog cleanup
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-30 23:51:03 +00:00 |
|
Polymeta
|
6a01fe3863
|
Merge branch 'feature/more-trades' into 'version/1.9'
Feature/more trades
See merge request cable-mc/cobblemon!2208
|
2026-10-30 23:50:51 +00:00 |
|
Polymeta
|
9b5a153e3f
|
Merge branch 'main' into version/1.9
# Conflicts:
# gradle.properties
|
2026-10-30 23:48:34 +00:00 |
|
Polymeta
|
67f906dec2
|
[skip-ci] changelog cleanup
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-30 23:47:43 +00:00 |
|
Polymeta
|
0570afbe05
|
Merge branch 'main' into 'main'
Fix habitat structure misspelling
Closes #2132
See merge request cable-mc/cobblemon!2500
|
2026-10-30 23:46:30 +00:00 |
|
Rayegun
|
dfba2d27ab
|
Fix habitat structure misspelling
|
2026-10-30 23:46:29 +00:00 |
|
Polymeta
|
9c7cd4b616
|
Merge branch 'healer-spawn-point' into 'main'
Healer spawn point
See merge request cable-mc/cobblemon!2489
|
2026-10-30 23:43:30 +00:00 |
|
Polymeta
|
9fe0e9c87e
|
[skip-ci] changelog cleanup
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-30 23:40:22 +00:00 |
|
Polymeta
|
bd0e5a44bd
|
Merge branch 'feat/amethyst-core' into 'main'
feat/amethyst core
See merge request cable-mc/cobblemon!2505
|
2026-10-30 23:39:37 +00:00 |
|
Polymeta
|
229ec4176b
|
[skip-ci] changelog cleanup
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-30 23:38:54 +00:00 |
|
Polymeta
|
323413efdc
|
Merge branch 'fix/ponigiri-food-values-appleskin' into 'main'
fix: correct ponigiri values for AppleSkin
See merge request cable-mc/cobblemon!2513
|
2026-10-30 23:35:37 +00:00 |
|
Polymeta
|
a309cc2522
|
[skip-ci] changelog cleanup
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-30 23:33:53 +00:00 |
|
Polymeta
|
cb782a2aa1
|
Merge branch 'steppy-steps' into 'main'
Pokémon Stepsounds
Closes #2107
See merge request cable-mc/cobblemon!2432
|
2026-10-30 23:30:31 +00:00 |
|
Sterrezo
|
2c58dcb8ef
|
Update CHANGELOG.md
|
2026-10-31 00:31:51 +01:00 |
|
Sterrezo
|
d91cd4322c
|
Merge branch 'main' into steppy-steps
|
2026-10-31 00:29:14 +01:00 |
|
whatsy
|
e48e492392
|
Update CHANGELOG.md
|
2026-10-27 23:45:20 -04:00 |
|
whatsy
|
1f93994eba
|
Merge branch 'main' into healer-spawn-point
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/world/gamerules/CobblemonGameRules.kt
|
2026-10-27 23:45:02 -04:00 |
|
whatsy
|
5210121b3d
|
Update CHANGELOG.md
|
2026-10-27 23:36:23 -04:00 |
|
Gitoido Okaski
|
7fa3bf24d1
|
chore: update explanation skip_cl
|
2026-10-28 03:10:34 +00:00 |
|
Gitoido Okaski
|
1128d7edf3
|
fix: appleskin gradle stuff for runtime
|
2026-10-28 03:10:34 +00:00 |
|
Gitoido Okaski
|
eef50a7237
|
fix: correct ponigiri values for AppleSkin
|
2026-10-28 03:10:34 +00:00 |
|
Hiroku
|
f4140a097d
|
Put the snap back on
|
2026-10-27 20:16:12 +10:00 |
|
Hiroku
|
b79dbcca80
|
no scope. I mean no snap
1.8.4
|
2026-10-27 19:42:59 +10:00 |
|
Hiroku
|
5ac12a897a
|
Merge remote-tracking branch 'origin/lang-updates'
|
2026-10-27 19:28:28 +10:00 |
|
Polymeta
|
ae5f7c83f2
|
Merge branch 'implement_pokemon' into 'main'
implement_pokemon
See merge request cable-mc/cobblemon!2507
|
2026-10-26 23:10:50 +00:00 |
|
ewwww
|
f14de9ab58
|
updated water shuriken
|
2026-10-26 16:35:00 -04:00 |
|
ewwww
|
8a1c846c2c
|
Merge branch 'main' into implement_pokemon
|
2026-10-26 16:06:28 -04:00 |
|
Polymeta
|
459e7d3490
|
this doesnt make any sense
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-26 09:16:39 +00:00 |
|
Polymeta
|
5a9be8944f
|
Merge branch 'hotbox-hitfix' into 'main'
Orb Ceiling Hitbox Correction
See merge request cable-mc/cobblemon!2512
|
2026-10-26 07:09:59 +00:00 |
|
Polymeta
|
3bb941b087
|
Merge branch 'dusclops-cry-fix' into 'main'
fixed dusclops using squirtle's cry
See merge request cable-mc/cobblemon!2511
|
2026-10-26 07:07:40 +00:00 |
|
dhi_holo
|
384b496d76
|
T H E O R B
|
2026-10-26 13:37:09 +10:00 |
|
geumu
|
4caa736e0b
|
Translated using Weblate (Korean)
Currently translated at 99.6% (9549 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ko/
|
2026-10-26 02:38:47 +00:00 |
|
geumu
|
c3e9051918
|
Translated using Weblate (Korean)
Currently translated at 98.5% (9445 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/ko/
|
2026-10-26 02:26:52 +00:00 |
|
ewwww
|
fe940caafc
|
fixed dusclops using squirtle's cry
|
2026-10-25 21:33:38 -04:00 |
|
Polymeta
|
c9d148ec9c
|
bump showdown build and changelog
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-26 00:41:23 +00:00 |
|
Polymeta
|
e611bf4a77
|
Merge branch 'fix-missing-recipe-book-data' into 'main'
Fixed Cooking Pot recipe book tabs and entries on Fabric
See merge request cable-mc/cobblemon!2510
|
2026-10-26 00:37:47 +00:00 |
|
Polymeta
|
8093822140
|
Merge branch 'battle-selection-fix' into 'main'
Fixed a bug with battle selection.
See merge request cable-mc/cobblemon!2509
|
2026-10-26 00:27:00 +00:00 |
|
Fyre520
|
f695ec15f9
|
Fixed Cooking Pot recipe book tabs and entries on Fabric
|
2026-10-26 02:01:15 +05:30 |
|
Deltric
|
1f6c791ce6
|
Fixed a bug with battle selection.
|
2026-10-25 14:24:44 -04:00 |
|
Polymeta
|
570805fdf1
|
Merge branch 'structure-tags-for-spawning' into 'main'
Structure Spawn Tags
See merge request cable-mc/cobblemon!2508
|
2026-10-25 16:53:38 +00:00 |
|
dhi_holo
|
ddecb08bc7
|
Edit is_illager_structure.json
|
2026-10-26 00:21:36 +10:00 |
|
Kenji_64
|
a1b930a21f
|
More Frogadier fixes (ty Mitchoo)
|
2026-10-25 14:14:44 +01:00 |
|
Kenji_64
|
7728ff3892
|
Fixed Fearow missing blink crashing during gliding
|
2026-10-25 14:11:22 +01:00 |
|
阿鱼
|
0b38e063d2
|
Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 98.7% (9464 of 9587 strings)
Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/zh_Hans/
|
2026-10-25 10:52:25 +00:00 |
|
Hiroku
|
4d7cfcdf61
|
Added q.target_fainted to MoveInstruction
|
2026-10-25 11:11:52 +10:00 |
|
Hiroku
|
e56dd6ef64
|
snap it back on
|
2026-10-25 10:43:01 +10:00 |
|
Kenji_64
|
236b98fa78
|
I forgot the changelog :(
|
2026-10-25 02:21:08 +02:00 |
|