mirrors/cobblemon
1
0 Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-30 05:48:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,105 Commits 225 Branches 24 Tags
ea46a2973f2c19f97d75101d0ee3d3d73fa8ed2c
Commit Graph
169 Commits
Author SHA1 Message Date
Licious 5fa56177fc Tooltip changes 2023-06-15 21:19:22 +00:00
Licious 371f2ac08a Implemented LootTable injection 2023-06-13 17:21:39 +00:00
Paul 4d5bc93702 Fixed Forge runs 2023-05-17 20:39:22 +10:00
Landon 058ac88f19 Add mints 2023-05-11 10:07:11 +00:00
Deltric 22ce696423 What seems backwards is actually forwards 2023-04-16 14:02:04 +00:00
Licious17 9c0babf267 Fix Forge client lifecycle stuff, runs work again 2023-04-06 10:16:06 +01:00
Paul 65ac3319f3 Updated from main 2023-04-01 18:48:22 +10:00
Paul 045b9fbc9a Merge remote-tracking branch 'origin/main' into 1.19.3 
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PartyStore.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketRegistrar.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormParticleHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/MatrixWrapper.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.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/net/serverhandling/storage/party/ReleasePCPokemonHandler.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/storage/pc/ReleasePartyPokemonHandler.kt
#	common/src/main/resources/assets/cobblemon/models/item/link_cable.json
#	common/src/main/resources/cobblemon-common.accesswidener
 2023-04-01 17:54:36 +10:00
Nick bf331a7471 Use transitive access wideners in favor of side-mod/plugin development 2023-03-28 04:57:48 +00:00
Licious17 f9cdd9d002 Several fixes & tweaks, Forge currently broken 2023-03-25 21:59:34 +00:00
JMMCP e8ea697caa Fixed various shinies and a couple misc. bugs 2023-03-21 22:12:50 +00:00
Nick e633c5f1b0 Update architectury + fabric API dependency requirements 2023-03-17 23:25:32 +00:00
Paul 2aa85c4254 Compile errors and general patching for 1.3 -> 1.4 2023-03-13 21:48:59 +10: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
Tyzillion f2cbf78144 Implemented many Pokemon. 2023-02-27 08:54:24 +00:00
Paul e8b23fd0be Fixed spawn packets esp on Forge, fixed various other packets, fixed party overlay again 2023-02-23 23:56:19 +10:00
Paul 39dcae9cb1 Licenses update for 2022 -> 2023 2023-02-22 20:21:59 +10:00
Paul 5eba2230ea Many many corrections from merging main into bye-architectury 2023-02-22 19:35:43 +10: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
Yaseen Sultan 5b67155112 Heal party on sleep 2023-02-20 05:55:59 +00:00
Paul 47194659fa Various 1.19.3 fixes and packet errors 2023-02-20 12:57:38 +10:00
Paul 413dafd681 Fix Forge decoding of packets not knowing the actual packet identifier 2023-02-20 10:49:13 +10:00
Licious17 1759249a89 Fix processResources task on forge 2023-02-15 17:10:13 +00:00
Licious17 6e83f9f7be Licenses 2023-02-15 13:37:39 +00:00
Licious17 50ac79281a Finished Forge implementation. 2023-02-15 13:37:15 +00:00
Licious17 4b9071d183 Finished all platform abstract stuff, finished Fabric implementation. 2023-02-15 11:54:16 +00:00
Hiroku ad71a445ba Particle keyframe support for Bedrock animations 2023-02-14 12:44:32 +00:00
Licious17 76a04a0df9 Remove ArgumentTypesMixin and implement platform specific registration 2023-02-12 22:32:56 +00:00
Licious17 e2506f95a6 Implement worldgen feature registration 2023-02-12 21:03:53 +00:00
Licious17 f3ad759c25 Implement worldgen feature registration 2023-02-12 15:43:39 +00:00
Licious17 0785ce1c71 Implement sound event registration, add stripped block functionality to apricorn logs 2023-02-12 15:25:14 +00:00
Licious17 805fe12600 Implement block entity registration 2023-02-12 13:29:37 +00:00
Licious17 14d71200ec Implemented Entity types registration. 2023-02-12 13:07:18 +00:00
Paul 6a53bb2ecb Fixed soft-dupe from boats and other vehicles 2023-02-12 17:19:50 +10:00
Licious17 150e6685ef Implemented item and block registration, fixed Forge mods.toml requiring 1.19.2 instead of 1.19.3 2023-02-11 23:31:02 +00:00
Paul 849ab32c5d Fixed party overlay not rendering 2023-02-05 21:55:59 +10:00
Paul 01a82c5e74 Merge remote-tracking branch 'origin/main' into snowstorm-particles 
# Conflicts:
#	CHANGELOG.md
#	common/build.gradle.kts
#	common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
 2023-02-05 19:17:04 +10:00
Paul ed55dd21af Final fixes to particles, updated copyright to 2023 2023-02-05 19:02:37 +10:00
Nick 3991a52f3e Restructure publishing logic, provide forge/fabric modules for debugging 2023-02-04 08:28:05 +00:00
Licious17 fce087979a Added all features, game boots 2023-02-02 15:57:22 +00:00
Paul 17c6608203 Pretty much completed Snowstorm particle implementation 2023-02-01 08:30:12 +10:00
Paul 00f2420e09 Migrated to better molang library 2023-01-02 12:37:23 +10:00
Paul e8c7b31144 Added explicit dependency on Architectury so we get fewer crash reports 2022-12-31 18:59:35 +10:00
Hiroku 732547213a Merge branch 'mod-menu-compat' into 'main' 
Added necessary data

See merge request cable-mc/cobblemon!239
 2022-12-27 22:03:01 +00:00
Nick bd01b9d682 Relocate IBM package, add pipes for Graal logging 2022-12-27 13:10:38 -08:00
Licious17 ab390703da Updated mods.toml and fabric.mod.json with our new website. 2022-12-27 17:38:09 +00:00
Paul ecbde40aa6 Fixed production issue on Forge caused by Graal 2022-12-23 12:42:46 +10:00
Paul 17fa80e752 Upped compile-time RAM requisition to 4gb 2022-12-19 21:59:10 +10:00
Paul 27e02963eb Implemented Showdown messaging using Graal 2022-12-19 21:01:12 +10:00