yanwah/cobblemon
1
0
Fork 0
forked from mirrors/cobblemon
Code Pull Requests Activity
13,970 Commits 261 Branches 19 Tags
f450d9d2d60ae129881839559622ff61b0637d83
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Polymeta f450d9d2d6 Merge branch 'fix-bucket-reuse' into '1.8.0' 
Fixed multi-spawns in a single pass using the same bucket for all of them

See merge request cable-mc/cobblemon!2104
 2026-01-22 13:21:39 +00:00
Polymeta 06ebf51078 Merge branch 'Wii-Break-It-Wii-Fix-It' into 'main' 
Boat Tags and Mint Leaves

Closes #1855

See merge request cable-mc/cobblemon!2082
 2025-12-13 22:14:32 +00:00
Polymeta 39c5bcd73c Merge branch 'even-more-seasonings' into 'main' 
Adding Missing Effects for Seasonings

See merge request cable-mc/cobblemon!1991
 2025-12-13 22:13:24 +00:00
Polymeta 28c0f8ab7d Merge branch 'item-interactions-sync' into 'main' 
Item interactions sync

See merge request cable-mc/cobblemon!2068
 2025-12-08 16:08:48 +00:00
Polymeta 83cefe476e Merge branch 'partner-mark' into 'main' 
Add Partner Mark

See merge request cable-mc/cobblemon!2034
 2025-12-08 15:57:21 +00:00
Polymeta 63846d53fb Merge branch 'main' into 'main' 
Fixed shiny Pokémon not respecting the silent flag on spawn.

See merge request cable-mc/cobblemon!2064
 2025-12-08 13:07:25 +00:00
Polymeta 1a0c9b6a82 Merge branch 'malformed-jsons-no-more' into 'main' 
Fixes a crash caused by malformed riding prespectives json file when trying to ride a pokemon

See merge request cable-mc/cobblemon!2077
 2025-12-08 12:59:22 +00:00
Polymeta 985eb103fe Merge branch 'sterr/ride-sound-changes' into 'main' 
New ride sound stuff

See merge request cable-mc/cobblemon!2065
 2025-12-08 11:44:22 +00:00
Polymeta aec76a78da Merge branch 'restore_adorn_texturing' into 'main' 
Restore adorn texturing

Closes #1833

See merge request cable-mc/cobblemon!2078
 2025-12-08 11:36:41 +00:00
Polymeta 9a8ad27122 Merge branch 'fix-spectator-crash' into 'main' 
fix spectator crash

Closes #1847

See merge request cable-mc/cobblemon!2076
 2025-12-07 08:39:18 +00:00
Polymeta 99942748b0 Merge branch 'entropydragon--spawn-bait-regional-forms' into 'main' 
fix: use regional form data for spawn bait influence

See merge request cable-mc/cobblemon!2074
 2025-12-07 00:49:48 +00:00
Polymeta c43b3bbb4d Merge branch 'fix-can-drop-held-item' into 'main' 
Fix can drop held item function

See merge request cable-mc/cobblemon!2069
 2025-12-03 08:17:38 +00:00
Polymeta f90c6967ce Merge branch 'FixHoneyedLeavesInteraction' into 'main' 
FixHoneyedLeavesInteraction

Closes #1832

See merge request cable-mc/cobblemon!2067
 2025-12-03 08:15:26 +00:00
Polymeta 54dc2e7f6f tidy up changelog [skip-ci] 2025-11-29 12:57:24 +00:00
Polymeta 1d60ba093f Merge branch 'convention-tags-not-being-consistent-grrrrrrrr' into 'main' 
Why

See merge request cable-mc/cobblemon!2060
 2025-11-29 11:53:50 +00:00
Polymeta c53c544a8b Merge branch 'implement_pokemon' into 'main' 
Last minute changes

See merge request cable-mc/cobblemon!2058
 2025-11-28 22:23:03 +00:00
Polymeta e59d755d32 Merge branch 'implement_pokemon' into 'main' 
Various implementation fixes

See merge request cable-mc/cobblemon!2050
 2025-11-28 15:38:40 +00:00
Polymeta ee4a3d46ba Merge branch '1.7.1-spawns' into 'main' 
Updated some spawns.

See merge request cable-mc/cobblemon!2052
 2025-11-28 09:31:16 +00:00
Polymeta e8a09f5c48 Merge branch 'json-fixing' into 'main' 
JSON Fixes

Closes #1819

See merge request cable-mc/cobblemon!2048
 2025-11-27 10:42:07 +00:00
Polymeta db2001b60a Merge branch 'attempted-jvm-fix' into 'main' 
Fixed JVM crash from campfire pot

Closes #1795

See merge request cable-mc/cobblemon!2040
 2025-11-26 21:40:30 +00:00
Polymeta 8c939ee276 Merge branch 'lets-wind-down' into 'main' 
Fixes wind charges recalling pastured pokémon

Closes #1805

See merge request cable-mc/cobblemon!2042
 2025-11-26 13:27:12 +00:00
Polymeta d96799cac7 Merge branch 'feature/neoforge-recipe-book' into 'main' 
split recipebooktype and category across fabric and neoforge so we can leverage neoforge APIs

Closes #1789 and #1787

See merge request cable-mc/cobblemon!2044
 2025-11-26 12:44:06 +00:00
Polymeta b822b626c4 split recipebooktype and category across fabric and neoforge so we can leverage neoforge APIs 2025-11-26 12:44:05 +00:00
Polymeta 22a44bd7e9 Merge branch 'ImprovedPastureBees' into 'main' 
Improved Pasture Combees and More

See merge request cable-mc/cobblemon!2043
 2025-11-26 09:36:28 +00:00
Polymeta d37bd4ef03 Merge branch 'OmnipathNavigationCrashFix' into 'main' 
OmnipathNavigationCrashFix

See merge request cable-mc/cobblemon!2045
 2025-11-26 09:34:03 +00:00
Polymeta 6467b97a23 Merge branch 'implement_pokemon' into 'main' 
marked furfrou as implemented

See merge request cable-mc/cobblemon!2041
 2025-11-25 12:16:02 +00:00
Polymeta e983d2c1db Merge branch 'implement_pokemon' into 'main' 
marked togedemaru as implemented

See merge request cable-mc/cobblemon!2029
 2025-11-21 20:16:07 +00:00
Polymeta 98159e1e0e Merge branch 'smeargle-tail-reset' into 'main' 
Fixed smeargle tail changing colour between relogs

See merge request cable-mc/cobblemon!2024
 2025-11-21 09:44:00 +00:00
Polymeta 64d6560caf Merge branch 'cobble-jail-here-i-come' into 'main' 
Small fixes

See merge request cable-mc/cobblemon!2018
 2025-11-20 22:10:32 +00:00
Polymeta 2e314e48fb Merge branch 'Car-fixes' into 'main' 
Car fixes

See merge request cable-mc/cobblemon!2016
 2025-11-20 21:19:50 +00:00
Polymeta 50bacbe25e Merge branch 'fix_medicinal_brew_from_cooking_pot_recipe' into 'main' 
Revert Medicinal Brew recipe back to water bottle as opposed to empty bottle.

See merge request cable-mc/cobblemon!2015
 2025-11-19 23:55:28 +00:00
Polymeta b0ecd24f42 Merge branch 'aprijuice-advancement-fix' into 'main' 
Fixed max ride boosts advancement not working properly

See merge request cable-mc/cobblemon!2014
 2025-11-19 14:10:10 +00:00
Polymeta ade5603331 Edit max_ride_stats.json 2025-11-19 13:25:03 +00:00
Polymeta a24be04d68 Merge branch 'ihatebugtypes1.7' into 'main' 
sacrificing Bugsy for the sake of the release

Closes #1771 and #1768

See merge request cable-mc/cobblemon!2000
 2025-11-19 07:32:27 +00:00
Polymeta fa4a4c7e51 Merge branch 'farming-simulator-2025' into 'main' 
Allow villagers to plant hearty rice

See merge request cable-mc/cobblemon!2008
 2025-11-19 00:25:29 +00:00
Polymeta c66c7170f6 Merge branch 'juice-tweaks' into 'main' 
Fixed apricorn stat changes only applying when points are already assigned to that stat, adjusted flavour floor

See merge request cable-mc/cobblemon!2004
 2025-11-18 10:00:03 +00:00
Polymeta 6206330b76 Merge branch 'getting-statistical' into 'main' 
Getting statistical and minor Advancement fixes

See merge request cable-mc/cobblemon!1760
 2025-11-17 09:30:28 +00:00
Polymeta 7b137fbe14 Merge branch 'Saccharine-Tree-Biome-List-Update' into 'main' 
Saccharine tree biome list update

See merge request cable-mc/cobblemon!1990
 2025-11-17 09:21:35 +00:00
Polymeta 0235bc108e Merge branch '1.7-spawns-update' into 'main' 
Fix to Cursola spawn. Updated Dreepy line spawns.

See merge request cable-mc/cobblemon!1980
 2025-11-15 10:45:18 +00:00
Polymeta 3cb4984d51 Merge branch 'shine-bright-like-an-evo-stone' into 'main' 
Update Lighting Values

See merge request cable-mc/cobblemon!1951
 2025-11-13 07:30:10 +00:00
Polymeta 038d9e858c Merge branch 'mechanics-sync' into 'main' 
Mechanics sync

See merge request cable-mc/cobblemon!1960
 2025-11-12 13:12:49 +00:00
Polymeta 8f971cc3d6 Merge branch '1.7-spawns-update' into 'main' 
Updated all spawn files. Changed dead_coral preset into a block tag.

See merge request cable-mc/cobblemon!1962
 2025-11-12 11:38:03 +00:00
Polymeta 5f11f4bdd6 Merge branch 'Saccharine-Tree-Biome-List-Update' into 'main' 
Updated biome list for saccharine tree

See merge request cable-mc/cobblemon!1959
 2025-11-12 09:55:01 +00:00
Polymeta 13b4bdc204 Merge branch 'SaccHiveGenerationRebalance' into 'main' 
SaccHiveGenerationRebalance

See merge request cable-mc/cobblemon!1961
 2025-11-12 09:54:49 +00:00
Polymeta 202bee5690 Merge branch 'do-you-get-the-joke' into 'main' 
🍆

See merge request cable-mc/cobblemon!1777
 2025-11-11 17:03:40 +00:00
Polymeta f6cae9d52e Edit eggantberry.js 2025-11-11 15:08:04 +00:00
Polymeta ed94d76e98 Merge branch '1.7-spawns' into 'main' 
Added and updated spawns and tags. Edited berry data scraper.

See merge request cable-mc/cobblemon!1937
 2025-11-11 15:04:46 +00:00
Polymeta 6e2b76d6a1 Merge branch 'its-not-bait' into 'main' 
Bait Seasoning Correction

See merge request cable-mc/cobblemon!1955
 2025-11-11 15:03:28 +00:00
Polymeta 9e1fde04ef Merge branch 'mopping-up-tags' into 'main' 
Tags and Seasonings Improvement

Closes #1765 and #1764

See merge request cable-mc/cobblemon!1949
 2025-11-10 09:30:10 +00:00
Polymeta 6b43bf9f48 Merge branch 'main' into '1.7-spawns' 
# Conflicts:
#   common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json
#   common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_mirage_island.json
#   utilityscripts/cobblemon_spawn_csv_to_json.py
 2025-11-07 11:13:38 +00:00
Polymeta ae4decacc7 Merge branch 'bottle-o-knowledge' into 'main' 
Added Unlock Condition

See merge request cable-mc/cobblemon!1936
 2025-11-07 07:01:59 +00:00
Polymeta 21c1f912a7 Merge branch 'typo' into 'main' 
Update crops.json

See merge request cable-mc/cobblemon!1924
 2025-11-01 10:16:37 +00:00
Polymeta 02a1929ede Merge branch 'fix-pick-block' into 'main' 
Fix picking blocks while riding mounts

Closes #1698

See merge request cable-mc/cobblemon!1922
 2025-10-31 12:00:14 +00:00
Polymeta 4a30bb3b04 Merge branch 'seasoning-filters' into 'main' 
Cooking Pot Recipes now have filtered

See merge request cable-mc/cobblemon!1919
 2025-10-29 07:45:59 +00:00
Polymeta fac8c5f510 Merge branch 'party-overlay-config-fix' into 'main' 
Party overlay config fix

See merge request cable-mc/cobblemon!1921
 2025-10-28 14:41:22 +00:00
Polymeta 6df2b996e2 Merge branch 'smarter-scalable-brains' into 'main' 
New tools for brain activity management

See merge request cable-mc/cobblemon!1916
 2025-10-25 19:39:15 +00:00
Polymeta ddc4bd358d Merge branch 'niche-tags' into 'main' 
Berry Tag Updates

See merge request cable-mc/cobblemon!1918
 2025-10-25 19:34:59 +00:00
Polymeta fc135faf57 revert pokemon number range 2025-10-21 22:48:59 +00: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
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
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
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
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
Polymeta dd35adc05d Merge branch 'help-i-cannot-get-down' into 'main' 
Fixed neoforge hover mounts not being able to descend

Closes #1717

See merge request cable-mc/cobblemon!1900
 2025-10-13 10:58:40 +00:00
Polymeta 156983bf58 [skip-ci] changelog 2025-10-10 09:28:59 +00:00
Polymeta c69930b836 Merge branch 'SaferPokeballBreakFree' into 'main' 
Avoid suffocation when a pokeball breaks near a wall

See merge request cable-mc/cobblemon!1898
 2025-10-10 09:27:56 +00:00
Polymeta fddb203db3 Merge branch 'fix-aprijuice-crash' into 'main' 
Aprijuice feeding crash

Closes #1712

See merge request cable-mc/cobblemon!1887
 2025-10-03 16:14:39 +00:00
Polymeta 5f5b4ee3c1 Merge branch 'implement_pokemon' into 'main' 
Implement pokemon

See merge request cable-mc/cobblemon!1890
 2025-10-03 08:19:57 +00:00
Polymeta 27a9f3c704 Merge branch 'ride-settings-network-fixes-electric-boogaloo' into 'main' 
Make RideSettingsSyncHandler be correctly sided

See merge request cable-mc/cobblemon!1889
 2025-10-02 20:47:01 +00:00
Polymeta 4791b146dc Merge branch 'hotfix-BufferUtils-NPE' into 'main' 
Fix a logic error in write-/readNullable resulting in NPE on server joins.

See merge request cable-mc/cobblemon!1886
 2025-10-02 13:43:18 +00:00
Polymeta 9a35a11440 Merge branch 'the-case-of-disappearing-cubes' into 'main' 
The Case of Disappearing Cubes

See merge request cable-mc/cobblemon!1883
 2025-10-02 10:46:15 +00:00
Polymeta 6d4a50cee2 Merge branch 'cooking-pot-hopper-bugfix' into 'main' 
Fixed bug with seasonings and hoppers in the campfire cooking pot

See merge request cable-mc/cobblemon!1885
 2025-10-02 08:16:43 +00:00
Polymeta 4c96ab9b28 Merge branch 'Carm-Signfix' into 'main' 
Added missing Saccharine sign loot table.

See merge request cable-mc/cobblemon!1884
 2025-10-01 17:12:08 +00:00
Polymeta 2fbb1f354c Merge branch '#1568-npcdelete' into 'main' 
changes to /npcdelete uuid prameter and console support

Closes #1568

See merge request cable-mc/cobblemon!1851
 2025-09-29 13:13:46 +00:00
Polymeta fa2b6b5996 Merge branch 'regional-food-use-fix' into 'main' 
Small fixes

Closes #1708, #1689, #1696, #1710, and #1711

See merge request cable-mc/cobblemon!1877
 2025-09-29 08:13:44 +00:00
Polymeta 7088ce3828 Merge branch 'fix-scanner-sensitivity' into 'main' 
Fix the scanner sensitivity I broke a few hours ago.

See merge request cable-mc/cobblemon!1876
 2025-09-25 06:08:39 +00:00
Polymeta 8ad443a4c5 Merge branch 'riding-behaviour-tweaks-four' into 'main' 
Quick riding tweaks

See merge request cable-mc/cobblemon!1873
 2025-09-24 21:31:07 +00:00
Polymeta 7587344cb4 Merge branch 'NavigationAndWanderTargetImprovements' into 'main' 
NavigationAndWanderTargetImprovements

Closes #1693

See merge request cable-mc/cobblemon!1872
 2025-09-24 21:24:48 +00:00
Polymeta f0926d7524 Merge branch 'scan-ride-crash' into 'main' 
Fix crash when you zoom in using a pokedex and begin rolling

See merge request cable-mc/cobblemon!1874
 2025-09-24 21:16:53 +00:00
Polymeta 263e3cd79f Merge branch 'caring-farmer' into 'main' 
Tag Support for Interactions

See merge request cable-mc/cobblemon!1871
 2025-09-23 06:37:15 +00:00
Polymeta a588cfadf8 Merge branch 'riding-scrape' into 'main' 
Riding scrape

See merge request cable-mc/cobblemon!1869
 2025-09-22 09:29:38 +00:00
Polymeta aa206d386a Merge branch 'stop-the-disco-spin' into 'main' 
Fixed Pokémon spinning a bunch when re-calculating a path to a moving target, closes #1703

Closes #1703

See merge request cable-mc/cobblemon!1868
 2025-09-21 10:11:11 +00:00
Polymeta 29c65c18ff Merge branch 'what-a-grain' into 'main' 
Grain Improvements

Closes #1702

See merge request cable-mc/cobblemon!1863
 2025-09-18 17:10:08 +00:00
Polymeta b315fdcadc Merge branch 'sand-witches' into 'main' 
Small Data Changes

See merge request cable-mc/cobblemon!1861
 2025-09-17 18:23:42 +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
Polymeta 7f683bd618 Merge branch 'riding-fix-waterwalk' into 'main' 
Fix riding waterwalk

See merge request cable-mc/cobblemon!1838
 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
PolymetaandGitLab 75e0da38c4 Merge branch 'pot-jei-catalysts' into 'main' 
Added JEI recipe catalysts for campfire pots

See merge request cable-mc/cobblemon!1848
 2025-09-09 08:06:53 +00:00
PolymetaandGitLab e2ccb20402 Merge branch 'hydrophobic-gates' into 'main' 
Removed Hydrophobia from cobblemon gates + consistency changes

See merge request cable-mc/cobblemon!1847
 2025-09-08 21:30:49 +00:00
PolymetaandGitLab 56ad481304 Merge branch 'implement_pokemon' into 'main' 
Implement pokemon

See merge request cable-mc/cobblemon!1842
 2025-09-07 09:04:19 +00:00
PolymetaandGitLab cc7a9ae44a Merge branch 'Move-Particles-1.7' into 'main' 
YOU GET PARTICLES, YOU GET PARTICLES, AND YOU GET PARTICLES. SO MANY MOVES WITH PARTICLES.

See merge request cable-mc/cobblemon!1839
 2025-09-07 09:02:16 +00:00
Polymeta 054c841ec7 Merge branch 'implement_pokemon' into 'main' 
mergin' imp to main

See merge request cable-mc/cobblemon!1830
 2025-09-04 08:25:24 +00:00
Polymeta b3590eb49b Merge branch 'Mo-Functions-MOLANG' into 'main' 
Battle Themes Fixed and A BUNCH of MoLang.

Closes #1468

See merge request cable-mc/cobblemon!1797
 2025-09-03 08:31:43 +00:00
Polymeta eaca59a420 Merge branch 'cooking-fixes-never-stop' into 'main' 
Another Serving of Cooking Pot Fixes

See merge request cable-mc/cobblemon!1820
 2025-09-02 14:47:59 +00:00
Polymeta 1084f40282 Merge branch 'snack' into 'main' 
♨️

See merge request cable-mc/cobblemon!1815
 2025-09-02 08:34:49 +00:00
Polymeta e82609176f Merge branch 'client-on-server-bug' into 'main' 
Fix bug with LivingEntityMixin$pick() on server with riding.

See merge request cable-mc/cobblemon!1816
 2025-09-02 08:30:20 +00:00
Polymeta e4dbba026c Merge branch 'josh/model-widget-fixes' into 'main' 
Model Widget Item Fixes

See merge request cable-mc/cobblemon!1812
 2025-08-29 20:56:26 +00:00
Polymeta 63eb0a1d9c Merge branch 'hoppers-like-vanilla' into 'main' 
Revert Brewing Stand-Hopper interaction to Vanilla behavior

Closes #1658

See merge request cable-mc/cobblemon!1810
 2025-08-28 21:29:55 +00:00