Licious
|
b3255045fa
|
Fix compatibility with the Forge version of Carry On, add compatibility for Adorn.
|
2023-10-18 22:17:35 +01:00 |
|
Licious
|
5868d39431
|
Rework Composter item registration to be platform implementation specific.
|
2023-10-17 19:53:48 +01:00 |
|
Hiroku
|
b3757113ac
|
Merge branch 'pokemon-drops' into 'main'
Pokemon drops
Closes #552
See merge request cable-mc/cobblemon!678
|
2023-10-12 21:29:06 +00:00 |
|
Paul
|
747aedca27
|
Fixed battle tile animations having the zoomies in Forge
|
2023-10-09 08:45:10 +10:00 |
|
miasmus
|
a7fed0d042
|
gen 5 drops, edits for consistency
|
2023-10-08 18:38:57 -04:00 |
|
Deltric
|
a84a2aac58
|
Progress on resource fix
|
2023-10-06 22:10:51 -05:00 |
|
apion
|
9c67d0ad6f
|
Fixed forge build
|
2023-10-05 21:42:00 -04:00 |
|
apion
|
299ab3d5f7
|
Merge branch 'main' into berry-with-flywheel
|
2023-10-05 21:05:32 -04:00 |
|
Paul
|
ae41d4ac58
|
Fixed Forge pasture block issues wherever pasture blocks are near the world center, closes #518
|
2023-09-29 10:21:53 +10:00 |
|
apion
|
72b6f46c4b
|
Merge branch 'main' into berry-with-flywheel
|
2023-09-14 21:04:28 -04:00 |
|
Paul
|
0ee4f60391
|
Fixed bad registration of processor types on Forge
|
2023-09-12 20:26:52 +10:00 |
|
Hiroku
|
19a85276af
|
Reworked berry generation in villages using their own structures, rarity & gen fixes
|
2023-09-09 20:55:30 +00:00 |
|
apion
|
914067038a
|
Fix forge client, fix flower models
|
2023-09-06 11:13:28 -04:00 |
|
apion
|
b70748e1b8
|
BerryBlockRenderer now caches vertices, improves perf by about 4x (HOORAY)
|
2023-09-04 05:53:56 -04:00 |
|
apion
|
d17f8f90b8
|
Made berry atlases actually work (only on Fabric for now, this is prototyped af)
|
2023-09-03 05:56:08 -04:00 |
|
Apion
|
d8f9f8926b
|
Berries
|
2023-09-02 06:05:40 +00:00 |
|
apion
|
d2970c10b3
|
Added texture atlases for berries, fixed issue in Forge where berry models werent being loaded
|
2023-09-01 21:26:45 -04:00 |
|
apion
|
995a8c2dc0
|
Got structure processor + overrides working
|
2023-08-17 05:08:00 -04:00 |
|
apion
|
90b8923b98
|
Merge branch 'main' into implementing-naturally-generated-structures
# Conflicts:
# common/src/main/resources/cobblemon-common.accesswidener
# common/src/main/resources/mixins.cobblemon-common.json
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
# forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt
|
2023-08-15 22:17:11 -04:00 |
|
Licious
|
afafe35d16
|
1.20.1
|
2023-07-08 23:10:22 +00:00 |
|
Hiroku
|
452ff46815
|
Added Vivichokes
|
2023-07-07 00:43:42 +00:00 |
|
Paul
|
331278d1b3
|
Finalized brewing mechanism, added incorrectly-textured medicinal brew w/ recipe
|
2023-06-17 20:13:35 +10:00 |
|
Paul
|
669a119bf5
|
Merge remote-tracking branch 'origin/custom-brewing-basis-1.19.3' into revival-herbs
# Conflicts:
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
# forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt
|
2023-06-17 12:24:34 +10:00 |
|
Paul
|
933ba72d04
|
Merge remote-tracking branch 'origin/main' into revival-herbs
|
2023-06-16 22:53:22 +10:00 |
|
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
|
2cc44d32fb
|
Added BeneathHeightmapPlacementModifier
|
2023-06-04 11:35:09 +10:00 |
|
jmmcp
|
36fcb12add
|
Added potion recipes to access widener and an example recipe for it
|
2023-05-31 18:04:37 -04:00 |
|
Paul
|
63a779cb1e
|
Fixed custom brewing recipes on Forge I think
|
2023-05-28 23:15:46 +10:00 |
|
Paul
|
4d5bc93702
|
Fixed Forge runs
|
2023-05-17 20:39:22 +10: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 |
|
Yaseen
|
06335ca854
|
better way of adding pokecenters to structure pool
|
2023-03-27 02:02:50 +01:00 |
|
Licious17
|
f9cdd9d002
|
Several fixes & tweaks, Forge currently broken
|
2023-03-25 21:59:34 +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
|
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 |
|