dhi_holo
8188ce0ed2
The Beningging
...
Refactoring some stuff to simplify down
2025-06-04 18:22:28 +10:00
Polymeta
ac55636c51
small recipe fix for loaded dice
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-06-03 23:31:49 +01:00
Polymeta
18eb50d4d2
Merge branch 'data-driven-brewing' into 'main'
...
Wrapped the Brewing Stand to allow Data Driven Recipes
See merge request cable-mc/cobblemon!1667
2025-06-03 13:22:44 +00:00
Aram
87276de14d
Update CHANGELOG.md
2025-06-03 14:42:22 +02:00
Aram
b7dc9ea6f6
Removed Unneccerry files
2025-06-03 14:30:34 +02:00
Aram
ff59604526
Merge branch 'main' into data-driven-brewing
2025-06-03 14:27:40 +02:00
Polymeta
b620ad27b6
rename OmniPathingEntity#isOnGround > entityOnGround to get around yarn mapping conflict
...
Fixes #1590
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-06-03 11:32:28 +01:00
Polymeta
5565f22610
Merge branch 'hyper_trained_ivs' into 'main'
...
Hyper Training Event and MoLang Functions
See merge request cable-mc/cobblemon!1689
2025-06-03 06:22:07 +00:00
Konoha D
7582b08d56
Hyper Training Event and MoLang Functions
2025-06-03 06:22:07 +00:00
Polymeta
2e101f023f
Merge branch 'cleanup' into 'main'
...
Crash Fix
See merge request cable-mc/cobblemon!1697
2025-06-03 06:19:26 +00:00
dhi_holo
d98cccfc0f
Edit evolution_items.json
2025-06-03 16:12:46 +10:00
dhi_holo
f83bde399c
no crash
...
Removed some duplicates
2025-06-03 14:20:32 +10:00
Polymeta
e3c95aa4a5
Merge branch 'cooking-redstone' into 'main'
...
A ton of Redstone Compatibility inside the Cooking System
See merge request cable-mc/cobblemon!1640
2025-06-02 13:57:10 +00:00
Aram
72740fb418
A ton of Redstone Compatibility inside the Cooking System
2025-06-02 13:57:10 +00:00
Paul
250f9e3cec
Cleanup
2025-06-02 20:15:03 +10:00
Paul
26078ec29d
Merge remote-tracking branch 'origin/main'
2025-06-02 20:09:11 +10:00
Paul
5b68889689
Fixed non-walking fliers not being able to wander
2025-06-02 20:09:00 +10:00
Paul
bb3e86ac02
Fixed wander not being added to flying non-walkers
2025-06-02 20:08:21 +10:00
Polymeta
b96a6282d8
Merge branch 'implement_pokemon' into 'main'
...
Fruity Implementation Merge to Main
See merge request cable-mc/cobblemon!1691
2025-06-02 08:18:00 +00:00
Frank The Farmer
14ee3cd754
Fruity Implementation Merge to Main
2025-06-02 08:17:59 +00:00
Paul
9c66c65b9e
Merge remote-tracking branch 'origin/main'
2025-06-02 16:06:13 +10:00
Paul
9ffbd14a81
The wiki says it's called "artificial"
2025-06-02 16:06:03 +10:00
Polymeta
4f5799e5df
yet another seasoning codec tweak
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-05-30 00:39:13 +01:00
Polymeta
54ea4903ba
Merge branch 'cooking-tooltip-overhaul' into 'main'
...
Cooking tooltip overhaul
See merge request cable-mc/cobblemon!1687
2025-05-29 22:07:13 +00:00
Plastered_Crab
28ad0cce83
Cooking tooltip overhaul
2025-05-29 22:07:13 +00:00
Polymeta
7fe1929609
Merge branch 'hyper_trained_ivs' into 'main'
...
Hyper Trained Stat IVs
See merge request cable-mc/cobblemon!1614
2025-05-29 15:53:12 +00:00
Konoha D
e03082a75e
Hyper Trained Stat IVs
2025-05-29 15:53:11 +00:00
Polymeta
8d0c27f0e4
[skip-ci] changelog
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-05-29 16:47:14 +01:00
Polymeta
91fc2dc896
Merge branch 'spawn-rules-npc-gisketch' into 'main'
...
Make Spawn Rules affect NPC spawns
See merge request cable-mc/cobblemon!1682
2025-05-29 15:43:12 +00:00
Ghegi Jimenez
ab1ca295a3
Make Spawn Rules affect NPC spawns
...
- Update NPCSpawnDetail to have autoLabel() function similar to
PokemonSpawnDetail to support spawn rules
Ref: https://gitlab.com/cable-mc/cobblemon/-/issues/1559
2025-05-29 09:36:37 +08:00
Polymeta
5cbe937e23
Merge branch 'tatami' into 'main'
...
Tatami Mats
See merge request cable-mc/cobblemon!1684
2025-05-28 09:27:00 +00:00
dhi_holo
4fa196da94
Tatami Mats
2025-05-28 09:27:00 +00:00
Polymeta
43aa0ec04a
oop this is not needed anymore
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-05-27 00:54:28 +01:00
Polymeta
b4bf044f76
small refactors in mixins and JEI integration
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-05-27 00:49:26 +01:00
Polymeta
d35db46c1b
Merge branch 'Add-pc-take-and-search-commands' into 'main'
...
Add PC Search and PC Take Commands
See merge request cable-mc/cobblemon!1677
2025-05-26 21:25:15 +00:00
Polymeta
b8a6c94fcb
Merge branch 'boat-behaviour' into 'main'
...
Add boat water behaviour
See merge request cable-mc/cobblemon!1638
2025-05-25 00:26:09 +00:00
Ghegi Jimenez
b069e448c1
Add PC Search and PC Take Commands
...
- Add pcsearch command to search through target's PC and display pokemon info with box slots
- Add pctake command to take pokemon from target's box slot
- Pokemon are removed when using pctake on self or as server
2025-05-25 08:07:17 +08:00
Polymeta
18f41407c8
fix merge conflicts
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-05-25 00:46:35 +01:00
Polymeta
b659a662a2
Merge branch 'refs/heads/main' into boat-behaviour
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
2025-05-25 00:23:15 +01:00
Polymeta
dbb2e45e14
Merge branch 'spicy-molang' into 'main'
...
Added `play_sound_on_server` and `run_molang_after` as available MoLang functions
See merge request cable-mc/cobblemon!1615
2025-05-24 23:20:14 +00:00
Spicy
da491015a6
Added play_sound_on_server and run_molang_after as available MoLang functions
2025-05-24 23:20:14 +00:00
Polymeta
55db0d8af1
Merge branch 'battle-side-start-lang-position' into 'main'
...
Update battle sidestart langkeys formatting
See merge request cable-mc/cobblemon!1678
2025-05-24 23:11:38 +00:00
Ghegi Jimenez
211821bc0f
Update battle sidestart langkeys formatting
...
This commit updates the SideStartInstruction.kt and
SideEndInstruction.kt files to use
position-specific language keys for battle side effects,
improving grammatical consistency.
**The changes**:
1. Modified SideStartInstruction.kt to use separate
language keys for ally and opponent sides
2. Updated en_us.json with new position-specific language keys
for all side effects
3. Added changelog entry documenting the improvement
This approach eliminates grammatical issues that occurred with the
previous implementation where "%1$s" was used in different positions
in sentences, making translations awkward.
The new format uses "sidestart.ally.[effect]" and
"sidestart.opponent.[effect]" keys, allowing for more natural language
in all cases.
Ref: https://gitlab.com/cable-mc/cobblemon/-/issues/984
2025-05-25 06:58:36 +08:00
Polymeta
16a21f9d2e
Merge branch 'remedying-remedies' into 'main'
...
Remedy Rebalance
Closes #1570
See merge request cable-mc/cobblemon!1680
2025-05-24 07:46:50 +00:00
Polymeta
e69060bde6
Merge branch 'fossilized-improvement' into 'main'
...
Fossilized Improvement (with major tangents)
Closes #1548
See merge request cable-mc/cobblemon!1673
2025-05-24 07:45:15 +00:00
dhi_holo
ebdbbd5176
Indentation fixed
...
Looks identical to me in IntelliJ, but it's apparently different
2025-05-24 15:28:46 +10:00
dhi_holo
6e163d08f0
Merge branch 'main' into fossilized-improvement
2025-05-24 15:19:30 +10:00
dhi_holo
13c7b75b19
finished
...
That's the whole thing done!
2025-05-24 11:03:43 +10:00
Polymeta
1ad36e39c5
change the remedies.json layout to accommodate for individual friendshipDrops
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-05-23 23:43:58 +01:00
Polymeta
f4d67b9b64
some rootblock fixes (energy root is shearable now) and energy roots run through same spreading RNG as big roots
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-05-23 22:40:16 +01:00