Licious17
a66eb04097
Move InteractiveItem to API
2022-11-29 10:45:00 +00:00
Licious17
960d20599e
Refactor InteractiveItem to be an interface instead, progress on berry block n item
2022-11-28 18:07:25 +00:00
Licious17
8ea6f13d34
License stuff
2022-11-28 15:21:03 +00:00
Licious17
34d28c798d
Progress on data backing berries
2022-11-28 15:10:32 +00:00
Licious17
cb0046f4cc
Fix merge bad import
2022-11-28 12:56:09 +00:00
Licious17
b475ead059
Merge branch 'main' into berry
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json
2022-11-28 12:52:36 +00:00
Licious17
9557c48cab
Merge remote-tracking branch 'origin/berry' into berry
2022-11-28 12:50:26 +00:00
Licious17
1062507ffb
Added barebones berry block
2022-11-28 12:50:15 +00:00
Paul
ee863a4e04
Dated the changelog [skip-ci]
2022-11-28 18:34:35 +10:00
Paul
24f6915cc9
1.1.1
2022-11-28 13:25:14 +10:00
Paul
b4207b11ab
Fixed sync issue for implemented field in Species
2022-11-28 12:50:32 +10:00
Paul
7ca2003b47
Merge remote-tracking branch 'origin/main'
2022-11-28 09:29:25 +10:00
Paul
c3fbcb0c63
Polished changelog [skip-ci]
2022-11-28 09:29:16 +10:00
Hiroku
f2e7d5d923
Merge branch 'maven-publication' into 'main'
...
Add maven publication support
See merge request cable-mc/cobblemon!220
2022-11-27 23:15:12 +00:00
Nick
45ec1a0983
Add maven publication support
2022-11-27 00:55:23 -08:00
Paul
b21467f887
Merge remote-tracking branch 'origin/stuff' into stuff
...
# Conflicts:
# CHANGELOG.md
2022-11-27 16:07:07 +10:00
Paul
66e8bec6c7
Improve display of HP and fixed stat inconsistency with battles
2022-11-27 16:06:04 +10:00
Village
df033453e1
update changelog
2022-11-26 18:59:10 -05:00
Village
0c9d6234ea
Add EV vitamin items, add HP label to battle UI, update sounds
2022-11-26 18:45:33 -05:00
Paul
f99eb8d7ea
1.1.0
2022-11-26 19:03:52 +10:00
Paul
9b81b68d04
Updated gradle wrapper version to 7.6
2022-11-26 18:31:20 +10:00
Paul
87e10ac6bb
Fixed seasons reference deerling sawsbuck
2022-11-26 11:44:59 +10:00
Paul
1e284d1d6b
Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled
...
Conflicts:
CHANGELOG.md
2022-11-26 11:33:50 +10:00
Paul
b056649d49
Adjusted season feature so un-categorized biomes won't change the pokemon season form
2022-11-26 11:33:33 +10:00
Hiroku
adb069a280
Merge branch 'season-tags' into 'main'
...
Added spawn data and drops for Deerling family and Sableye. Added season tags.
See merge request cable-mc/cobblemon!219
2022-11-26 01:10:18 +00:00
Veraxiel
b511863e62
Added spawn data and drops for Deerling family and Sableye. Added season tags.
2022-11-25 20:07:19 -05:00
Paul
4e4ec0c8c2
Sleeping Pokémon don't turn to look at the player
2022-11-26 10:55:17 +10:00
Paul
135a046141
Fix substitute model weirdness
2022-11-26 10:54:37 +10:00
Paul
ed5758b7a0
Slowed down passive friendship gain so it only works for sent out Pokémon and is much slower.
2022-11-26 10:42:05 +10:00
Hiroku
8cfe210727
Merge branch 'apricorn-spawn-fix' into 'main'
...
Apricorn spawn fix
See merge request cable-mc/cobblemon!218
2022-11-25 22:30:28 +00:00
MoeBoy76
c807a2c1a1
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into apricorn-spawn-fix
...
Conflicts:
CHANGELOG.md
2022-11-26 09:13:02 +11:00
MoeBoy76
122bc13030
changelog
2022-11-26 09:09:32 +11:00
MoeBoy76
4ec3cc0dca
Apricorn spawning fix
2022-11-26 09:07:16 +11:00
Hiroku
4c5210d174
Merge branch 'new-pokemon-1' into 'main'
...
Fixed mod incompat with other Arch API mods because of unnecessary call to...
See merge request cable-mc/cobblemon!217
2022-11-25 21:47:28 +00:00
Paul
e578e36ca9
Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into new-pokemon-1
...
Conflicts:
CHANGELOG.md
2022-11-26 07:22:31 +10:00
Paul
5205e160df
Added dhi's fixes for advancements and new max_heal advancement
2022-11-26 07:15:37 +10:00
dhi_holo
b5aef1cccc
Revert "Update first_evolution.json"
...
This reverts commit f9df1085ec .
2022-11-26 03:27:20 +10:00
dhi_holo
658e6a9da5
Revert "Advancements Fixed Maybe?"
...
This reverts commit ff6f18d575 .
2022-11-26 03:27:12 +10:00
dhi_holo
ff6f18d575
Advancements Fixed Maybe?
...
I went and rewrote parts of the advancements until they worked properly as far as I can tell.
I don't get why it was breaking, but it was, and hopefully it won't from now on
2022-11-26 02:32:38 +10:00
dhi_holo
f9df1085ec
Update first_evolution.json
...
Should fix the issue Hiro mentioned earlier
2022-11-26 01:07:02 +10:00
Licious17
997bacefe2
Merge branch 'main' into berry
2022-11-25 12:46:45 +00:00
Licious17
5f94707a9e
Added pecha berry assets, added pecha berry item
2022-11-25 12:40:47 +00:00
Paul
7b10e5db62
updated langs with scraped move, ability, species data for de, fr, it, ja, ko, zh_cn
2022-11-25 22:13:13 +10:00
Paul
71497a9854
Full asset update, added seasonal variation Deerling+Sawsbuck, Sableye, Pyuku,
2022-11-25 20:35:57 +10:00
Hiroku
f3f9cca774
Merge branch 'refmap-conflict-fix' into 'main'
...
Unique Refmap Names
See merge request cable-mc/cobblemon!216
2022-11-25 06:56:59 +00:00
Nick
3940514f46
Use unique refmap names, fixes compatiblity with MTR and other mods using default name patterns
2022-11-24 22:40:32 -08:00
Paul
d254074a0a
Fixed mod incompat with other Arch API mods because of unnecessary call to ArchitecturyClient.init()
2022-11-25 09:45:45 +10:00
Licious
0316ca726e
Merge branch 'pokemon-on-zanax' into 'main'
...
Sleeping pokemon stuff
See merge request cable-mc/cobblemon!215
2022-11-24 13:12:58 +00:00
Hiroku
224a3f7a25
Sleeping pokemon stuff
2022-11-24 13:12:57 +00:00
Hiroku
4543b85401
Merge branch 'ui-updates' into 'main'
...
some updates
See merge request cable-mc/cobblemon!214
2022-11-23 23:21:13 +00:00