Lily
|
6ee6beddeb
|
capture particles... again
|
2024-01-26 17:45:31 -05:00 |
|
Lily
|
b92960da77
|
Merge branch 'main' into amo/sendout-upgrade
|
2024-01-26 17:29:13 -05:00 |
|
Hiroku
|
83e7a1968a
|
Merge branch 'can-moe-scrape' into 'main'
Blueberry allergy fix
See merge request cable-mc/cobblemon!851
|
2024-01-19 23:59:49 +00:00 |
|
Hiroku
|
70c1b42ede
|
Merge branch 'non-entity-spawning' into 'main'
Abstracted spawning so it could be made to support non-entity spawning
Closes #729
See merge request cable-mc/cobblemon!850
|
2024-01-13 05:58:32 +00:00 |
|
MoeBoy76
|
b2048bb66f
|
git hates me [skip-ci]
|
2024-01-13 16:48:45 +11:00 |
|
MoeBoy76
|
9956f1c159
|
dipplin fix [skip-ci]
|
2024-01-13 14:14:43 +11:00 |
|
MoeBoy76
|
25857dafc5
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into can-moe-scrape
# Conflicts:
# common/src/main/resources/data/cobblemon/species/generation9/dipplin.json
|
2024-01-13 14:10:22 +11:00 |
|
MoeBoy76
|
80345b3810
|
blueberry allergy fix [skip-ci]
|
2024-01-13 14:01:59 +11:00 |
|
Paul
|
2209ee10b6
|
Licenses
|
2024-01-13 12:05:07 +10:00 |
|
Paul
|
a91aa9835c
|
interop improvement on PokemonProperties.parse
|
2024-01-13 11:48:29 +10:00 |
|
Paul
|
0e980a846c
|
Abstracted spawning so it could be made to support non-entity spawning
|
2024-01-13 11:36:31 +10:00 |
|
Apion
|
92fff27b4e
|
Merge branch 'can-moe-scrape' into 'main'
Add gen 9 DLC movesets
See merge request cable-mc/cobblemon!846
|
2024-01-12 03:16:58 +00:00 |
|
MoeBoy76
|
255874cbe4
|
Add gen 9 DLC movesets
|
2024-01-12 03:16:58 +00:00 |
|
Apion
|
824bc1b080
|
Merge branch 'botanypots' into 'main'
Botanypots integration - with additional fixes
See merge request cable-mc/cobblemon!844
|
2024-01-12 03:12:38 +00:00 |
|
Greger
|
3ee55f24d8
|
Botanypots integration - with additional fixes
|
2024-01-12 03:12:38 +00:00 |
|
jeffw773
|
5983b17e87
|
- Added in Retro's adjusted capture animation JSON for regular ball and ancient ball
|
2024-01-11 08:31:24 -08:00 |
|
Hiroku
|
27986d28a7
|
Merge branch 'musical-blocks' into 'main'
Musical Blocks
See merge request cable-mc/cobblemon!845
|
2024-01-11 13:06:09 +00:00 |
|
Hiroku
|
8807f2134e
|
Merge branch 'main' into 'musical-blocks'
# Conflicts:
# CHANGELOG.md
|
2024-01-11 11:31:10 +00:00 |
|
Hiroku
|
d74b1228c1
|
Merge branch 'new_poison_touch_fix' into 'main'
- Fixed battle lang for Poison Touch in a much simpler way
See merge request cable-mc/cobblemon!849
|
2024-01-11 11:30:38 +00:00 |
|
Hiroku
|
a3dcfe8bfb
|
Merge branch 'main' into 'main'
Update PokemonEntity to be an open class.
See merge request cable-mc/cobblemon!847
|
2024-01-11 11:24:10 +00:00 |
|
jeffw773
|
8725ef2b54
|
- Fixed battle lang for Poison Touch in a much simpler way
|
2024-01-10 19:22:47 -08:00 |
|
Pebbles
|
3074b067dc
|
Update PokemonEntity to be an open class.
|
2024-01-10 19:08:23 +00:00 |
|
Lily
|
8d0ee6dd6f
|
more particle changes
|
2024-01-10 11:44:12 -05:00 |
|
MoeBoy76
|
5e52d350c1
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into can-moe-scrape
# Conflicts:
# CHANGELOG.md
|
2024-01-10 12:25:21 +11:00 |
|
MoeBoy76
|
e3ad34e023
|
changelogs [skip-ci]
|
2024-01-10 12:23:30 +11:00 |
|
MoeBoy76
|
f308918fd1
|
update Z species for gen 9 movesets
|
2024-01-10 12:19:26 +11:00 |
|
MoeBoy76
|
82a8257fa9
|
update Y species for gen 9 movesets
|
2024-01-10 12:13:30 +11:00 |
|
MoeBoy76
|
6c06c91cca
|
update W species for gen 9 movesets
|
2024-01-10 12:07:12 +11:00 |
|
MoeBoy76
|
c5e44031a6
|
update V species for gen 9 movesets
|
2024-01-10 11:53:58 +11:00 |
|
MoeBoy76
|
6be2e14af4
|
update U species for gen 9 movesets
|
2024-01-10 11:29:04 +11:00 |
|
MoeBoy76
|
5cae25c059
|
update T species for gen 9 movesets
|
2024-01-10 11:25:17 +11:00 |
|
Lily
|
87e4f94af5
|
hisui capture particles, modern capture particles still need to be fixed
|
2024-01-09 19:18:55 -05:00 |
|
MoeBoy76
|
90ac9ae4df
|
update S species for gen 9 movesets
|
2024-01-10 10:38:34 +11:00 |
|
Apion
|
527518d0c2
|
Merge branch 'funny_butterfly' into 'main'
changes to vivillon advancements and patterns
See merge request cable-mc/cobblemon!842
|
2024-01-09 21:21:10 +00:00 |
|
Lily
|
bcb326cd87
|
changes to vivillon advancements and patterns
|
2024-01-09 21:21:09 +00:00 |
|
Lily
|
43075f1cb8
|
updated capture particles, waiting for the animation files
|
2024-01-09 08:27:31 -05:00 |
|
MoeBoy76
|
c226b80430
|
update R species for gen 9 movesets
|
2024-01-09 15:38:58 +11:00 |
|
dhi_holo
|
935f7039cf
|
Musical Blocks
Note Block Instruments!
|
2024-01-09 13:19:32 +10:00 |
|
Paul
|
ac5a03eebc
|
Made particles use particle sheet translucent
|
2024-01-08 13:51:56 +10:00 |
|
apion
|
7c164fc4c8
|
Revert "Added BotanyPots integration"
This reverts commit 846acaef88.
|
2024-01-07 02:28:40 -05:00 |
|
Paul
|
5e1c233493
|
Fixed some ancient pokeball animation stuff
|
2024-01-07 14:02:17 +10:00 |
|
Paul
|
95e95afef3
|
Conflict resolution stuff
|
2024-01-07 13:39:46 +10:00 |
|
Paul
|
bf9c54e539
|
Merge remote-tracking branch 'origin/main' into amo/sendout-upgrade
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/Poseable.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
|
2024-01-07 13:28:42 +10:00 |
|
Apion
|
2ccda57c66
|
Merge branch 'botanypots' into 'main'
Added BotanyPots integration
Closes #642
See merge request cable-mc/cobblemon!828
|
2024-01-06 15:17:50 +00:00 |
|
Greger
|
846acaef88
|
Added BotanyPots integration
|
2024-01-06 15:17:50 +00:00 |
|
Hiroku
|
5fa12ff1c5
|
Merge branch 'punch-apricorn' into 'main'
Punch apricorn
See merge request cable-mc/cobblemon!843
|
2024-01-06 01:11:53 +00:00 |
|
tmetcalfe89
|
2b3db32243
|
right, we should make sure it's proper age before harvesting
|
2024-01-05 15:20:34 -08:00 |
|
tmetcalfe89
|
4b54405017
|
added ability to punch apricorn to harvest
|
2024-01-05 13:48:16 -08:00 |
|
Paul
|
3824531735
|
Made moveToPose able to function without an entity
|
2024-01-05 16:14:32 +10:00 |
|
amo
|
618f66c775
|
fix up sendout particle code and implement greatball particles
|
2024-01-05 01:36:37 +00:00 |
|