Plastered_Crab
|
4734c0a3cb
|
Changes to Shuckle giving berry juice
|
2025-05-13 14:28:29 -07:00 |
|
Plastered_Crab
|
e16ae2544c
|
Fix sounds on fullness branch
|
2025-05-13 10:05:21 -07:00 |
|
Plastered_Crab
|
cff65ab22e
|
Merge branch 'main' into full_bellies_1.6
|
2025-05-13 08:33:15 -07:00 |
|
Polymeta
|
1d550b2cac
|
mixin cleanup
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-05-13 16:27:07 +01:00 |
|
Polymeta
|
c859cbae76
|
small seasoning codec change to fix errors when logging into servers
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-05-13 16:26:35 +01:00 |
|
Plastered_Crab
|
709e6f4a63
|
Allow for Food and Mob effects to be optional
|
2025-05-12 17:13:56 -07:00 |
|
Plastered_Crab
|
17f686488e
|
Added fullness values to new Poke Foods
|
2025-05-12 16:52:17 -07:00 |
|
Plastered_Crab
|
db574332e5
|
Merge branch 'main' into full_bellies_1.6
|
2025-05-12 15:55:10 -07:00 |
|
Plastered_Crab
|
15aac5e20a
|
Adds Ponigiri, Poke Puffs, Sinister Tea, and berry data changes and tool tip changes
|
2025-05-12 15:22:58 -07:00 |
|
Plastered_Crab
|
b88f4335ee
|
Fullness now saves on exit and displays in Summary "Other" menu
|
2025-05-12 15:08:39 -07:00 |
|
Polymeta
|
6916cd51f7
|
Merge branch 'feature/datapack-starters' into 'main'
Add datapack-driven starter menu categories
See merge request cable-mc/cobblemon!1653
|
2025-05-12 12:11:37 +00:00 |
|
Winter
|
b2ebfcc3b0
|
Simplify category validation
|
2025-05-12 12:15:13 +01:00 |
|
Hiroku
|
3b73493801
|
Merge branch 'spawning-upgrades' into 'main'
Major spawning revamp with herds and rapid spawning and refactored spawn terms
See merge request cable-mc/cobblemon!1634
|
2025-05-11 10:29:42 +00:00 |
|
plastered_crab
|
1bfe5e2044
|
Fix Item Tags after merge
|
2025-05-10 23:33:40 -07:00 |
|
plastered_crab
|
ace65eda66
|
Merge branch 'refs/heads/main' into full_bellies_1.6
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonItemTags.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/berry/FriendshipRaisingBerryItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/berry/HealingBerryItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PortionHealingBerryItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/berry/StatusCuringBerryItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/BerryJuiceItem.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json
# common/src/main/resources/assets/cobblemon/sounds.json
|
2025-05-10 22:44:39 -07:00 |
|
Apion
|
01c44537d0
|
Fix naked Gastly
|
2025-05-10 22:56:16 -04:00 |
|
Hiroku
|
e414dd94c3
|
Merge branch 'main' into 'spawning-upgrades'
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt
|
2025-05-11 02:34:59 +00:00 |
|
Apion
|
2d4800a733
|
Fix issue where locator X axis was not aligned with blockbench.
|
2025-05-10 21:50:52 -04:00 |
|
Paul
|
90e193e5a0
|
Added more information about what was renamed in spawning system
|
2025-05-11 10:33:18 +10:00 |
|
Paul
|
8228424191
|
Merge remote-tracking branch 'origin/spawning-upgrades' into spawning-upgrades
|
2025-05-11 10:14:03 +10:00 |
|
Paul
|
9bb67087b3
|
Merge remote-tracking branch 'origin/main' into spawning-upgrades
|
2025-05-11 10:11:25 +10:00 |
|
Neovitalism
|
0f08446732
|
Moves the imports back
|
2025-05-10 19:03:53 -05:00 |
|
Neovitalism
|
af09a6a0c7
|
Fixes dimension condition using the wrong ResourceLocation
|
2025-05-10 18:55:14 -05:00 |
|
Winter
|
1a12bbd493
|
Ignore unused exception
|
2025-05-10 00:09:45 +01:00 |
|
Winter
|
8a24f635cf
|
Undo reformat
|
2025-05-10 00:05:43 +01:00 |
|
Winter
|
d6e066ddcd
|
Validate starter categories
|
2025-05-10 00:03:35 +01:00 |
|
Polymeta
|
50335135c9
|
Merge branch '603.5' into 'main'
Half resolved 1207, hence the branch name
See merge request cable-mc/cobblemon!1652
|
2025-05-09 22:48:28 +00:00 |
|
Aram
|
1ee6f83a5b
|
Half resolved 1207, hence the branch name
|
2025-05-09 22:48:28 +00:00 |
|
Dani Voort
|
8f8804f3f4
|
Fix dialogue gibber not being read as nullable for "artificial" and null speaker faces
|
2025-05-09 22:59:42 +02:00 |
|
Spicy
|
d32314742d
|
Added labels and has_label as available MoLang functions
|
2025-05-09 03:29:16 +00:00 |
|
Dan
|
63bfa634ae
|
Fixed typo while saving/loading NPCEntity causes data loss
|
2025-05-08 18:26:05 +02:00 |
|
Winter
|
f041049576
|
Register StarterDataLoader
|
2025-05-08 15:07:23 +01:00 |
|
Winter
|
e1aa6445fa
|
Switch to JsonDataRegistry<StarterCategory> to be consistent with other registries
|
2025-05-08 15:06:51 +01:00 |
|
Winter
|
f1b7ee5b9c
|
Revert to original implementation
|
2025-05-08 15:03:35 +01:00 |
|
Plastered_Crab
|
d0edd6ecbc
|
Aprijuice visual tweaks
|
2025-05-08 08:46:51 +00:00 |
|
Winter
|
1372505486
|
Add license header
|
2025-05-07 22:46:18 +01:00 |
|
Winter
|
a4ce4bf99b
|
Add datapack starter categories with fallback support
|
2025-05-07 20:33:26 +01:00 |
|
Aram
|
40b5726c5b
|
1544, Add Pokemon Despawner to Config!
|
2025-05-06 16:10:27 +00:00 |
|
Polymeta
|
d32aa46832
|
init PokemonProperties with basefriendship is none is explicitly set
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-05-06 00:00:24 +01:00 |
|
MoeBoy76
|
482b682595
|
corrected logic that was incorrectly checking the ResourceLocation of the species
|
2025-05-05 12:31:57 +10:00 |
|
Paul
|
ffecc58979
|
Fixed gibber click interactions not being as intended
|
2025-05-04 13:17:39 +10:00 |
|
Paul
|
eaaf2ca05c
|
Added unset_interaction to NPC structs
|
2025-05-04 12:16:16 +10:00 |
|
Paul
|
e91651553b
|
Added set_dialogue_interaction to NPC structs
|
2025-05-04 12:14:32 +10:00 |
|
Test
|
a2094677cd
|
update pot cook button
|
2025-05-03 00:12:26 -04:00 |
|
Polymeta
|
eae4eb5121
|
Merge branch 'E' into 'main'
🇪
See merge request cable-mc/cobblemon!1646
|
2025-05-02 08:33:44 +00:00 |
|
Test
|
ed3a008515
|
🇪
|
2025-05-02 08:33:43 +00:00 |
|
Polymeta
|
462074ce43
|
Merge branch 'sketch-copy-move-fix' into 'main'
Sketch copy move fix
Closes #1503
See merge request cable-mc/cobblemon!1645
|
2025-05-02 08:32:33 +00:00 |
|
Plastered_Crab
|
bf8433f6e9
|
Aprijuice visual tweaks
|
2025-05-02 08:32:13 +00:00 |
|
CeeJay
|
2ecbe28c87
|
remove extra line Fixes #1503
|
2025-04-30 21:48:12 -04:00 |
|
Polymeta
|
80112e0b70
|
pokemon can use flying pose again
Closes #1553
|
2025-05-01 00:05:38 +00:00 |
|