Plastered_Crab
|
db1711b76f
|
More attempts to render the eggs (I hate these things)
|
2024-12-18 10:23:34 -08:00 |
|
Plastered_Crab
|
ab5b2e8fdf
|
Add EggComponent and try to get Server to sync to Client (I AM SO CLOSE)
|
2024-12-17 17:02:16 -08:00 |
|
Plastered_Crab
|
efa4028948
|
Change Egg data to prevent cheesing, and try to make them render via texture instead of overlay
|
2024-12-17 14:13:29 -08:00 |
|
Plastered_Crab
|
65529474cb
|
Merge main into Breeding branch to keep it up to date
|
2024-12-17 10:19:04 -08:00 |
|
Plastered_Crab
|
7d756249ae
|
Merge branch 'main' into breeding
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/fishing/FishingBait.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveSet.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt
# common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
# common/src/main/resources/cobblemon-common.accesswidener
|
2024-12-17 10:14:54 -08:00 |
|
Paul
|
9540c38a72
|
Updated readme example for NPC
|
2024-12-15 16:58:31 +10:00 |
|
Hiroku
|
677adc8d2f
|
Merge branch 'starter-selection-cry' into 'main'
Play cry when Pokémon is clicked on the starter selection screen
See merge request cable-mc/cobblemon!1362
|
2024-12-15 06:25:29 +00:00 |
|
lion
|
a99b1dfc6c
|
Play cry when Pokémon is clicked on the starter selection screen
|
2024-12-15 06:25:29 +00:00 |
|
Paul
|
ddd417d458
|
Added player to PokedexDataChangedEvent's flow context
|
2024-12-15 15:19:43 +10:00 |
|
Paul
|
10a12a897e
|
Merge remote-tracking branch 'origin/main' into dex-update-event
|
2024-12-15 15:15:48 +10:00 |
|
Paul
|
9fce99ed73
|
Improved dex event, added dex update flow, expanded dex molang and added q.player.pokedex
|
2024-12-15 15:15:13 +10:00 |
|
JazzMcNade
|
54e5a5e819
|
Fixed single abilities mons always evolving into the hidden ability. Fixed ability capsule / patch not being able to revert abilities.
|
2024-12-14 20:35:23 -06:00 |
|
Test
|
58f85e6d0d
|
fix npc scaling + eye height, update edit interface
|
2024-12-15 02:17:45 +00:00 |
|
Polymeta
|
71bfdf41f4
|
Merge branch 'the-else-strikes-back' into 'main'
Fix Feebas spawning
Closes #1187
See merge request cable-mc/cobblemon!1365
|
2024-12-15 01:13:26 +00:00 |
|
Jordan
|
9976965673
|
Fix Feebas spawning
|
2024-12-15 01:13:26 +00:00 |
|
Hiroku
|
098df1a5a6
|
Merge branch 'dex-travelling-dimensions' into 'main'
Fix Pokédex screen getting stuck when changing dimensions or opening the battle GUI
See merge request cable-mc/cobblemon!1370
|
2024-12-15 01:09:47 +00:00 |
|
Guilherme Pereira
|
f49f34efa3
|
Fix Pokédex screen getting stuck when changing dimensions or opening the battle GUI
|
2024-12-15 01:09:47 +00:00 |
|
Hiroku
|
eac19929c4
|
Merge branch 'fix-dex-animations-not-playing' into 'main'
Fix animations not playing on Pokédex
See merge request cable-mc/cobblemon!1355
|
2024-12-15 00:43:09 +00:00 |
|
Guilherme Pereira
|
59cced5b2c
|
Fix animations not playing on Pokédex
|
2024-12-15 00:43:08 +00:00 |
|
Apion
|
f07707221f
|
Merge branch 'implement_pokemon' into 'main'
Pokémon fixes and tweaks
Closes #1230 and #1137
See merge request cable-mc/cobblemon!1371
|
2024-12-14 23:57:34 +00:00 |
|
Polymeta
|
89b89592ab
|
Pokémon fixes and tweaks
|
2024-12-14 23:57:33 +00:00 |
|
Hiroku
|
cdeb977769
|
Update DexInformationChangedEvent.kt
|
2024-12-14 23:55:43 +00:00 |
|
Paul
|
a3987b433c
|
Merge remote-tracking branch 'origin/main'
|
2024-12-14 22:19:51 +10:00 |
|
Paul
|
99de91bd7e
|
Added optional level property to pool party providers for using molang to force a level value, closes #1244
|
2024-12-14 22:19:39 +10:00 |
|
Paul
|
4b292b1241
|
Less zealous on the warning logging
|
2024-12-14 22:16:07 +10:00 |
|
MoeBoy76
|
9a61c3471b
|
Added ignore checks to prevent passive healing/revival when config values are 0
|
2024-12-14 22:12:08 +11:00 |
|
Hiroku
|
4cadd4e20f
|
Merge branch 'fix/watchdog' into 'main'
Watchdog: Possible fix for watchdog crashing
See merge request cable-mc/cobblemon!1368
|
2024-12-14 04:26:24 +00:00 |
|
Hiroku
|
17a3d86324
|
Update PokemonEntity.kt
|
2024-12-14 04:25:19 +00:00 |
|
Hiroku
|
48653073f5
|
if (
|
2024-12-14 04:21:49 +00:00 |
|
Nick
|
82c7c03e28
|
Initial tests for watchdog fix
|
2024-12-13 20:18:13 -08:00 |
|
Hiroku
|
bc7b4f94c2
|
I fix bugs too
|
2024-12-14 04:16:35 +00:00 |
|
Paul
|
0c48a318c5
|
Added /runmolangscript, updated molang version
|
2024-12-14 12:22:25 +10:00 |
|
Paul
|
dab89a9f8c
|
Merge remote-tracking branch 'origin/main'
|
2024-12-14 11:05:55 +10:00 |
|
Paul
|
53fd2dba2d
|
Fixed flows double-registering then triple-registering then quadruple-registering then-
|
2024-12-14 11:05:48 +10:00 |
|
Polymeta
|
a5b15c6127
|
Merge branch 'more-items-tooltips' into 'main'
Add tooltips to many items
See merge request cable-mc/cobblemon!1346
|
2024-12-14 00:48:11 +00:00 |
|
Guilherme Pereira
|
174fb59bbb
|
Add tooltips to many items
|
2024-12-14 00:48:11 +00:00 |
|
Paul
|
2f8bd44938
|
Added q.set_query for assigning new query function values, closes #1240
|
2024-12-14 10:36:53 +10:00 |
|
Paul
|
9d58c7126e
|
Fixed set_npc_variable not initializing NPC data properly
|
2024-12-14 10:12:50 +10:00 |
|
Hiroku
|
2afd722125
|
Incl default return for get_npc_variable when no data exists for the NPC yet
|
2024-12-14 00:03:25 +00:00 |
|
Plastered_Crab
|
4ee029fa54
|
Fixed lang files for EV lowering berries to actually be correct
|
2024-12-12 09:41:17 -08:00 |
|
JazzMcNade
|
af23b82ce5
|
Fixed reading speciesdata instead of formdata. Fixed rafts deploying on...
|
2024-12-11 08:14:41 +00:00 |
|
amo
|
d1a8171079
|
resolve threads
|
2024-12-09 23:57:38 +00:00 |
|
amo
|
d4b673ea38
|
Merge branch 'main' into dex-update-event
|
2024-12-09 23:54:08 +00:00 |
|
Guilherme Pereira
|
55621b01b7
|
Fix quiet cries in the Pokédex
|
2024-12-07 22:38:12 +00:00 |
|
Paul
|
b828fe2b3a
|
Merge remote-tracking branch 'origin/main'
|
2024-12-07 20:59:45 +10:00 |
|
Paul
|
b7b10151e1
|
Added get_npc_variable and set_npc_variable to player functions for convenience, updated molang for flexibility with query struct nested assignments
|
2024-12-07 20:59:33 +10:00 |
|
amo
|
de21b7c402
|
forgot me loighter
|
2024-12-07 04:44:27 +00:00 |
|
amo
|
10fe3c4362
|
🍋🟩 Chore: Add Dex data update event
|
2024-12-07 04:40:50 +00:00 |
|
Sterrezo
|
8f5f40c360
|
Adjusted portrait space detection in the Pokedex to prevent overlap
|
2024-12-06 18:32:19 +00:00 |
|
Hiroku
|
0e586b4f38
|
Merge branch 'fix/ivs' into 'main'
Rework copy on properties, just clone fields rather than serialize + deserialize JSON
See merge request cable-mc/cobblemon!1344
|
2024-12-06 12:38:01 +00:00 |
|