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
|
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
|
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
|
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
|
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 |
|
Sterrezo
|
d91cd4322c
|
Merge branch 'main' into steppy-steps
|
2026-10-31 00:29:14 +01: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 |
|
Gitoido Okaski
|
eef50a7237
|
fix: correct ponigiri values for AppleSkin
|
2026-10-28 03:10:34 +00:00 |
|
Hiroku
|
5ac12a897a
|
Merge remote-tracking branch 'origin/lang-updates'
|
2026-10-27 19:28:28 +10: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 |
|
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 |
|
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 |
|
Kenji_64
|
ac61e0d4d0
|
Had to fix Froakie again. Heck
|
2026-10-25 02:20:20 +02:00 |
|
Kenji_64
|
d8956fd66f
|
Froakie line eye lid and animation fixes
|
2026-10-25 02:14:01 +02:00 |
|
Hiroku
|
1e634a20b8
|
Merge remote-tracking branch 'origin/lang-updates'
|
2026-10-25 09:57:49 +10:00 |
|
ewwww
|
50a5a78dd4
|
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
|
2026-10-24 19:16:59 -04:00 |
|
ewwww
|
76c2654399
|
it appears my lang tweaks were reverted somehow
|
2026-10-24 19:16:20 -04:00 |
|
Polymeta
|
f9f4745e93
|
Merge branch 'implement_pokemon' into 'main'
Some recent riding stuff adjustments
See merge request cable-mc/cobblemon!2506
|
2026-10-24 16:23:07 +00:00 |
|
Kenji_64
|
c700674289
|
Fearow animations updated (again) and added all placeholders I made to the changelog
|
2026-10-24 18:05:05 +02:00 |
|
Kenji_64
|
c4f0032eee
|
Fixed Squawkabilly's missing toe
|
2026-10-24 15:24:17 +02:00 |
|
Kenji_64
|
d92986016b
|
Adjusted Fearow's ride stats further
|
2026-10-24 02:12:39 +02:00 |
|
Kenji_64
|
ab57e01242
|
Fearow is now rideable with temporary animations
|
2026-10-24 01:46:41 +02:00 |
|
Kenji_64
|
0da1c740a4
|
Adjusted Altaria ride stats
|
2026-10-24 01:44:26 +02:00 |
|
Kenji_64
|
a7979aa80c
|
Adjusted Togekiss ride stats. Changed style from jet to bird
|
2026-10-24 01:44:10 +02:00 |
|
Ronak Chavva
|
397d3c618d
|
reverted amythest pokespawn condition
|
2026-10-23 18:28:22 -05:00 |
|
Ronak Chavva
|
29f6feab6c
|
Merge branch 'main' of https://gitlab.com/ronakch8/cobblemon into feat/amethyst-core
|
2026-10-23 18:09:35 -05:00 |
|
Ronak Chavva
|
ea5d3ae40f
|
amethyst grows on core
|
2026-10-23 18:09:11 -05:00 |
|
Polymeta
|
59804a4e08
|
rescrape spawns and drops
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>
|
2026-10-23 23:36:25 +01:00 |
|
ewwww
|
60bbe221de
|
tweaked vikavolt's jump stat
|
2026-10-23 17:51:10 -04:00 |
|
ewwww
|
5f06dc214b
|
added vikavolt ride stats
|
2026-10-22 22:51:05 -04:00 |
|
ewwww
|
a6607e585b
|
changed vikavolt to bird style
|
2026-10-22 21:45:56 -04:00 |
|
Kenji_64
|
9660f1f724
|
Fixed Appletun having a green tongue. (Likely from food coloring...)
|
2026-10-23 00:31:07 +03:00 |
|
Kenji_64
|
c8cbace800
|
Fixed Fearow's model being messed up and added the head_ai back
|
2026-10-23 00:31:07 +03:00 |
|