Gertimoshka
27263cd057
JEI is now filtering seasoning slots additionally based berries
2025-10-25 12:22:08 +03:00
Gertimoshka
55f0962205
Recipes will now not consume seasoning items that are not in seasoning filter of recipe and slots will highlight red if seasoning item does not apply to current recipe
2025-10-25 12:02:22 +03:00
dhi_holo
e753c75c31
Merge branch 'seasoning-filters' of https://gitlab.com/cable-mc/cobblemon into seasoning-filters
2025-10-25 15:52:35 +10:00
dhi_holo
4e96222a4d
Tags
...
Renamed a tag and fixed errors it caused, as well as adding the current 6 Filter tags requested for system upgrades
2025-10-25 15:52:09 +10:00
Paul
4ee90d4cfb
Removed unneeded comment
2025-10-25 15:22:29 +10:00
Paul
540cd612c1
Added seasoning tag filter to cooking pot recipes
2025-10-25 14:22:47 +10:00
Hiroku
1b1d22fdf3
Merge branch 'social-distancing' into 'main'
...
Adds random offset to follow herd leader task
See merge request cable-mc/cobblemon!1917
2025-10-25 01:49:48 +00:00
lion
1ee1001774
Adds random offset to follow herd leader task
2025-10-25 01:49:48 +00:00
Landon
91300e4d03
Merge branch '1.7-spawns' into 'main'
...
Some JSON tweaks
See merge request cable-mc/cobblemon!1913
2025-10-21 23:38:34 +00:00
Polymeta
fc135faf57
revert pokemon number range
2025-10-21 22:48:59 +00:00
Polymeta
cdd72c664e
fix some typos
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-10-21 23:23:43 +01:00
Polymeta
5f025d0f68
Merge branch 'moomoo-milk' into 'main'
...
Adds clear stat changes effect to Moomoo Milk
See merge request cable-mc/cobblemon!1911
2025-10-21 21:50:59 +00:00
lion
6af2c807ab
Adds clear stat changes effect to Moomoo Milk
2025-10-21 21:50:58 +00:00
Polymeta
c45c90c6c7
Merge branch 'main' into 1.7-spawns
...
# Conflicts:
# common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0028_sandslash.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0688_binacle.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0689_barbaracle.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0751_dewpider.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0752_araquanid.json
# common/src/main/resources/data/cobblemon/spawn_pool_world/0845_cramorant.json
# common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_overworld.json
# utilityscripts/cobblemon_spawn_csv_to_json.py
2025-10-21 22:38:33 +01:00
Polymeta
1ec97c4c90
Merge branch 'riding-style-molang' into 'main'
...
Add molang function to get the current riding style of a pokemon
See merge request cable-mc/cobblemon!1912
2025-10-21 06:42:54 +00:00
Landon Wills
f0bcd38ac7
Add molang function to get the current riding style of a pokemon
2025-10-21 01:55:19 -04:00
Test
f4ba446c79
Merge branch 'restoration-tank-fixes' into 'main'
...
Small fixes
Closes #1735 and #1741
See merge request cable-mc/cobblemon!1908
2025-10-21 03:49:09 +00:00
Guilherme Pereira
60f98ebfce
refactor poke snack
2025-10-21 00:04:20 -03:00
Guilherme Pereira
36a93bda5a
refactor poke snack
2025-10-20 03:10:09 -03:00
Paul
8d60b07c54
Merge remote-tracking branch 'origin/main'
2025-10-20 14:45:26 +10:00
Paul
5f9cc86044
Added rouseChance and drowsyChance to RestBehaviour so pokemon don't insta sleep in the wild and may spontaneously wake up
2025-10-20 14:45:06 +10:00
Landon
a6b7e07cf5
Merge branch 'held-item-fix' into 'main'
...
Remove pvp check for held item logic
See merge request cable-mc/cobblemon!1907
2025-10-20 03:18:36 +00:00
Landon Wills
0ba6215b8d
Elaborate on comment
2025-10-19 23:05:16 -04:00
Guilherme Pereira
e2f6fae689
change willDefendSelf combat behaviour default to false
2025-10-19 23:36:52 -03:00
Guilherme Pereira
296aa01d0f
remove println
2025-10-19 18:41:38 -03:00
Guilherme Pereira
12ab3f2d07
fix dolphin crash on servers
2025-10-19 18:18:31 -03:00
Guilherme Pereira
5a7a374bc9
Merge branch 'main' of gitlab.com:cable-mc/cobblemon into restoration-tank-fixes
2025-10-19 17:35:50 -03:00
Guilherme Pereira
ceece45ad4
make poke snack spawn 4 mons per bite
2025-10-19 17:24:01 -03:00
Landon Wills
b344ad66c5
Remove pvp check
2025-10-19 14:44:08 -04:00
Polymeta
04f2af22f3
Merge branch 'hide-server-configs' into 'main'
...
Hide server configs when playing on a server
See merge request cable-mc/cobblemon!1905
2025-10-18 10:06:06 +00:00
lion
ea916a0db8
Hide server configs when playing on a server
2025-10-18 10:06:06 +00:00
Guilherme Pereira
3f03afc7eb
smooth campfire pot spinning animation
2025-10-18 06:53:20 -03:00
Paul
e940483863
Typos corrected
2025-10-18 18:46:37 +10:00
Hiroku
9e3d3df3a9
Merge branch 'patch-1' into 'main'
...
Added Resource Texture Behaviour.
See merge request cable-mc/cobblemon!1894
2025-10-18 08:42:39 +00:00
Jolihan
c18368d777
fixed?
2025-10-18 08:40:24 +00:00
Hiroku
aab5b55204
Merge branch 'Bee-Polite-Bee-Efficient' into 'main'
...
Pokemon bee behavior rework
See merge request cable-mc/cobblemon!1892
2025-10-17 10:24:14 +00:00
Paul
3e6e346eb9
Nectar aspect shouldn't be mixed case, Jazz!!
2025-10-17 19:39:41 +10:00
Hiroku
7bef6db7b7
Merge branch 'riding-scraper-changes' into 'main'
...
Add lighting data to riding scraper
See merge request cable-mc/cobblemon!1904
2025-10-17 05:29:07 +00:00
lion
71775328ef
Add lighting data to riding scraper
2025-10-17 05:29:07 +00:00
Landon
727785b0b3
Merge branch 'boat-stamina' into 'main'
...
Adjust stamina logic
See merge request cable-mc/cobblemon!1903
2025-10-16 03:45:39 +00:00
Landon Wills
762241420e
Adjust stamina logic
2025-10-15 19:48:10 -04:00
Guilherme Pereira
93011f084b
make riding fov effects proportional to minecraft fov effect scale setting
2025-10-15 19:23:51 -03:00
Guilherme Pereira
7c90a8425e
fix restoration tank concurrent modification crash #1735
2025-10-15 15:01:41 -03:00
Jolihan
8674cbe788
Update 2 files
...
- /resource_texture.json
- /common/src/main/resources/data/cobblemon/behaviours/npc/resource_identifier.json
2025-10-15 07:06:20 +00:00
Jolihan
8075fe0bae
Update 2 files
...
- /common/src/main/resources/assets/cobblemon/lang/en_us.json
- /resource_texture.json
2025-10-15 07:03:10 +00:00
Polymeta
0152803192
Merge branch 'fix-hide-tooltips' into 'main'
...
Pulled up the Hide Tooltip check to instead run before any custom tooltip generators are performed.
Closes #1733
See merge request cable-mc/cobblemon!1902
2025-10-15 06:14:22 +00:00
Charzard4261
5e094241e3
Pulled up the Hide Tooltip check to instead run before any custom tooltip generators are performed.
2025-10-14 23:33:08 +01:00
Paul
bd028c328d
Fixed NPC class variables not being applied to NPCs
2025-10-14 22:43:06 +10:00
Polymeta
598cb1d964
Merge branch 'dead-bushes-bad-omen' into 'main'
...
Adds bad omen effect to dead bushes
See merge request cable-mc/cobblemon!1901
2025-10-14 08:30:41 +00:00
JazzMcNade
79d264fd94
Merge branch 'main' into Bee-Polite-Bee-Efficient
2025-10-14 00:34:09 -05:00