Plastered_Crab
|
5ff3d163c0
|
Merge branch 'main' into we_are_cooking_now
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt
# common/src/main/resources/mixins.cobblemon-common.json
|
2025-04-23 16:06:41 -07:00 |
|
Paul
|
14a3e7afb1
|
Merge remote-tracking branch 'origin/main' into we_are_cooking_now
# Conflicts:
# 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/riding/RidingManager.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableState.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/controllers/GliderAirController.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/controllers/VehicleLandController.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP3.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/PokemonP3.kt
# common/src/main/resources/mixins.cobblemon-common.json
|
2025-04-11 10:08:28 +10:00 |
|
BlackBeltPanda
|
77db2ce17a
|
Add origin and destination ServerLevel properties to ChangeDimensionEvent
|
2025-04-10 01:43:59 -04:00 |
|
Josh
|
5dc1c749f3
|
Replaced WearableItemModel enum with WearableItem class. Instances of this class should have a corresponding 3D model in models/item/wearable/
|
2025-04-07 16:35:46 -04:00 |
|
Josh
|
f1018b1da9
|
Simplified HeldItemRenderer to use only one render function that renders an Item on a PosableModel. And fixed the item lighting in the summary menu.
|
2025-03-30 20:03:07 -04:00 |
|
Josh
|
5af4e3bddb
|
Added placeholder models for wearable items and logic to register the models.
|
2025-03-30 02:03:44 -04:00 |
|
Paul
|
660be08eea
|
Overhauled cooking and fishing baits, added ride boosts, added aprijuice stat handling, probably added lots of bugs
|
2025-03-21 14:28:22 +10:00 |
|
Paul
|
769a9ac845
|
Merge remote-tracking branch 'origin/we_are_cooking_now' into we_are_cooking_now
|
2025-03-18 15:11:46 +10:00 |
|
BuildTools
|
bb121cbee7
|
Made Lure Cakes use Poi System to allow better range of effect
|
2025-03-15 12:40:39 +02:00 |
|
Paul
|
cee9adc782
|
Merge remote-tracking branch 'origin/main' into we_are_cooking_now
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt
|
2025-03-15 13:37:59 +10:00 |
|
Test
|
ed0e0fc65a
|
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into unlockable-wallpapers
|
2025-02-23 11:04:13 -05:00 |
|
Polymeta
|
ffc9fdfa6d
|
Merge branch 'refs/heads/main' into we_are_cooking_now
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/resources/cobblemon-common.accesswidener
# common/src/main/resources/mixins.cobblemon-common.json
|
2025-02-21 23:02:08 +00:00 |
|
Polymeta
|
f426b16f1d
|
Modfile tweaks and small mixin fixes
|
2025-02-21 00:28:37 +00:00 |
|
Paul
|
e175c44118
|
Added unlockable PC box wallpapers
|
2025-02-10 15:36:46 +10:00 |
|
Guilherme Pereira
|
2ac37f6c4d
|
Merge branch 'main' into we_are_cooking_now
|
2025-02-06 03:46:51 -03:00 |
|
lion
|
be76f8a180
|
Add config screen
|
2025-02-02 18:56:18 +00:00 |
|
Polymeta
|
6dbf1288a0
|
fix berry bonus yield and sodium dynamic lights compatibility (also small version bumps)
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-01-20 11:38:01 +00:00 |
|
Guilherme Pereira
|
011bc85d18
|
Merge branch 'main' into we_are_cooking_now
|
2025-01-12 19:44:19 -03:00 |
|
Paul
|
294e439f5e
|
Moved the repurposed structures stuff to an inbuilt pack
|
2025-01-11 15:56:55 +10:00 |
|
Test
|
99a71dc2e1
|
restore pokedex close transition
|
2025-01-06 20:20:52 -05:00 |
|
plastered_crab
|
ea7078b749
|
Merge branch 'refs/heads/main' into we_are_cooking_now
# Conflicts:
# 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/client/CobblemonBakingOverrides.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PokerodItem.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json
# common/src/main/resources/data/cobblemon/tags/block/flowers.json
# common/src/main/resources/data/minecraft/tags/block/flowers.json
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
|
2025-01-06 08:03:32 -08:00 |
|
Polymeta
|
5448031cae
|
fixes and minor cleanup
|
2024-12-29 01:04:53 +00:00 |
|
Nick
|
614be610d4
|
No longer log all packets by state, just register
|
2024-12-23 13:02:40 -08:00 |
|
Paul
|
311f0e3192
|
Setup inbuilt resource packs for various things
|
2024-12-23 16:30:20 +10:00 |
|
Paul
|
5019026472
|
Further reworked brewing, JEI/EMI compat might exist on Neo now (fabric is impossibru (for now))
|
2024-12-22 12:07:48 +10:00 |
|
Paul
|
9840a2758a
|
Fixed everything being medicinal brew. Drink it!!! (fixes #1249)
|
2024-12-21 22:07:30 +10:00 |
|
Apion
|
be2a0be806
|
Fixes #1182
|
2024-12-15 18:25:02 +00:00 |
|
Guilherme Pereira
|
f49f34efa3
|
Fix Pokédex screen getting stuck when changing dimensions or opening the battle GUI
|
2024-12-15 01:09:47 +00:00 |
|
Paul
|
77f7439853
|
Fixed brewing on neoforged
|
2024-12-14 14:51:01 +10:00 |
|
Paul
|
62dd487448
|
Removed platform independent JSON datapack loading because Fabric has fixed the bug, closes #1184
|
2024-12-06 20:06:50 +10:00 |
|
Hiroku
|
6b473cffa3
|
Merge branch 'dex' into 'main'
refactor pokedex item model registration, update Pokedex rendering
See merge request cable-mc/cobblemon!1323
|
2024-12-01 01:38:41 +00:00 |
|
JazzMcNade
|
bba995f3d2
|
Battle Rafts
|
2024-12-01 01:02:38 +00:00 |
|
Erusel
|
9bb0f13793
|
Added cooking pot to the block group
|
2024-11-29 16:51:16 +01:00 |
|
Erusel
|
912485067b
|
Working cooking pot recipe book
|
2024-11-29 12:10:59 +01:00 |
|
Test
|
8de05006f4
|
update dex rendering for player and blockEntities
|
2024-11-28 11:15:15 -05:00 |
|
Erusel
|
5d67d0fdfc
|
- i want to die
|
2024-11-28 03:12:45 +01:00 |
|
Erusel
|
3f90d19801
|
- Added Cooking Pot block
- Added Sweety things
- Started cooking pot handled things
|
2024-11-26 22:28:05 +01:00 |
|
Test
|
bd801b1517
|
refactor pokedex item model registration
|
2024-11-23 23:08:47 -05:00 |
|
Hiroku
|
a96880b8ed
|
Merge branch 'more-npc-dakka' into 'main'
Added panic AI for NPCs and much more molang hooking
See merge request cable-mc/cobblemon!1303
|
2024-11-22 10:15:33 +00:00 |
|
Polymeta
|
482a0015bc
|
fix gui mixin to prevent accidental 3rd person HUD disappearances
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2024-11-20 02:13:40 +00:00 |
|
Paul
|
ce6087f368
|
Added panic AI for NPCs and much more molang hooking
|
2024-11-18 13:28:50 +10:00 |
|
Polymeta
|
bfa58e9fb9
|
no more caffeine for shouldered pokemon
|
2024-11-16 04:14:48 +00:00 |
|
Segfault Guy
|
e0fce5386e
|
Merge branch 'main' into player_icons
|
2024-11-03 21:59:00 -05:00 |
|
Hiroku
|
df1ff47e0e
|
Merge branch 'feature/restore-mod-compat' into 'main'
restored modcompat with dynamic lights and adorn
Closes #775
See merge request cable-mc/cobblemon!1210
|
2024-10-21 01:18:56 +00:00 |
|
Sterrezo
|
38b0551a2d
|
Audio bugfixes and volume adjustments
|
2024-10-15 00:03:57 +00:00 |
|
Polymeta
|
6c1b9d31f7
|
adorn compat restored (doesnt work in-dev but in proper jars)
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2024-10-14 21:39:56 +01:00 |
|
Polymeta
|
f3f6a9744b
|
more smaller bugs fixed (neoforge users rejoice)
|
2024-10-10 16:57:59 +00:00 |
|
Test
|
47f8647d48
|
scan and dex fixes
|
2024-09-29 02:42:22 +00:00 |
|
Polymeta
|
99e47e4cb7
|
debug galore for pokemon
|
2024-09-24 23:05:41 +00:00 |
|
Hiroku
|
43050b4276
|
Many NPC improvements for foundation
|
2024-09-23 23:02:00 +00:00 |
|