Paul
|
a1df69c67a
|
Merge remote-tracking branch 'origin/1.19.3'
# Conflicts:
# common/build.gradle.kts
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt
# common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketRegistrar.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/WildRestGoal.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json
|
2023-04-24 21:43:41 +10:00 |
|
Deltric
|
22ce696423
|
What seems backwards is actually forwards
|
2023-04-16 14:02:04 +00:00 |
|
Nick
|
007bc4b212
|
Validate animations are registered via model AND configuration
|
2023-04-06 10:01:34 +00:00 |
|
Nick
|
e633c5f1b0
|
Update architectury + fabric API dependency requirements
|
2023-03-17 23:25:32 +00:00 |
|
Paul
|
d576022219
|
Merge conflict stuff
|
2023-03-13 16:19:15 +10:00 |
|
Hiroku
|
1e33b4fc1d
|
Kotlin4forge compat
|
2023-03-10 12:15:32 +00:00 |
|
Paul
|
080a7f76bc
|
Merge remote-tracking branch 'origin/main' into bye-architectury
# Conflicts:
# common/src/main/java/com/cobblemon/mod/common/mixin/ArgumentTypesMixin.java
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonClientImplementation.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonConfiguredFeatures.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonEntities.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonFeatures.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonImplementation.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonPlacements.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/events/entity/EntityAttributeEvent.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/events/net/MessageBuiltEvent.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonItemTags.kt
# common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/PCBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketRegistrar.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/pokemon/update/EvolutionUpdatePacketHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/pokemon/update/SingleUpdatePacketHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/SpeciesAssetResolver.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/ai/goals/PokemonInBattleMovementGoal.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/CobblemonItemGroups.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/PacketHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/SidedPacketRegistrar.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/battle/BattleHealthChangePacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/battle/BattleSwitchPokemonPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/StringUpdatePacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/evolution/EvolutionUpdatePacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/EvolutionLikeUpdatePacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/SetPokemonPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/pokemon/update/evolution/EvolutionDisplayUpdatePacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/ServerPacketHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/ServerPacketRegistrar.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/EvolutionDisplayUpdatePacketHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/registry/CompletableRegistry.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/EventExtensions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/math/geometry/TransformationMatrix.kt
# common/src/main/kotlin/com/cobblemon/mod/common/world/feature/CobblemonOreConfiguredFeatures.kt
# common/src/main/kotlin/com/cobblemon/mod/common/world/feature/CobblemonOrePlacedFeatures.kt
# common/src/main/kotlin/com/cobblemon/mod/common/world/placement/BiomeTagModifier.kt
# common/src/main/kotlin/com/cobblemon/mod/common/world/placement/CobblemonPlacementTypes.kt
# common/src/main/resources/assets/cobblemon/textures/gui/interact/move_select.png
# common/src/main/resources/assets/cobblemon/textures/gui/summary/icon_shiny.png
# common/src/main/resources/cobblemon-common.accesswidener
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/net/CobblemonNetworkFabric.kt
# forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt
# forge/src/main/kotlin/com/cobblemon/mod/forge/client/CobblemonForgeClient.kt
# forge/src/main/kotlin/com/cobblemon/mod/forge/net/CobblemonNetworkForge.kt
# gradle/libs.versions.yml
|
2023-02-22 11:37:37 +10:00 |
|
Licious17
|
4b9071d183
|
Finished all platform abstract stuff, finished Fabric implementation.
|
2023-02-15 11:54:16 +00:00 |
|
Licious17
|
e2506f95a6
|
Implement worldgen feature registration
|
2023-02-12 21:03:53 +00:00 |
|
Paul
|
ed55dd21af
|
Final fixes to particles, updated copyright to 2023
|
2023-02-05 19:02:37 +10:00 |
|
Paul
|
17c6608203
|
Pretty much completed Snowstorm particle implementation
|
2023-02-01 08:30:12 +10:00 |
|
Paul
|
e58b0e8347
|
A lot more Snowstorm stuff
|
2023-01-21 10:41:00 +10:00 |
|
Paul
|
9a4ed01c7a
|
Started the 1.19.3 port, TODO: itemgroups, placed features
|
2023-01-16 18:09:16 +10:00 |
|
Paul
|
00f2420e09
|
Migrated to better molang library
|
2023-01-02 12:37:23 +10:00 |
|
Paul
|
27e02963eb
|
Implemented Showdown messaging using Graal
|
2022-12-19 21:01:12 +10:00 |
|
Paul
|
9b81b68d04
|
Updated gradle wrapper version to 7.6
|
2022-11-26 18:31:20 +10:00 |
|
Licious17
|
cfa3d1fcf8
|
Implement support for Lucko' fabric-permission-api
|
2022-11-06 00:53:55 +00:00 |
|
MoeBoy76
|
920b1aa5b8
|
Merge branch 'main' of https://gitlab.com/cable-mc/pokemon-cobbled into advancements-staging
Conflicts:
common/src/main/kotlin/com/cablemc/pokemod/common/api/events/PokemodEvents.kt
|
2022-11-03 20:02:57 +11:00 |
|
MoeBoy76
|
6b6409e0c6
|
Added Catch and Evolution Advancements and Hatch barebones
|
2022-11-03 20:00:49 +11:00 |
|
Paul
|
fe0cf55d0c
|
Many scaled pokemon, added Crobat model
|
2022-10-28 20:55:42 +10:00 |
|
Oliver Whitehead
|
9eaec5b1da
|
fix: fix clean build
|
2022-09-17 03:04:58 +01:00 |
|
Oliver Whitehead
|
b8b4314265
|
build: finish cleanup
|
2022-09-16 18:42:18 +01:00 |
|
Oliver Whitehead
|
442077ae6c
|
build: initial gradle cleanup (I'm tired)
|
2022-09-16 02:34:45 +01:00 |
|
Paul
|
d06fcf8b6a
|
A heap more changes for gradle shit trying to copy Adorn
|
2022-03-14 17:49:57 +10:00 |
|
Paul
|
70a963be8b
|
Initial commit of files from my and Landon's experimenting
|
2021-11-22 11:41:35 +10:00 |
|