Paul
|
bdf9606d61
|
Fixed pasture click sounds not playing / playing when they shouldn't, fixes #404
|
2023-10-09 10:55:07 +10:00 |
|
Paul
|
bf5b03398c
|
Fix fakemon breaking PCs when the addon is removed
|
2023-10-09 10:41:16 +10:00 |
|
Paul
|
0bbecc5951
|
Fixed Ninjask T-posing in battle, closes #555
|
2023-10-09 10:10:23 +10:00 |
|
Paul
|
c60fb253cd
|
Fixed no-fallback texture situations causing crashing, closes #557
|
2023-10-09 09:59:18 +10:00 |
|
Paul
|
c6a4db47f4
|
Fixed animation stacking with cries and battle animations that made Typhlosion horrifying
|
2023-10-09 09:33:22 +10:00 |
|
Paul
|
9540bc9394
|
Fixed Forewarn message being silly
|
2023-10-09 08:44:59 +10:00 |
|
Paul
|
aedb0755f9
|
Added sleeping to Mareep line
|
2023-10-09 08:19:37 +10:00 |
|
Paul
|
23eb10f5ea
|
Fixed sleeping pokemon in the wild never waking up
|
2023-10-09 08:19:28 +10:00 |
|
Paul
|
2c134c5e1b
|
More shoulder effect backcompat (slow falling)
|
2023-10-09 07:05:40 +10:00 |
|
Pebbles
|
249c305474
|
Merge branch 'main' into 'mongdb-datastore'
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
|
2023-10-07 23:16:29 +00:00 |
|
Deltric
|
65dd132081
|
Missing returns for SuccessfulBattleStart
|
2023-10-07 17:24:45 -05:00 |
|
Paul
|
0b824fe4c1
|
Added light backwards compatibility for shoulder mount effects
|
2023-10-07 21:23:02 +10:00 |
|
Hiroku
|
c9fc2ce95d
|
Merge branch 'datapack-fix' into 'main'
Switched to findAllResources instead of findResources
See merge request cable-mc/cobblemon!667
|
2023-10-07 10:56:21 +00:00 |
|
Deltric
|
a9c8825b3c
|
Forgot to change method parameters
|
2023-10-07 03:06:42 -05:00 |
|
Hiroku
|
9d64b0f06a
|
Merge branch 'untradeable-rework' into 'main'
Untradeable rework
See merge request cable-mc/cobblemon!669
|
2023-10-07 04:10:53 +00:00 |
|
Deltric
|
a84a2aac58
|
Progress on resource fix
|
2023-10-06 22:10:51 -05:00 |
|
Deltric
|
fe86d644ad
|
Switched to findAllResources instead of findResources
|
2023-10-06 22:10:51 -05:00 |
|
Hiroku
|
5d2e877176
|
Merge branch 'berry-with-flywheel' into 'main'
Make berries render with flywheel, improve perf 100x
Closes #444
See merge request cable-mc/cobblemon!665
|
2023-10-07 03:08:28 +00:00 |
|
apion
|
b2b08ac098
|
Rollback apricorn plank model change (but fr this time)
|
2023-10-06 22:08:19 -04:00 |
|
apion
|
e5f0911b83
|
Rollback apricorn plank model change
|
2023-10-06 21:52:29 -04:00 |
|
Paul
|
e1ae600419
|
Properly implemented tradeable property in trade GUI
|
2023-10-07 11:13:59 +10:00 |
|
Paul
|
34315d9f1d
|
Added a bunch of license files
|
2023-10-07 09:32:58 +10:00 |
|
Paul
|
773cef8e46
|
Forgot sprout texture
|
2023-10-07 09:32:25 +10:00 |
|
Paul
|
282a15b1b2
|
Updated Touga, Coba, Kelpsy, flower, and sprout assets
|
2023-10-07 09:30:48 +10:00 |
|
dhi_holo
|
04c5b698c2
|
New colour, who this?
All the leaves are different again
|
2023-10-06 16:55:39 +10:00 |
|
Paul
|
123029199c
|
Fixed UV rotations not being applied to berry models
|
2023-10-06 16:05:38 +10:00 |
|
Deltric
|
b4b5d62632
|
Modified mulch code
|
2023-10-05 21:22:36 -05:00 |
|
apion
|
d550d775a6
|
Fix dependency notation for flywheel
|
2023-10-05 22:05:01 -04:00 |
|
apion
|
e572584dbf
|
Remove render caching stuff from BerryBlockEntities
|
2023-10-05 22:02:03 -04:00 |
|
apion
|
6ac58cf7c2
|
Added fallback to vanilla renderer
|
2023-10-05 21:56:04 -04:00 |
|
apion
|
e8a1e66658
|
Merge branch 'main' into berry-with-flywheel
|
2023-10-05 21:44:55 -04:00 |
|
apion
|
0747d08a90
|
Forge build not working, pushing to compare
|
2023-10-05 21:17:11 -04:00 |
|
apion
|
299ab3d5f7
|
Merge branch 'main' into berry-with-flywheel
|
2023-10-05 21:05:32 -04:00 |
|
Xander Forrest
|
49a5090903
|
Merge branch cobblemon:main into main
|
2023-10-05 17:55:12 +00:00 |
|
Xander Forrest
|
7e0e55d126
|
Undo setting FormData changes on PokemonProperties
|
2023-10-05 17:13:10 +01:00 |
|
Hiroku
|
f3fa765890
|
Merge branch 'fix-double-dipping' into 'main'
Items are double consumed
See merge request cable-mc/cobblemon!658
|
2023-10-05 09:08:31 +00:00 |
|
Hiroku
|
a9a91a813a
|
Merge branch 'nickname-fix' into 'main'
Fix nickname updates not applying when returning to species name.
See merge request cable-mc/cobblemon!662
|
2023-10-05 09:06:27 +00:00 |
|
Hiroku
|
579e48f93c
|
Merge branch 'implement_pokemon' into 'main'
Some more minor fixes for Pokemon.
See merge request cable-mc/cobblemon!661
|
2023-10-05 09:01:41 +00:00 |
|
apion
|
47deb6504b
|
Get flywheel packaged into the fabric built jar, fix some create conflicts
|
2023-10-04 19:21:58 -04:00 |
|
Sterrezo
|
cd0f95169a
|
Merge branch 'main' into sound
|
2023-10-04 23:58:56 +02:00 |
|
Sterrezo
|
a23b37ee47
|
Updated the Healing Machine sound
|
2023-10-04 23:57:10 +02:00 |
|
Pebbles
|
370d65284d
|
Merge branch 'main' into 'mongdb-datastore'
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/factory/FileBackedPokemonStoreFactory.kt
|
2023-10-04 14:10:01 +00:00 |
|
Deltric
|
e2b2ee9031
|
Remove ignore case from check
|
2023-10-03 21:04:48 -05:00 |
|
Deltric
|
141b38b81c
|
Fix nickname updates not applying when returning to species name.
|
2023-10-03 20:59:41 -05:00 |
|
tyzillion
|
87fffe67f5
|
Made Frogadiers cry not loop, fixed Patrat and Watchog emissives. Fixed Phantumps shiny emissive AGAIN, and fixed shiny phantump texture.
|
2023-10-03 17:18:42 -04:00 |
|
tyzillion
|
7a13a5a4d1
|
Updated Garchomp animation tweaks, updated Nidoking texture, updated Nidorino model and animations, Removed Blazing and Ender variants from Vivillon.
|
2023-10-03 16:58:02 -04:00 |
|
Paul
|
57687ffcdb
|
Fixed wild Pokémon not sleeping in the wild
|
2023-10-03 20:59:51 +10:00 |
|
Paul
|
d40e2706c0
|
Merge remote-tracking branch 'origin/main'
|
2023-10-03 20:32:50 +10:00 |
|
Paul
|
abecc6c74d
|
Fixed light in spawning not being a very good condition at all
|
2023-10-03 20:32:38 +10:00 |
|
Hiroku
|
709b933661
|
Merge branch 'store_bug' into 'main'
Fixes an error in the Pokémon list in the BottomlessStore
See merge request cable-mc/cobblemon!659
|
2023-10-03 10:13:25 +00:00 |
|