Paul
49c96e6fc8
Merge remote-tracking branch 'origin/main'
2025-09-21 10:46:21 +10:00
Paul
d56c9a3f5a
put da aprijuice recipes back
2025-09-21 10:42:53 +10:00
Landon
dbf248a508
Merge branch 'riding-behaviour-tweaks-03' into 'main'
...
ride tweaks extended cut
See merge request cable-mc/cobblemon!1865
2025-09-20 17:40:28 +00:00
Jackson Bowes
56d75b14fa
ride tweaks extended cut
2025-09-20 17:40:27 +00:00
Hiroku
1b525ca3a5
Merge branch 'the-curse-of-gradle-island' into 'main'
...
Stop using Architectury Runtime Transfomers implicitly
See merge request cable-mc/cobblemon!1867
2025-09-20 10:27:52 +00: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
Paul
afa5d22c8e
Re-enabled aprijuice and made creative menu aprijuice 10 in all flavours because w/e
2025-09-20 18:50:02 +10:00
Paul
18a8aa12d1
Release the held pokemon before sorting, closes #1663
2025-09-20 14:16:21 +10:00
Paul
308ca6369d
Fixed persistence issues for pokemon item pickup behaviours
2025-09-20 12:44:17 +10:00
Paul
79fd9f4e04
Fixed pokemon having the NPC dialogues memory
2025-09-20 12:28:06 +10:00
Paul
38219bbca2
Fixed pokemon in the party following and looking around while asleep, closes #1668
2025-09-20 12:27:48 +10:00
Paul
87de288777
Fixed crash when adding stationary Behaviour without a movement providing behaviour. Closes #1678
2025-09-20 11:25:04 +10:00
Paul
b6f1d6c62e
Fixed terralith:shrubland not counting as plains for pokemon spawning, closes #1685
2025-09-20 10:44:36 +10:00
Polymeta
43310d3a3b
tweak default stat ranges for some flying behaviours
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-09-19 10:29:34 +01:00
dhi_holo
b90384fe08
Grain Improvements
2025-09-18 17:10:08 +00:00
Landon
05796998e8
Merge branch 'riding-behaviour-tweaks-02' into 'main'
...
Behaviour tweaks
See merge request cable-mc/cobblemon!1862
2025-09-17 18:36:53 +00:00
Jackson Bowes
aaf1aad9a4
Behaviour tweaks
2025-09-17 18:36:53 +00:00
dhi_holo
5b95f0a1c7
Update mochis.json
...
Added missing and reorganised
2025-09-18 00:01:56 +10:00
dhi_holo
7641a839c2
Merge branch 'main' into sand-witches
2025-09-17 23:33:08 +10:00
dhi_holo
6ed6ca6937
IV Drip
...
Added new candy tags for IV Candies (additive, subtractive, general, and general candy that includes Exp Candies)
Added Vivichoke, Cobblemon Apples, and Beetroots to Sandwich Vegetable tag
Added advancement for using IV candy
2025-09-17 23:28:18 +10:00
Landon
be106a465e
Merge branch 'riding-debug-ui-tweaks-02' into 'main'
...
Ride settings editor
See merge request cable-mc/cobblemon!1858
2025-09-17 12:53:24 +00:00
Jackson Bowes
e7c0374c83
Ride settings editor
2025-09-17 12:53:24 +00:00
Polymeta
7fd1a443ac
Merge branch 'riding-fix-air-dismount' into 'main'
...
Fix in air dismount
See merge request cable-mc/cobblemon!1831
2025-09-17 06:22:21 +00:00
Jackson Bowes
31359077ed
Fix in air dismount
2025-09-17 06:22:20 +00:00
Jackson Bowes
012f15878e
Fix riding waterwalk
2025-09-17 06:21:36 +00:00
Polymeta
f406b9695d
Merge branch 'main' into 'main'
...
Skip battle check if the mobTargetInBattle game rule is set to false
See merge request cable-mc/cobblemon!1857
2025-09-16 08:17:01 +00:00
Polymeta
f6dbe40246
Merge branch 'implement_pokemon' into 'main'
...
lots o' implementing, animating and fixing.
See merge request cable-mc/cobblemon!1846
2025-09-16 08:15:52 +00:00
Polymeta
a1f6e47f42
Merge branch 'fix-cooking-pot-button-color' into 'main'
...
Fix Campfire Pot Lid Button Sprite
See merge request cable-mc/cobblemon!1859
2025-09-16 08:15:13 +00:00
Polymeta
04f5dbfca0
swap out textures
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-09-16 09:11:38 +01:00
martin
fd940b5549
Remove unnecessary check on resource
2025-09-15 16:12:36 +08:00
Hiroku
3e37c1af32
Merge branch 'animation-scale-shenanigan' into 'main'
...
Removed Animators/Engineer Frame Ghost Scale Jumpscare
See merge request cable-mc/cobblemon!1855
2025-09-15 01:15:16 +00:00
Hiroku
329a13867c
Merge branch 'implemented-patch' into 'main'
...
Fixes PokemonSpecies.implemented not containing pokémon marked implemented via species additions.
See merge request cable-mc/cobblemon!1835
2025-09-15 00:02:47 +00:00
Carmendar
5c6632c3fb
Forgor camera offsets for extra seats
2025-09-14 03:20:07 -05:00
Carmendar
ebde125895
Bronzong ready to scrape.
2025-09-14 03:18:17 -05:00
martin
c45c74c508
Fix double lid on campfire pot open sprites
2025-09-14 14:31:13 +08:00
martin
cd6bc23825
Rename CookingPotColor to CampfirePotColor
2025-09-14 06:16:57 +00:00
martin
3df95df1f9
Add color property in CampfirePotItem
...
To make it really easy to get it in the future
2025-09-14 06:16:57 +00:00
martin
ad3ee75c22
Sync cooking pot button color with open / closed state
2025-09-14 06:16:57 +00:00
martin
ce3935950a
Add cooking pot open sprites
2025-09-14 06:16:57 +00:00
Paul
e1380df7d1
Fixed herd counts exceeding the max, smooth the following timing so it's less robotic
2025-09-14 14:03:13 +10:00
Carmendar
cf8cfb8dad
Nickel no longer defies gravity when sleeping & corrected underwater behaviors on wiglett line.
2025-09-13 18:52:42 -05:00
Instrafe
3729728124
Implemented locators for Omanyte & Omastar
2025-09-13 17:16:41 -04:00
MemencioPerez
3092abfdd0
Inline mobTargetInBattle game rule check in TargetingConditions mixin
2025-09-12 15:07:30 -04:00
Carmendar
3150f33e9e
underwater walkers now walk underwater, and some swimmers now avoid land. (Crabrawler line avoids water entirely.)
2025-09-12 01:27:34 -05:00
Carmendar
40d7e7bccb
Merge branch 'main' into implement_pokemon
2025-09-12 01:27:10 -05:00
MemencioPerez
cdbe61843f
Skip battle check if the mobTargetInBattle game rule is set to false
2025-09-11 23:00:53 -04:00
Paul
b13c168347
Increased default PC box count from 30 to 40
2025-09-12 12:12:39 +10:00
Carmendar
f77fa82e4f
Implemented finalized Mochi sprites.
2025-09-11 19:02:26 -05:00
Konoha
2e2b10311d
Implement Unown ! and ? lang
2025-09-11 17:36:42 -04:00
Gertimoshka
2af5de8ce4
Fixed issue where Animation Transition has a frame non zero scale render on a part that is scale 0 for both animations
2025-09-12 00:02:56 +03:00