CeeJay
|
2ecbe28c87
|
remove extra line Fixes #1503
|
2025-04-30 21:48:12 -04:00 |
|
CeeJay
|
f776542365
|
regex to capture special characters along with spaces in sketch copying move
|
2025-04-29 23:39:41 -04:00 |
|
Sterrezo
|
2085f12fef
|
Pokemon no longer make sounds as they're being sent out and now respect silent nbt
|
2025-04-29 02:08:17 +02:00 |
|
MoeBoy76
|
804ad75ede
|
migrate missed advancements to use species tag
|
2025-04-28 22:40:52 +10:00 |
|
MoeBoy76
|
be11568041
|
fixed broken advancement and exta criterion that was missed, corrected changelog typo
|
2025-04-28 20:50:54 +10:00 |
|
MoeBoy76
|
179d90d482
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into advancing
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CastPokeRodCriterionCondition.kt
# common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/ReelInPokemonCriterionCondition.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PokerodItem.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json
|
2025-04-28 08:43:07 +10:00 |
|
Paul
|
dccffe311f
|
Cleanup in a few task configs
|
2025-04-27 19:06:39 +10:00 |
|
Paul
|
d7d8d766d1
|
Improved starting checks on wander tasks when the wander chance is a constant or variable reference
|
2025-04-27 17:01:45 +10:00 |
|
Paul
|
54b2cc0a59
|
Added permission node for seeing hidden NPCs
|
2025-04-27 17:01:19 +10:00 |
|
Paul
|
62696931df
|
Fixed implemented list being doubled up
|
2025-04-27 16:57:45 +10:00 |
|
Paul
|
bfc7f83e07
|
Merge remote-tracking branch 'origin/main' into smarterer-pokemons
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/entity/npc/NPCEntity.kt
|
2025-04-27 14:16:02 +10:00 |
|
Hiroku
|
db573455ea
|
Merge branch 'cross-dimensional-packets' into 'main'
Prevent Cross Dimensional Packets
See merge request cable-mc/cobblemon!1630
|
2025-04-27 00:06:22 +00:00 |
|
Polymeta
|
a15c44325d
|
Merge branch 'riding-error-handling' into 'main'
Fail gracefully on riding deserialization errors
See merge request cable-mc/cobblemon!1639
|
2025-04-26 22:07:06 +00:00 |
|
Apion
|
33fc67ed58
|
Merge branch 'npc-gibberspeak' into 'main'
NPC gibberish
See merge request cable-mc/cobblemon!1616
|
2025-04-26 21:22:22 +00:00 |
|
Apion
|
b9f2bcc3a3
|
Fix missing import causing compile error
|
2025-04-26 17:10:59 -04:00 |
|
Apion
|
8a5a88b4f1
|
Merge branch 'particle-reorg' into 'main'
𝕿𝖍𝖊 𝕲𝖗𝖊𝖆𝖙 𝕻𝖆𝖗𝖙𝖎𝖈𝖑𝖊 𝕽𝖊𝖔𝖗𝖌 𝖔𝖋 2025
See merge request cable-mc/cobblemon!1627
|
2025-04-26 21:01:01 +00:00 |
|
Apion
|
af6b1190c1
|
Merge branch 'main' into npc-gibberspeak
# Conflicts:
# common/src/main/resources/cobblemon-common.accesswidener
# common/src/main/resources/mixins.cobblemon-common.json
|
2025-04-26 16:37:58 -04:00 |
|
Apion
|
7f0a6d4d48
|
Merge branch 'no-rolling' into 'main'
Option to disable rolling is now functional. I would not use this on anything...
See merge request cable-mc/cobblemon!1592
|
2025-04-26 20:22:15 +00:00 |
|
Apion
|
d7e4298a91
|
Fix compile error from flashback MR
|
2025-04-26 15:42:44 -04:00 |
|
Landon Wills
|
923b4e4266
|
Change from throwing exception to logging warning when we fail to deserialize riding behaviour
|
2025-04-26 12:08:33 -04:00 |
|
Hiroku
|
30f82bbad6
|
Merge branch 'flashback-compat' into 'main'
Fix flashback crash
See merge request cable-mc/cobblemon!1629
|
2025-04-26 07:45:13 +00:00 |
|
Hiroku
|
1823eb4979
|
Merge branch 'npc-stealth' into 'main'
[molang] easy access npc hiding
See merge request cable-mc/cobblemon!1573
|
2025-04-26 04:09:36 +00:00 |
|
Apion
|
ae4af68797
|
Fix compile errors
|
2025-04-25 21:55:26 -04:00 |
|
Polymeta
|
da7f4a2682
|
Merge branch 'oopsies-fix-cake-texture' into 'main'
Add new cooking pot recipes, fix EV yield berry effects, fix other recipes,...
See merge request cable-mc/cobblemon!1637
|
2025-04-25 22:27:50 +00:00 |
|
Polymeta
|
73c4762801
|
Merge branch 'new-recipes-fix-recipes-fix-baits-color-cakes' into 'main'
Add new cooking pot recipes, fix EV yield berry effects, fix other recipes,...
See merge request cable-mc/cobblemon!1636
|
2025-04-25 21:21:49 +00:00 |
|
Plastered_Crab
|
43abfa3c17
|
New Lure/Poke Cake item sprites for tinting
|
2025-04-25 14:20:07 -07:00 |
|
Plastered_Crab
|
fb87220fe9
|
Add new cooking pot recipes, fix EV yield berry effects, fix other recipes, add color to Lure/Poke Cake item texture
|
2025-04-25 13:33:59 -07:00 |
|
Sterrezo
|
07bba37c03
|
Restored and relocated assets
|
2025-04-25 20:00:00 +02:00 |
|
Sterrezo
|
5896a74d1f
|
Added generic gibber sound
|
2025-04-25 19:14:45 +02:00 |
|
Landon
|
2a0de32854
|
Merge branch 'fix-species-config' into 'main'
Fix misconfigured riding behaviours preventing world load
See merge request cable-mc/cobblemon!1635
|
2025-04-25 17:07:45 +00:00 |
|
Landon Wills
|
406097c1ff
|
Fix misconfigured riding behaviours preventing world load
|
2025-04-25 12:27:28 -04:00 |
|
Landon
|
14ec3c00e6
|
Merge branch 'cleanup-camera-mixin' into 'main'
Cleanup camera mixin
See merge request cable-mc/cobblemon!1633
|
2025-04-25 16:26:09 +00:00 |
|
Jackson Bowes
|
59c96fe30d
|
Merge branch 'main' into 'riding-behaviour-additions-01'
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/GliderAirBehaviour.kt
|
2025-04-25 09:34:23 -05:00 |
|
JacksonB
|
565667aa1c
|
Address MR comments
|
2025-04-25 09:29:17 -05:00 |
|
Aram
|
beee02033c
|
Tree-afying the Saccharine Tree to reflect vanilla tree behaviour
|
2025-04-25 12:50:30 +00:00 |
|
Paul
|
74d2f4f700
|
Minor changelog and consistency
|
2025-04-25 10:52:57 +10:00 |
|
Paul
|
6ed4504273
|
Removed debug logging line in PokemonAdultSensor
|
2025-04-25 10:48:33 +10:00 |
|
Paul
|
8ee6799653
|
Fixed being unable to save behaviours on pokemon using the editor
|
2025-04-25 10:46:16 +10:00 |
|
Paul
|
96cbc4eca6
|
Merge corrections and replaced string types with resource locations for taskconfig and behaviourconfig
|
2025-04-25 10:34:04 +10:00 |
|
Paul
|
ad24e529f5
|
Merge remote-tracking branch 'origin/main' into smarterer-pokemons
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FormPokemonBehaviour.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/OmniPathNodeMaker.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/PokemonBehaviour.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/SwimBehaviour.kt
# common/src/main/resources/cobblemon-common.accesswidener
|
2025-04-25 09:36:45 +10:00 |
|
Polymeta
|
86902b69e1
|
fix duplicate mixin entry and server error when unlocking wallpapers
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-04-25 00:29:24 +01:00 |
|
JPAK
|
2ac102a3b6
|
Fix issue with pivot offset & update licenses.
|
2025-04-24 16:23:04 -05:00 |
|
JPAK
|
edc5ae741c
|
Move large amounts of render code from CameraMixin to new MountedCameraRenderer.kt
|
2025-04-24 14:50:29 -05:00 |
|
JPAK
|
70bed4f299
|
Move client code in PlayerMixin to LocalPlayerMixin to fix crash.
|
2025-04-24 14:10:41 -05:00 |
|
Polymeta
|
e24b20546d
|
Merge branch 'first_person_poser' into 'main'
Add poser option to offset first person camera while riding. This is in...
See merge request cable-mc/cobblemon!1600
|
2025-04-24 11:54:47 +00:00 |
|
Polymeta
|
625a31e7e8
|
fix another server-side error
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-04-24 11:41:52 +01:00 |
|
Polymeta
|
2b14931709
|
licenses
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-04-24 11:15:32 +01:00 |
|
Polymeta
|
2c32b50182
|
fix server crash and small cleanup
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-04-24 11:12:41 +01:00 |
|
Plastered_Crab
|
b5230a8d3c
|
Merge with main and register IncenseSweetProspector
|
2025-04-23 16:39:14 -07:00 |
|
Plastered_Crab
|
5ff3d163c0
|
Merge branch 'main' into we_are_cooking_now
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt
# common/src/main/resources/mixins.cobblemon-common.json
|
2025-04-23 16:06:41 -07:00 |
|