 FrankTheFarmer
|
3f289b1deb
|
Merge branch 'main' into implement_pokemon
|
2024-11-19 20:52:17 +10:00 |
|
 Hiroku
|
0da09c767c
|
Merge branch 'evolution_tweaks' into 'main'
Edited the obscuring evolution particles to better obscure pokemon based on hitbox volume and scale.
See merge request cable-mc/cobblemon!1305
|
2024-11-19 09:36:18 +00:00 |
|
 Tyzillion
|
739d31a9ca
|
I'M LOSING MY MIND... Anyways, more tweaks to the obscure particle.
|
2024-11-18 23:45:22 -05:00 |
|
|
FrankTheFarmer
|
cbd86be78c
|
Fixed hitbox sizes for Grotle and Torterra being set to default values
|
2024-11-19 14:11:19 +10:00 |
|
|
Tyzillion
|
a5675aedcb
|
Tweaked the formula further to better account for middle stage evos.
|
2024-11-18 22:46:00 -05:00 |
|
|
FrankTheFarmer
|
c62e1bcc28
|
Merge branch 'main' into implement_pokemon
|
2024-11-19 13:28:35 +10:00 |
|
|
FrankTheFarmer
|
6c91bc273e
|
removed female specifications in Seaking's animations causing a crash
|
2024-11-19 13:17:15 +10:00 |
|
|
Tyzillion
|
196bf42fb6
|
Tweaked obscuring molang formula to better obscure Pokemon based on hitbox volume and scale.
|
2024-11-18 22:02:34 -05:00 |
|
|
FrankTheFarmer
|
76d9fae579
|
Removed single quote that broke flamigo profile and portrait
|
2024-11-19 10:34:50 +10:00 |
|
 Test
|
1d01a2bf1f
|
fix species name not being translated when scanned
|
2024-11-18 19:23:28 -05:00 |
|
|
FrankTheFarmer
|
76de1f6076
|
Let paldean wooper temporarily use johtonian cry
|
2024-11-19 10:10:47 +10:00 |
|
|
FrankTheFarmer
|
b1971f90be
|
Quagsire will now inherit the wooper heart aspect from wooper but there are no assets
|
2024-11-19 10:02:01 +10:00 |
|
|
FrankTheFarmer
|
e702d0088d
|
Krookodile animation update with corrected quirk sound event
|
2024-11-18 20:43:52 +10:00 |
|
|
FrankTheFarmer
|
332a0a6e1b
|
Merge branch 'main' into implement_pokemon
|
2024-11-17 20:36:03 +10:00 |
|
|
FrankTheFarmer
|
58bf92eeab
|
Merge branch 'main' into implement_pokemon
# Conflicts:
# common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0350_milotic/milotic.animation.json
# common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0350_milotic/milotic.json
|
2024-11-17 20:34:44 +10:00 |
|
|
FrankTheFarmer
|
7787d749c9
|
Magikarp faint fix
|
2024-11-17 20:32:51 +10:00 |
|
|
Hiroku
|
d3ae4cd3e7
|
Merge branch '1.6-spawns' into 'main'
Updated spawn files. Edited ocean_monument preset. Edited is_lush, is_ocean,...
See merge request cable-mc/cobblemon!1293
|
2024-11-17 09:25:02 +00:00 |
|
|
Hiroku
|
b41b496b80
|
Merge branch 'bugfix/dexo-fixo' into 'main'
Fixed dex errors caused by /giveallpokemon and other random catches & command permission
See merge request cable-mc/cobblemon!1301
|
2024-11-17 09:17:30 +00:00 |
|
|
Hiroku
|
9cd3ded705
|
Merge branch 'summary-updates' into 'main'
Summary updates
See merge request cable-mc/cobblemon!1300
|
2024-11-17 09:15:50 +00:00 |
|
 Test
|
ca4b50d727
|
Summary updates
|
2024-11-17 09:15:50 +00:00 |
|
|
FrankTheFarmer
|
b075145090
|
Hydreigon will now look at you properly. With one of its heads anyways
|
2024-11-17 15:41:21 +10:00 |
|
|
FrankTheFarmer
|
afe7fff061
|
Changed Alomomola's pose in the portrait. No more sad fish out of water
|
2024-11-17 15:14:27 +10:00 |
|
|
Paul
|
f6bc3f662a
|
PokedexCommand permission tweak
|
2024-11-17 13:23:07 +10:00 |
|
|
Paul
|
7ab621e5b9
|
Fixed dex errors caused by /giveallpokemon and other random catches
|
2024-11-17 13:22:55 +10:00 |
|
 plastered_crab
|
4e63cb0bb3
|
Remove Tympole, Palpitoad, Seismitoad spawn pool world files
|
2024-11-16 18:15:07 -08:00 |
|
|
plastered_crab
|
671c7adb05
|
Tweak incorrect data for Magikarp and Spiritomb spawns
|
2024-11-16 18:13:14 -08:00 |
|
|
FrankTheFarmer
|
6f3abd0986
|
Wiglett and Wugtrio will no longer float to the surface and can breathe underwater
|
2024-11-17 11:14:01 +10:00 |
|
|
FrankTheFarmer
|
2da2c41011
|
fixed looping absol blink
|
2024-11-17 10:53:59 +10:00 |
|
|
Hiroku
|
8a1faf3270
|
Merge branch 'apion-bugfix' into 'main'
Fix issue with evo progression not allowing 0.
See merge request cable-mc/cobblemon!1298
|
2024-11-16 22:55:55 +00:00 |
|
|
Hiroku
|
d0b148a91a
|
Merge branch 'cc-compat' into 'main'
Set cobblemon data version on genned chunks
See merge request cable-mc/cobblemon!1297
|
2024-11-16 22:52:51 +00:00 |
|
 apion
|
f6f88f5eef
|
Revert "Added additional checks"
This reverts commit 3f36624ba7.
|
2024-11-16 16:19:48 -05:00 |
|
|
apion
|
3f36624ba7
|
Added additional checks
|
2024-11-16 15:22:08 -05:00 |
|
|
apion
|
7e256e8381
|
Fix issue with evo progression not allowing 0.
|
2024-11-16 12:24:59 -05:00 |
|
|
apion
|
ad1aa9ad47
|
Licenses :(
|
2024-11-16 11:31:11 -05:00 |
|
|
apion
|
b4e403a701
|
Removed unnecessary inject
|
2024-11-16 11:27:00 -05:00 |
|
|
apion
|
08557913d8
|
Set cobblemon data version on genned chunks
|
2024-11-16 11:22:42 -05:00 |
|
|
Hiroku
|
830c409a06
|
Merge branch 'non-pushable-npcs' into 'main'
Added a flag to prevent NPCs from being pushed.
See merge request cable-mc/cobblemon!1281
|
2024-11-16 12:59:34 +00:00 |
|
|
Hiroku
|
5e2ef6b5fb
|
Merge branch 'main' into 'non-pushable-npcs'
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt
|
2024-11-16 12:59:16 +00:00 |
|
 Conan
|
a05f4edc82
|
Added a flag to prevent NPCs from being pushed (part 3).
|
2024-11-16 12:28:07 +01:00 |
|
|
Paul
|
97a3dc4d61
|
Treat NPC skill as a proper optional property on the entity instead of duplicating class data
|
2024-11-16 14:22:40 +10:00 |
|
|
Hiroku
|
768789d998
|
Merge branch 'feature/small-fixes' into 'main'
no more caffeine for shouldered pokemon
Closes #1146 and #1162
See merge request cable-mc/cobblemon!1277
|
2024-11-16 04:14:48 +00:00 |
|
 Polymeta
|
bfa58e9fb9
|
no more caffeine for shouldered pokemon
|
2024-11-16 04:14:48 +00:00 |
|
|
Hiroku
|
9a514477c5
|
Merge branch 'trading-display-names' into 'main'
Display correct usernames in the TradeGUI
Closes #1168
See merge request cable-mc/cobblemon!1294
|
2024-11-16 04:12:16 +00:00 |
|
|
Paul
|
7623452f4a
|
Fixed spectating not being an option in interact wheel (lol)
|
2024-11-16 13:47:15 +10:00 |
|
|
Test
|
72635d0f2f
|
genericize example names
|
2024-11-15 22:39:11 -05:00 |
|
|
Paul
|
34e581a470
|
Merge remote-tracking branch 'origin/main'
|
2024-11-16 13:09:28 +10:00 |
|
|
Paul
|
5444d67c21
|
Added heaps of documentation on brain AI stuff for NPCs
|
2024-11-16 13:09:09 +10:00 |
|
|
Hiroku
|
539331bdc7
|
Merge branch 'bait-tooltip-fixes' into 'main'
Changed fishing bait to use a codec instead of nbt stuff. Fixed issue where...
See merge request cable-mc/cobblemon!1296
|
2024-11-15 22:37:26 +00:00 |
|
|
apion
|
0d0598d68c
|
Changed fishing bait to use a codec instead of nbt stuff. Fixed issue where bait tooltips don't work on servers
|
2024-11-15 06:06:03 -05:00 |
|
|
FrankTheFarmer
|
252a223e89
|
tweaked milotic movement speeds to match the values from the bbmodel
|
2024-11-15 15:34:25 +10:00 |
|