Commit Graph
1406 Commits
Author SHA1 Message Date
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 1062507ffb Added barebones berry block 2022-11-28 12:50:15 +00:00
Paul b4207b11ab Fixed sync issue for implemented field in Species 2022-11-28 12:50:32 +10:00
Nick 45ec1a0983 Add maven publication support 2022-11-27 00:55:23 -08:00
Paul 66e8bec6c7 Improve display of HP and fixed stat inconsistency with battles 2022-11-27 16:06:04 +10: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 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
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
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 4ec3cc0dca Apricorn spawning fix 2022-11-26 09:07:16 +11: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
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 224a3f7a25 Sleeping pokemon stuff 2022-11-24 13:12:57 +00:00
Test 844892e059 some updates 2022-11-23 23:21:13 +00:00
Test 528c7b57e7 Update Summary UI 2022-11-23 11:06:29 +00:00
Hiroku d51095a4cd Merge branch '#120-pathfinding-fixes' into 'main'
#120 pathfinding fixes

See merge request cable-mc/cobblemon!212
2022-11-23 09:48:52 +00:00
Paul 30568a5ba7 Merge remote-tracking branch 'origin/main' 2022-11-23 16:13:23 +10:00
Paul 4ec48bc2ec Removed SHINY datatracker field since aspects basically do that 2022-11-23 16:13:11 +10:00
Paul 4f5139a5ae Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into #120-pathfinding-fixes
 Conflicts:
	changelog.txt
2022-11-23 12:51:40 +10:00
Paul a766af9914 Significantly improved AI, particularly for larger Pokémon and water Pokémon. 2022-11-23 12:50:13 +10:00
Paul 316e931314 Remove debug line from healing machine 2022-11-23 12:25:56 +10:00
Veraxiel 20a2e72985 Changes to biome tags to fix Highlands spawns. 2022-11-20 18:41:45 -05:00
Veraxiel 6f68c19f2e Fixed an issue with Arcanine's spawn data. 2022-11-20 18:11:00 -05:00
Veraxiel b4b52a5465 Fix to Pyukumuku species data. 2022-11-20 17:36:16 -05:00
Veraxiel 75a98f2323 Added spawn files for Alolan Rattata family, Pyukumuku, and all Pokémon previously lacking spawns except Legendaries. Added drops for all Pokémon given spawn data. 2022-11-20 03:46:17 -05:00
Veraxiel 26a7352792 Fixed an error in CobblemonConfig. 2022-11-19 02:46:31 -05:00
Veraxiel 74aab55b97 Fixed issues with biome tags. Updated default configs. 2022-11-19 01:14:03 -05:00
Paul 127d394037 Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled
 Conflicts:
	changelog.txt
	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/BattleOverlay.kt
2022-11-17 21:18:26 +10:00
Paul eacc49d658 Updated many models, animations, textures, and added Alolan Rattata + Raticate 2022-11-17 21:16:32 +10:00
Paul bd132b17b0 Show battle message pane even when minimised, show moves (disabled) even when PP is run out, moved R prompt in battle upwards 2022-11-17 20:26:57 +10:00
Paul d62f08c0c9 Fixed presets taking priority over same-field declarations in spawn files 2022-11-17 20:11:50 +10:00
Licious fef4d78ddf Magnitude interpret 2022-11-16 12:40:14 +00:00
Licious 9e6bd39fa2 Forge keybind fix 2022-11-15 23:10:03 +00:00
Paul 4b0c3c11d1 Fixed Grimer, Muk, Hitmonchan, and Arbok idle animations not looping correctly, causing T-posing 2022-11-15 21:20:29 +10:00
Paul 985ad66022 'random' property and /spawnallpokemon will only spawn implemented pokemon 2022-11-15 21:18:55 +10:00