Hiroku
6777c8d57d
Merge remote-tracking branch 'origin/main' into form_changes
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/molang/function/EvolutionMoLangFunctions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/molang/function/PokemonMoLangFunctions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PPUpItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/requirements/StatCompareRequirement.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/requirements/StatEqualRequirement.kt
# gradle.properties
2026-09-20 10:23:05 +10:00
Polymeta
b4aba94f89
bump neoforge.mods.toml loaderVersion to be in line with what cobblemon is built against
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-09-10 08:22:19 +01:00
Paul
7915f3f94e
Merge branch 'version/1.9' into form_changes
...
# Conflicts:
# common/src/main/java/com/cobblemon/mod/common/mixin/ClientPacketListenerMixin.java
# common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachines.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokeSnackBlockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/tmmachine/TMMachineMenu.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/evolution/ClientboundSeatAssignmentPacket.kt
# common/src/main/resources/data/cobblemon/species/generation5/panpour.json
# common/src/main/resources/data/cobblemon/species/generation8/duraludon.json
2026-09-07 11:46:52 +10:00
Crater
14e4abca27
Fixed crash when passenger packet arrives before seat assignment packet
2026-09-04 04:25:35 +00:00
dhi_holo
e58ffb9a00
Compostables updated
2026-08-20 12:51:18 +10:00
dhi_holo
0281dd2e94
Eggant
...
Closes #2043
2026-08-20 11:07:04 +10:00
Paul
1235a70323
Conflict resolve maybe
2026-05-26 21:15:00 +10:00
terrainwax
432b350d98
Fix Neoforge shader initialization
2026-05-16 18:45:48 +02:00
Paul
364d084584
Small miscellaneous touchups including from thetechgo's MR
2026-05-15 13:01:26 +10:00
Polymeta
4ba33c2a80
neoforge can boot into singleplayer again
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2026-05-03 17:37:09 +01:00
Sterrezo
3447caea22
Alpha cry tweaks
2026-04-23 16:36:21 +02:00
Plastered_Crab
0a52e70027
Merge branch '1.8.0' into sigma-pokemon
...
# Conflicts:
# CHANGELOG-1.8.md
# common/src/main/kotlin/com/cobblemon/mod/common/api/mark/Mark.kt
2026-04-22 09:15:08 -07:00
Sterrezo
36d8c3520d
Bunch of tweaks to alpha cries
2026-04-18 00:38:40 +02:00
jackowes
03bc8a1b40
Add modRuntimeOnly for Graal in dev environment
2026-04-04 11:34:01 -05:00
Plastered_Crab
65afff1c3c
Merge branch '1.8.0' into sigma-pokemon
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt
2026-03-25 15:54:14 -07:00
jackowes
b39068283f
better initial defualts for reverb length
2026-03-21 22:27:12 -05:00
jackowes
34c4cc1579
alpha cry pitch down and reverb. Beginning of alpha eye trail rendering. Adjust config defaults for alpha sizes to be larger (mechanic design discussion)
2026-03-21 22:16:09 -05:00
Nick
ffaee877a7
Make sure we don't bundle everything + handle showdown init errors better
2026-03-14 19:54:10 -07:00
Nick
186f7dbbce
Move Graal and Mongo to JiJ
2026-03-14 19:19:43 -07:00
Cyrus
92c8fc0afc
#1945 Brewing Stand Shift Click Crash NeoForge 1.7.3 [1.21.1]
2026-02-27 00:08:36 +00:00
Paul
c3d2918a2b
Fixed a crash when joining a server and a player is riding nearby
2026-01-23 17:49:57 +10:00
Paul
6573e08da7
Fix for packet handling to ensure all packets are handled on main and without extra delays on Fabric, closes #1903
2026-01-23 13:37:36 +10:00
mkh
409f1056b9
fix: Add MongoDB driver dependency to Fabric/NeoForge build configuration and shade it into the mod jar to resolve ClassNotFoundException.
2025-12-26 17:31:46 +08:00
Ceejay
8f5f158b60
Adding Missing Effects for Seasonings
2025-12-13 22:13:24 +00:00
Guilherme Pereira
29b560d244
Merge branch 'main' of gitlab.com:cable-mc/cobblemon into partner-mark
2025-11-27 18:21:19 -03:00
Polymeta
b822b626c4
split recipebooktype and category across fabric and neoforge so we can leverage neoforge APIs
2025-11-26 12:44:05 +00:00
Guilherme Pereira
4723f91500
add riding stats
2025-11-22 21:57:25 -03:00
MoeBoy76
16762ae933
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into getting-statistical
2025-11-17 17:56:53 +11:00
Paul
4a68e53968
Slowpoke tail snip snip
2025-11-14 16:44:09 +10:00
MoeBoy76
461b22efa8
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into getting-statistical
...
# Conflicts:
# common/src/main/resources/assets/cobblemon/lang/en_us.json
2025-11-13 12:44:17 +11:00
Apion
64e84dab64
Merge remote-tracking branch 'origin/main' into apion-bugfix
...
# Conflicts:
# common/src/main/java/com/cobblemon/mod/common/mixin/client/CameraMixin.java
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/camera/MountedCameraRenderer.kt
2025-11-12 13:21:18 -05:00
JPAKx4
ae6091fc01
Pull code out of the mixins.
2025-11-08 22:51:31 -06:00
Apion
929e4b2391
Licenses
2025-11-08 15:43:50 -05:00
Apion
c593a8b7e6
Fixed CameraMixin on neoforge
2025-11-08 15:00:22 -05:00
Apion
d0fc166e09
Fix SoundEngineMixin on neoforge
2025-11-08 14:44:33 -05:00
Apion
b4c971398d
Fix BrewingStandMenuMixin on neoforge
2025-11-08 14:01:02 -05:00
MoeBoy76
604b4d39ea
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into getting-statistical
2025-11-05 14:26:27 +11:00
Landon Wills
5119617f00
Check for moonrise and disable conflicting mixin if loaded
2025-11-02 09:39:33 -05:00
Paul
26b5707317
how about you license deez
2025-10-13 19:37:14 +10:00
Paul
7fdeaeabef
Fixed neoforge hover mounts not being able to descend
2025-10-13 16:45:32 +10:00
MoeBoy76
9a7e349101
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into getting-statistical
2025-09-23 09:33:46 +10:00
MoeBoy76
07a7d2a51a
Statistics correctly register and if something goes wrong a more helpful crash should be thrown.
2025-09-23 09:33:28 +10:00
Test
12377deff7
Merge branch 'dynlight-refactor' into 'main'
...
Number pushing and Dynlight betterments
See merge request cable-mc/cobblemon!1864
2025-09-22 07:47:42 +00:00
MoeBoy76
d2b192cb07
stats still don't register
2025-09-22 13:36:54 +10:00
MoeBoy76
d8e3e93a87
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into getting-statistical
2025-09-22 10:06:52 +10:00
MoeBoy76
af12df38ed
stats should work for NF now
2025-09-22 10:05:03 +10:00
Nadja Reitzenstein
78ec9d3723
Stop using Architectury Runtime Transfomers implicitly
...
We don't use the Architectury Runtime Transformers in any of our direct code, so there is no downside for setting compile_only and entirely dropping them.
This necessitates the other implemented changes to our build system though as the transformers also inject code and resources from the :common project into the platform-specific ones in dev-env runs. Production jars use compile-time transformed and remapped jar shadowing for the same purpose so they are wholly unaffected by this removal.
Removing ART has several upsides: For one their dev-env injections have proven very unreliable so with this change a lot of caching issues have been fundamentally removed. They also inject deep into different parts of the JVM, making hot code reloads almost impossible to function so with this change reloads should be able to apply more often.
2025-09-20 11:42:14 +02:00
Nadja Reitzenstein
ea6452287b
Refactor dynamic light support to be future-proof
2025-09-18 17:48:28 +02:00
dhi_holo
c168364ca4
Errors Be Gone
...
Fixed an error I made in a previous branch
Fixed some tag names erroring on NeoForge
Fixed some items not being properly scrubbed from the mod
Fixed some tags not having translations, causing errors in the log
2025-08-14 20:45:45 +10:00
dhi_holo
afd007856e
Nutty!
2025-06-08 00:20:16 +00:00