Paul
|
6ff4befb04
|
Possible fix for tick watchdog hang
|
2024-12-04 22:00:56 +10:00 |
|
Hiroku
|
28fc273b26
|
Merge branch 'gimmi_tower_typo_fix' into 'main'
Fixing something i found in the processor lists
See merge request cable-mc/cobblemon!1345
|
2024-12-04 10:47:14 +00:00 |
|
Slippy
|
b871645e9e
|
Fixing something i found in the processor lists
|
2024-12-03 11:23:40 -06:00 |
|
Hiroku
|
cec0ee04e0
|
Merge branch 'ability-patch-fix' into 'main'
Ability Patch fix
See merge request cable-mc/cobblemon!1342
|
2024-12-03 11:41:07 +00:00 |
|
Conan
|
069bc91aa1
|
Added fix to changelog
|
2024-12-03 12:39:54 +01:00 |
|
Hiroku
|
692a1bd6ba
|
Merge branch 'stat-sanity' into 'main'
Make Stats#getStat use actual sane checking logic
See merge request cable-mc/cobblemon!1343
|
2024-12-03 11:22:35 +00:00 |
|
amo
|
3d877496b3
|
🍋🟩 Chore: why was it ever any other way
|
2024-12-03 02:18:33 +00:00 |
|
Conan
|
1e4964d80c
|
Fixed an issue where Pokémon with their hidden ability couldn't change back to their original abilities
|
2024-12-02 13:41:01 +01:00 |
|
Hiroku
|
92ecaa66fa
|
Merge branch 'power-items-tooltips' into 'main'
Fixes power items tooltips
See merge request cable-mc/cobblemon!1340
|
2024-12-01 09:46:08 +00:00 |
|
Guilherme Pereira
|
4d3e6400ab
|
fixes power items tooltips
|
2024-12-01 05:30:46 -03:00 |
|
Paul
|
60d0c490dd
|
Critical typo correction
|
2024-12-01 12:23:23 +10:00 |
|
Hiroku
|
3ec89cd84e
|
Merge branch 'beast-rod-line-fix' into 'main'
Fix fishing line color for beast rod
See merge request cable-mc/cobblemon!1339
|
2024-12-01 01:50:25 +00:00 |
|
Hiroku
|
6452521434
|
Merge branch 'held-items-tooltips' into 'main'
Held items, evolutions items and candies tooltips
See merge request cable-mc/cobblemon!1318
|
2024-12-01 01:39:30 +00:00 |
|
Guilherme Pereira
|
5cbf961ac2
|
Held items, evolutions items and candies tooltips
|
2024-12-01 01:39:30 +00:00 |
|
Hiroku
|
6b473cffa3
|
Merge branch 'dex' into 'main'
refactor pokedex item model registration, update Pokedex rendering
See merge request cable-mc/cobblemon!1323
|
2024-12-01 01:38:41 +00:00 |
|
Nick
|
f353548f9e
|
Merge branch 'TheRaftShow' into 'main'
Battle Rafts
See merge request cable-mc/cobblemon!1338
|
2024-12-01 01:02:38 +00:00 |
|
JazzMcNade
|
bba995f3d2
|
Battle Rafts
|
2024-12-01 01:02:38 +00:00 |
|
Plastered_Crab
|
46266c08ac
|
Fix fishing line color for beast rod
|
2024-11-29 21:40:47 -08:00 |
|
Nick
|
19aa45e0af
|
Merge branch 'bugfixes' into 'main'
Fishing bugfixes
See merge request cable-mc/cobblemon!1337
|
2024-11-30 03:26:06 +00:00 |
|
Nick
|
0fe8ebd008
|
Merge branch 'Offhand-bait-fixes' into 'main'
Fix offhand bait being applied
See merge request cable-mc/cobblemon!1336
|
2024-11-30 03:19:34 +00:00 |
|
Sterrezo
|
3e393546a2
|
Fishing Pokemon now uses up durability
|
2024-11-30 01:45:13 +01:00 |
|
Plastered_Crab
|
e5995a5491
|
Fix offhand bait being applied
It was being applied still even when that bait was already on the bobber.
|
2024-11-29 16:31:25 -08:00 |
|
Sterrezo
|
7de083bf4f
|
Fixed Fishermen selling 3 Pokerod smithing templates and capped max trades
|
2024-11-29 23:34:39 +01:00 |
|
Test
|
5f7451c284
|
rm unused files
|
2024-11-29 19:13:17 +00:00 |
|
Test
|
454c2c60ab
|
merge from main
|
2024-11-28 17:35:37 -05:00 |
|
Test
|
c581673ef1
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into dex
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/PokedexGUI.kt
|
2024-11-28 17:19:53 -05:00 |
|
Test
|
09e29137fc
|
check for view counter block in packet handler
|
2024-11-28 17:04:48 -05:00 |
|
Test
|
fd1e5ef421
|
split lectern block entity into reuseable class
|
2024-11-28 16:38:39 -05:00 |
|
Test
|
8de05006f4
|
update dex rendering for player and blockEntities
|
2024-11-28 11:15:15 -05:00 |
|
Hiroku
|
7188978a66
|
Merge branch 'sound' into 'main'
Sounds for candy items + missing sound fixes + cleanup
See merge request cable-mc/cobblemon!1334
|
2024-11-28 11:08:28 +00:00 |
|
Hiroku
|
f60fd26cbf
|
Merge branch 'Lure_ball_tooltip_fix' into 'main'
Add correct Lure Ball tooltip now that fishing works :D
See merge request cable-mc/cobblemon!1335
|
2024-11-28 04:39:32 +00:00 |
|
Hiroku
|
3ba59d2165
|
Merge branch 'pokerod-durability-buff' into 'main'
Increase durability of Pokerods to be 256 instead of 64
See merge request cable-mc/cobblemon!1333
|
2024-11-28 04:24:44 +00:00 |
|
Plastered_Crab
|
cd80598857
|
Add correct Lure Ball tooltip now that fishing works :D
|
2024-11-27 17:55:04 -08:00 |
|
Sterrezo
|
0978febaba
|
Update CHANGELOG.md
|
2024-11-28 00:25:25 +01:00 |
|
Sterrezo
|
bb67629fa5
|
Fixed Quick Attack and Paralysis missing sounds
|
2024-11-28 00:16:24 +01:00 |
|
Sterrezo
|
d21039953f
|
Update quickattack.json
|
2024-11-27 23:25:13 +01:00 |
|
Sterrezo
|
682f931f0f
|
sounds.json fixes and duplicate asset removal
|
2024-11-27 23:16:00 +01:00 |
|
Plastered_Crab
|
3796997a12
|
Increase durability of Pokerods to be 256 instead of 64
|
2024-11-27 12:55:01 -08:00 |
|
Sterrezo
|
b4cf49e1a8
|
Added a sound for using candy items
Closes a closed issue that requested sounds for candy items
|
2024-11-27 19:05:42 +01:00 |
|
Hiroku
|
2820989586
|
Merge branch 'ihatebugtypes' into 'main'
Ihatebugtypes
Closes #1174, #1180, and #1183
See merge request cable-mc/cobblemon!1313
|
2024-11-27 11:44:53 +00:00 |
|
Hiroku
|
d37f6bc5a4
|
Merge branch 'pumpkins-can-move' into 'main'
re-added Pumpkaboo's moves
Closes #1202
See merge request cable-mc/cobblemon!1332
|
2024-11-27 11:44:23 +00:00 |
|
Hiroku
|
90d7fc3c2f
|
Merge branch 'sterr/subtitles' into 'main'
Generic subtitles + bugfix
Closes #1200
See merge request cable-mc/cobblemon!1331
|
2024-11-27 11:44:03 +00:00 |
|
MoeBoy76
|
e2779c55f2
|
re-added Pumpkaboo's moves
|
2024-11-27 11:46:32 +11:00 |
|
Segfault Guy
|
349b4c28cc
|
Merge remote-tracking branch 'origin/main' into ihatebugtypes
|
2024-11-26 13:49:07 -05:00 |
|
Sterrezo
|
7f2540a48f
|
Added generic subtitles to block sounds
|
2024-11-26 18:02:22 +01:00 |
|
Sterrezo
|
367db9a368
|
Corrected subtitles for successful capture
Closes #1200
|
2024-11-26 17:53:16 +01:00 |
|
Hiroku
|
c95f4cb9ad
|
Merge branch 'implement_pokemon' into 'main'
Several fixes to some pokemon and redo of Magikarp jump forms to fit standards
Closes #1137
See merge request cable-mc/cobblemon!1329
|
2024-11-26 11:30:17 +00:00 |
|
Frank The Farmer
|
c0ccefd9b4
|
Several fixes to some pokemon and redo of Magikarp jump forms to fit standards
|
2024-11-26 11:30:17 +00:00 |
|
Nick
|
f45a1681fa
|
Merge branch 'pokerod-tooltip-changes' into 'main'
Add new tooltips for pokerods to show players how to add bait
See merge request cable-mc/cobblemon!1328
|
2024-11-25 21:09:40 +00:00 |
|
Plastered_Crab
|
12c820313a
|
Add lang files for adding and removing bait tooltips
|
2024-11-25 13:01:28 -08:00 |
|