Andy
bf425efd40
Merge branch 'feat/snack-spawner-factory' into 'main'
...
Added PokeSnackSpawnerFactory so influences can be registered to pokesnacks
See merge request ppVon/cobblemon!1
2026-01-23 15:39:21 +00:00
Andy
cebff87656
update changelog
2026-01-23 03:49:09 -05:00
Andy
1d82df464a
Added PokeSnackSpawnerFactory so influences can be registered to pokesnacks
2026-01-23 02:19:02 -05:00
Andy
d98efb52b6
Add changelog line and extend author tag
2026-01-22 08:38:13 -05:00
Andy
276f13cea5
1926: Re-add affectWeight comment
2026-01-22 00:08:34 -05:00
Andy
ac069687f1
1926: Changed SpawnBaitInfluence to apply all bait effects properly in affectWeight
2026-01-22 00:07:14 -05:00
Polymeta
d4308b0a4f
Merge branch 'fix-battle-memory-leak' into 'main'
...
Fixed memory leak from battles not being cleaned up after ending.
See merge request cable-mc/cobblemon!2075
2026-01-21 08:09:44 +00:00
Polymeta
ed04faf0d8
Merge branch 'dispenser-fix' into 'main'
...
Resolved Dispenser Behaviors not working
See merge request cable-mc/cobblemon!2118
2026-01-20 14:46:55 +00:00
Aram
1ed020f3e0
Resolved Dispenser Behaviors not working
2026-01-20 14:46:54 +00:00
Polymeta
7e385d8c94
Merge branch 'default-offest' into 'main'
...
[FEAT] Add `default_seat` option to seat offset posers
See merge request cable-mc/cobblemon!1999
2026-01-20 14:46:44 +00:00
Polymeta
ee509b5438
Merge branch 'molang-inventory-and-move-utility' into 'main'
...
molang additions: Move struct accessor and player inventory utils
See merge request cable-mc/cobblemon!2103
2026-01-20 14:46:34 +00:00
Hiroku
f942d7c34a
Merge branch 'misc-additions-fixes' into 'main'
...
Couple of misc API additions and bug fixes.
See merge request cable-mc/cobblemon!2125
2026-01-19 02:16:09 +00:00
Deltric
0f1ada4624
Pass in pnx to the event
2026-01-18 18:52:27 -06:00
Deltric
b4ee4629bf
Couple of misc API additions and bug fixes.
2026-01-18 17:57:28 -06:00
Paul
d0b64e2d82
Respect the BYPASSES_INVULNERABILITY damage tag
2026-01-18 22:12:25 +10:00
Paul
1ed2042283
Fixed /calculateseatpositions expecting no underscore when actually we always use an underscore
2026-01-17 22:32:57 +10:00
Deltric
0b531d967e
Merge remote-tracking branch 'origin/fix-battle-memory-leak' into fix-battle-memory-leak
...
# Conflicts:
# common/src/main/resources/data/cobblemon/showdown.zip
2026-01-17 03:42:38 -06:00
Deltric
b0d1aec9ab
Update showdown
2026-01-17 03:42:21 -06:00
Deltric
f4d47098b5
Fixed memory leak from battles not being cleaned up after ending.
2026-01-17 03:42:08 -06:00
Hiroku
948ca61ef3
Merge branch 'fix-super-potion-ingredients-tag' into 'main'
...
Fix super potion ingredients tag
See merge request cable-mc/cobblemon!2121
2026-01-16 08:27:19 +00:00
Hiroku
e60aca30ba
Merge branch 'patch-2' into 'main'
...
Fix Syrupy Apple missing from evolution items tag
See merge request cable-mc/cobblemon!2120
2026-01-16 08:26:22 +00:00
Hiroku
fb5055c39e
Merge branch 'form_crash' into 'main'
...
Initialize FormData when updating
Closes #1916
See merge request cable-mc/cobblemon!2122
2026-01-16 08:20:23 +00:00
Paul
dfb5650121
Merge remote-tracking branch 'origin/main'
2026-01-16 18:17:01 +10:00
Paul
8a0cbf28fe
Fixed battles not ending fully when a switch is in progress, closes #1917
2026-01-16 18:16:11 +10:00
aeroeng15
a6b9060d57
Changelog
2026-01-15 20:54:54 -07:00
aeroeng15
8e57995e44
Make It Proper
2026-01-15 20:51:59 -07:00
aeroeng15
1d8257808c
Initialize rather than set; seems to fix the issue
2026-01-15 20:42:14 -07:00
Faintful
e3582ccfb4
Add changelog
2026-01-14 19:49:11 +01:00
Faintful
4c6822b1c6
Merge remote-tracking branch 'upstream/main' into fix-super-potion-ingredients-tag
2026-01-14 19:46:54 +01:00
Faintful
2e6a4c7341
Change Hondew for Aguav
2026-01-14 19:28:49 +01:00
Micky
8edb5e1013
Fix Syrupy Apple missing from evolution items tag
2026-01-14 18:25:06 +00:00
Polymeta
6fb139cbb9
Merge branch 'pokemon-interactions-fixes' into 'main'
...
Pokémon Interaction fixes
See merge request cable-mc/cobblemon!2117
2026-01-14 00:03:33 +00:00
lion
c81c95142b
Pokémon Interaction fixes
2026-01-14 00:03:32 +00:00
Hiroku
afde822860
Edit CHANGELOG.md [skip-ci]
2026-01-12 10:50:47 +00:00
Hiroku
474c386535
Merge branch 'main' into 'main'
...
Fix Fresh Start Mochi EV Reset
See merge request cable-mc/cobblemon!2115
2026-01-12 10:48:40 +00:00
Konoha
7893e365da
yolo: drop item on give_item if inventory is full & sneak in a fix for active_dialogue
2026-01-11 18:50:52 -05:00
ToothCollector
71b9ae8dee
add fix to CHANGELOG.md
2026-01-11 21:31:22 +02:00
ToothCollector
b87b47d62a
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon
2026-01-11 21:28:04 +02:00
Hiroku
2bb85718d7
Merge branch 'main' into 'main'
...
Fix Adorn compatibility
See merge request cable-mc/cobblemon!2112
2026-01-11 12:21:25 +00:00
Tate Frost
ee187d7b89
Delete file + update Adorn resource pack metadata
...
- Delete config file that was committed in error
- Update Adorn resource pack metadata to reflect new wood type
2026-01-10 22:30:27 -06:00
Tate Frost
3532cac278
Update CHANGELOG.md
2026-01-10 22:18:01 -06:00
Hiroku
1447ab25b4
Merge branch 'CombeeWorldGenFix' into 'main'
...
CombeeWorldGenFix
See merge request cable-mc/cobblemon!2071
2026-01-11 02:55:56 +00:00
Hiroku
9a06ca78c6
Merge branch 'fix-mongo-driver' into 'main'
...
Fix MongoDB ClassNotFoundException by including drivers at runtime
See merge request cable-mc/cobblemon!2098
2026-01-11 02:47:10 +00:00
Hiroku
f6ba70634b
Merge branch 'double-battle-gimmicks' into 'main'
...
Fix double battle gimmicks not being processed
See merge request cable-mc/cobblemon!2094
2026-01-11 02:46:36 +00:00
Hiroku
148fd04a93
Merge branch 'molang-evaluate_expression' into 'main'
...
molang addition: exception handling for run_molang
See merge request cable-mc/cobblemon!2102
2026-01-11 02:12:07 +00:00
Hiroku
17f60623ee
Merge branch 'effect-id-regex-update' into 'main'
...
Custom messages for datapack moves and abilities
See merge request cable-mc/cobblemon!2106
2026-01-11 02:08:42 +00:00
Hiroku
c5ece27c11
Merge branch '1861-galarien_mrmime_mount' into 'main'
...
Fix Galarian Mr. Mime incorrectly being rideable.
Closes #1861
See merge request cable-mc/cobblemon!2107
2026-01-11 02:02:14 +00:00
Hiroku
296ccd1a76
Merge branch 'main' into 'main'
...
Fix pasture block incorrect hit-box when facing north and south.
See merge request cable-mc/cobblemon!2109
2026-01-11 02:01:44 +00:00
ToothCollector
82a4f71f24
fix(FreshStartMochiItem.kt): Set all Pokemon's EVs to zero with the appropriate method.
2026-01-10 17:10:15 +02:00
Tate Frost
08b58e2f78
Fix Adorn compatibility
...
- Fixed Apricorn block model rotation for counters/sinks/cupboards/drawers to match that of most recent version of Adorn
- Added Saccharine wood + Adorn compatibility
2026-01-07 02:04:52 -06:00