apion
d7bbccab08
Move BerryBlockRenderState to be client specific
2024-01-02 04:26:52 -05:00
apion
21b8fe8474
Fix flower texture
2024-01-02 04:15:55 -05:00
apion
94c210efd4
Big cool rendering stuff
2024-01-02 04:06:46 -05:00
Hiroku
bcc3c885d7
Merge branch 'holographic-cleaners-inc' into 'main'
...
Tags on Tags (plus a couple tiny fixes)
Closes #736 and #706
See merge request cable-mc/cobblemon!835
2024-01-01 12:40:09 +00:00
dhi_holo
ead232be6f
Merge branch 'main' into holographic-cleaners-inc
2024-01-01 19:59:44 +10:00
dhi_holo
feaba85ba0
Update CHANGELOG.md
...
improved a description slightly
2024-01-01 19:52:26 +10:00
dhi_holo
6a8822ca76
Undone what was done before
...
Given it exists in another branch, and this was just me learning anyway, removed the ore from this branch.
2024-01-01 19:50:36 +10:00
Paul
97f8dc562a
Oopsy
2024-01-01 18:20:08 +10:00
Hiroku
6616cd1d4c
Merge branch 'moe-minor-fixes' into 'main'
...
empty evolutions tag cleanup and related fixes
See merge request cable-mc/cobblemon!832
2024-01-01 07:08:00 +00:00
Hiroku
49db87737f
Merge branch 'original-trainer' into 'main'
...
Original Trainer Implementation
See merge request cable-mc/cobblemon!831
2024-01-01 06:51:09 +00:00
Hiroku
a414213255
Merge branch 'main' into 'original-trainer'
...
# Conflicts:
# CHANGELOG.md
# common/src/main/kotlin/com/cobblemon/mod/common/util/MiscUtils.kt
2024-01-01 06:44:21 +00:00
Hiroku
4392a61ab5
Merge branch 'archaeology' into 'main'
...
Archeology
See merge request cable-mc/cobblemon!833
2024-01-01 06:26:13 +00:00
Hiroku
a9d96818ec
Removed duplicated block entity renderer registration
2024-01-01 06:24:35 +00:00
MoeBoy76
532ef09acd
updates for recent transformed parts update
2024-01-01 08:14:21 +11:00
MoeBoy76
f0f7bb96ad
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into archaeology
...
# Conflicts:
# CHANGELOG.md
2024-01-01 07:10:17 +11:00
dhi_holo
5be436f25c
Merge branch 'main' into holographic-cleaners-inc
2023-12-29 18:55:23 +10:00
dhi_holo
2ddc265b0f
Destiny Tears
...
Updated Destiny Knot to use a ghast tear
2023-12-29 18:54:26 +10:00
MoeBoy76
52af8ceb99
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into moe-minor-fixes
...
# Conflicts:
# CHANGELOG.md
2023-12-28 23:15:51 +11:00
Hiroku
14a5060100
Merge branch 'dispatch-refactor' into 'main'
...
Refactored battle interpretor to load into a sequence before starting dispatches
See merge request cable-mc/cobblemon!830
2023-12-28 10:55:22 +00:00
Hiroku
9d33586b44
Merge branch 'improved-transformed-parts' into 'main'
...
Rebuilt transformed model parts
See merge request cable-mc/cobblemon!829
2023-12-28 10:55:09 +00:00
MoeBoy76
d4f328157e
Update file PokemonBattle.kt
2023-12-27 23:35:49 +00:00
MoeBoy76
c4331043f7
changelog file that was missed in selection
2023-12-28 10:05:09 +11:00
MoeBoy76
9945d8a069
cleanup check and fix for empty evolutions in species files
2023-12-28 10:03:39 +11:00
dhi_holo
2595d6ee91
Tags for Ore!
...
Adds block and item tags for each evolution store ore type, as well as adding the ores to the modloader tags properly, making it match with how ores are handled regularly.
Also boat tags.
2023-12-28 06:04:51 +10:00
dhi_holo
f16e024bbe
I don't get it
...
Readded the Iron recipe. No clue why it disappeared, just, isn't a file for it suddenly.
Closes #736
2023-12-28 05:29:05 +10:00
Charzard4261
87a5522acc
Update CHANGELOG.md
2023-12-27 16:10:14 +00:00
Charzard4261
2c812cdc3c
Change system to explicitly declare if an Original Trainer is NONE, PLAYER or NPC through the use of OriginalTrainerType
2023-12-27 16:06:52 +00:00
dhi_holo
f6e910038e
Update beast_ball.png
...
Replaces `assets\cobblemon\textures\item\poke_balls\models\beast_ball.png` with `assets\cobblemon\textures\poke_balls\beast_ball.png`, so they match, as only one was updated.
Resolves #706
2023-12-27 18:55:52 +10:00
dhi_holo
5c7d96897d
Generation Sucks, Please Help
...
Added basically everything for Netherrack Fire Stone Ore, but the generation doesn't work and I'm not sure why. Feel free to investigate it, won't merge until it's solved.
2023-12-27 18:50:53 +10:00
dhi_holo
862d892c84
More EMI Compat
...
Added the new tags to the lang file, so they look nicer with mods such as EMI
2023-12-27 15:31:50 +10:00
dhi_holo
9246e1e8ee
Held Tags
...
Should add all missed held items to the held item tag, as well as adding Metal Coat to the Held Items tab, and moving Power Herb to after the six Power Items because sure, alphabetical is nice, but it's a set, let's let it sit together xD
2023-12-27 14:23:43 +10:00
Paul
0715cb465f
Fixed faints with loop set to true causing super whacky animations
2023-12-26 13:30:22 +10:00
Paul
2e251972aa
Merge branch 'main' into improved-transformed-parts
2023-12-26 12:48:22 +10:00
Charzard4261
7a1f96e31e
Add missing OTPlayer Username -> UUID lookup in PokemonProperties.apply(PokemonEntity)
2023-12-25 21:07:50 +00:00
Charzard4261
d405b099b3
Added the ability to modify the Original Trainer of a Pokémon through Commands
2023-12-25 21:04:42 +00:00
Hiroku
74322e2f48
Turn snapshot back on
2023-12-25 11:13:48 +00:00
Paul
40a37fedd2
Actually maybe don't try tracking causality yet
2023-12-25 20:28:47 +10:00
Paul
3bc6c50d79
Don't use deprecated scheduling
2023-12-25 20:19:13 +10:00
Paul
1ef9f44a1b
Merge remote-tracking branch 'origin/main' into dispatch-refactor
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt
2023-12-25 20:18:43 +10:00
MoeBoy76
f1ed339d9d
update for 1.4.1
2023-12-25 11:26:26 +11:00
Paul
f07930ef16
Just a little AI activity access widener
2023-12-25 09:53:11 +10:00
Paul
c6d18cda44
Fixed a fringe flickering issue with pose transitioning
2023-12-24 14:21:27 +10:00
Paul
263b86e833
Merge remote-tracking branch 'origin/main' into improved-transformed-parts
...
# Conflicts:
# CHANGELOG.md
# common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
2023-12-24 10:45:12 +10:00
Paul
953560051d
Merge conflict corrections
2023-12-24 10:26:12 +10:00
Paul
bf3904a214
Merge remote-tracking branch 'origin/main' into tracked-data-cleanup
...
# Conflicts:
# CHANGELOG.md
# common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/BattleCriticalHitsRequirement.kt
2023-12-24 10:04:03 +10:00
Hiroku
1708eb9b3e
Merge branch 'scheduling-rework' into 'main'
...
Rebuilt scheduling mechanism to be better contained and avoid side issues
See merge request cable-mc/cobblemon!793
2023-12-23 23:15:25 +00:00
Hiroku
0dee18dbfd
Merge branch 'spawn-rules' into 'main'
...
Spawn rules
See merge request cable-mc/cobblemon!825
2023-12-23 23:15:14 +00:00
Paul
7ee7aaab76
Licenses
2023-12-23 21:18:58 +10:00
Paul
3dd4f515dd
Squeezed OT into a single value pair
2023-12-23 21:00:16 +10:00
Paul
f24310d043
Merge remote-tracking branch 'origin/main' into original-trainer
2023-12-23 20:38:48 +10:00