BuildTools
ab0a129ba1
TM Machine GUI and Inventory synced and working properly
2025-02-12 18:45:32 +02:00
Guilherme Pereira
a3f272b2aa
Merge branch 'main' into 1.21.1-TMs
2025-02-06 03:48:28 -03:00
Polymeta
588a5d4ce1
Ensure EV berries actually reduce the stat instead of raising it
...
Closes #1434
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-02-05 21:13:47 +00:00
Polymeta
58bd15b3b2
Merge branch '1403-creative-tab-lang-changes' into 'main'
...
Added 'Cobblemon: ' to creative tabs for clarity. Closes #1403
Closes #1403
See merge request cable-mc/cobblemon!1518
2025-02-05 00:23:44 +00:00
Josh
88769ec1f2
Added 'Cobblemon: ' to creative tabs for clarity. Closes #1403
2025-02-05 00:23:44 +00:00
Hiroku
aa790d0511
Merge branch 'shared-model-repository' into 'main'
...
Refactored VaryingModelRepository to simplify and support NPCs using Pokémon models and anims etc
See merge request cable-mc/cobblemon!1507
2025-02-04 21:02:00 +00:00
Polymeta
bd0b1bca3d
pass HA prio along to ensure it's not being incorrectly set as forced
...
Closes #1401
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-02-04 15:00:23 +00:00
Paul
2fa0204a20
Remove redundant comments
2025-02-04 20:34:21 +10:00
Polymeta
7bcd398438
whops missed a file to fix pipeline
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-02-03 14:29:02 +00:00
Polymeta
830d30e0de
fix pipeline build
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-02-03 14:24:05 +00:00
Hiroku
21e279224d
Merge branch 'fix/modern-item-conditions' into 'main'
...
Remove legacy NbtItemPredicate, replace with vanilla ItemCondition
See merge request cable-mc/cobblemon!1513
2025-02-03 03:25:45 +00:00
Polymeta
9b2d032c6a
Merge branch 'config-gui' into 'main'
...
Add config screen
Closes #112
See merge request cable-mc/cobblemon!1508
2025-02-02 18:56:18 +00:00
lion
be76f8a180
Add config screen
2025-02-02 18:56:18 +00:00
Ina
6b6d9d9ecf
All my homies hate fandom
2025-02-01 22:07:12 +00:00
Hiroku
2af0324ee5
Merge branch 'feat/ev-gained-event' into 'main'
...
Add EvGainedEvent
See merge request cable-mc/cobblemon!1514
2025-02-01 21:41:37 +00:00
Ina
8aa4f57a33
Add EvGainedEvent
2025-02-01 16:40:08 +00:00
Ina
5f01e1a5d8
Remove legacy NbtItemPredicate, replace with vanilla ItemCondition
2025-02-01 15:47:44 +00:00
Hiroku
3599dc97cc
Merge branch 'reload-cobblemon-config-command' into 'main'
...
Add '/cobblemonconfig reload' command
Closes #132
See merge request cable-mc/cobblemon!1391
2025-01-31 10:58:08 +00:00
lion
8a5d895f03
Add '/cobblemonconfig reload' command
2025-01-31 10:58:08 +00:00
Hiroku
36169db388
Merge branch 'feature/save-file-juggling' into 'main'
...
old and temp files for everyone
See merge request cable-mc/cobblemon!1484
2025-01-31 07:46:10 +00:00
Paul
1900999a74
Changelogging [skip-ci]
2025-01-31 17:41:56 +10:00
Hiroku
ab16814cd2
Merge branch 'fix-setpageondefaultdialoguepage' into 'main'
...
fix: calling setPages() when initializing the dialogue so default pages can have their timeout scheduled
Closes #1406
See merge request cable-mc/cobblemon!1504
2025-01-31 07:41:29 +00:00
Hiroku
9f622fcd74
Merge branch 'pc-box-2-fix' into 'main'
...
Fix PC opening on Box 2
See merge request cable-mc/cobblemon!1505
2025-01-31 07:40:16 +00:00
Hiroku
956e2c43b8
Merge branch 'feat-winners-and-losers' into 'main'
...
feat: set winners and losers on PokemonBattle end
See merge request cable-mc/cobblemon!1501
2025-01-31 07:37:14 +00:00
Hiroku
130f87c9f7
Merge branch 'strip-stripped-log' into 'main'
...
remove apricorn_stripped_log and apricorn_stripped_log_top as never used
See merge request cable-mc/cobblemon!1502
2025-01-31 07:27:54 +00:00
gbassinello
22b4e8c75f
chore: changelog lines
2025-01-31 01:44:50 -03:00
gbassinello
c19a3ca444
feat: set winners and losers on battle end
2025-01-31 01:44:50 -03:00
Polymeta
a006eb5dcc
revert previous attempt and fix camera mode
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-01-31 01:44:50 -03:00
gbassinello
ed419e7e53
fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid)
2025-01-31 01:44:50 -03:00
Paul
26ef75fba7
Teeny cleanup things
2025-01-31 14:06:36 +10:00
Hiroku
bff2387b4d
Merge branch 'feature/particle-fixes' into 'main'
...
revert previous attempt and fix camera mode
See merge request cable-mc/cobblemon!1506
2025-01-31 04:02:00 +00:00
Paul
dabc0ae859
Conflicto destructo
2025-01-31 14:01:22 +10:00
Paul
6184bd850e
Merge branch 'main' into shared-model-repository
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PokemonGuiUtils.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/widgets/NPCRenderWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/layer/PokemonOnShoulderRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
2025-01-31 11:43:47 +10:00
Polymeta
41544efeba
revert previous attempt and fix camera mode
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-01-30 23:15:08 +00:00
Paul
e6e6c9f7f6
Merge remote-tracking branch 'origin/main'
2025-01-31 08:31:31 +10:00
Paul
22d8e39db3
back to snapshots
2025-01-31 08:31:17 +10:00
Hiroku
bfdf1e9e6c
Merge branch 'fix-activedialoguesmapkey' into 'main'
...
fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid)
Closes #1405
See merge request cable-mc/cobblemon!1503
2025-01-30 22:19:22 +00:00
BuildTools
c3fccfde09
Fix PC opening on Box 2 because default value for 'box' in OpenPCPacket was '1' instead of '0'
2025-01-30 21:48:18 +02:00
gbassinello
4bb8d43a6e
fix: calling setPages() when initializing the dialogue so default pages can have their timeout scheduled
2025-01-30 13:50:18 -03:00
gbassinello
fda4b67776
fix: removing activeDialogues from the DialogueManager map using the correct key (player uuid)
2025-01-30 13:34:52 -03:00
Guilherme Pereira
77d91ed979
make last type gems growing from core not fully grow into blocks
2025-01-29 03:56:35 -03:00
Xander Forrest
f1ee9d45de
remove apricorn_stripped_log and apricorn_stripped_log_top as never used
2025-01-28 19:39:28 +00:00
Guilherme Pereira
9907ba17c1
update licenses
2025-01-27 06:28:51 -03:00
Guilherme Pereira
a6f0e19a44
type gem core now generates more gems
2025-01-27 06:27:27 -03:00
Guilherme Pereira
7ee064b04d
make type gem bud grow into a block in its final stage
2025-01-27 05:29:14 -03:00
Guilherme Pereira
f2e4c735f7
add type gems
2025-01-27 05:04:04 -03:00
Polymeta
01f7d13e3f
update tag and preset list [skip-ci]
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-01-26 21:32:32 +00:00
Paul
d85e30f3a6
But what if we didn't break the yarn mapping
2025-01-26 22:15:17 +10:00
Paul
e6f147bd94
Changelog [skip-ci]
1.6.1
2025-01-26 09:34:42 +10:00
Paul
c66de51e39
Snapnoshot
2025-01-26 08:53:26 +10:00