mirrors/cobblemon
1
0 Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-11-14 12:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,076 Commits 223 Branches 24 Tags
765a9e83ec81663e1d1a5ca16e440caafe65d22c
Commit Graph
11076 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
FrankTheFarmer 765a9e83ec Wailord model updated with locators 2025-06-04 18:57:45 +10:00
FrankTheFarmer ec8373ed04 Mudsdale model updated with locators 2025-06-04 18:53:59 +10:00
FrankTheFarmer 2a7c663071 Goldeen models updated with locators 2025-06-04 18:50:13 +10:00
FrankTheFarmer 1b78cae080 Merge branch 'main' into implement_pokemon 2025-06-04 12:46:57 +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
queao dda0c08fae Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2025-06-02 22:05:41 +10:00
queao d5e0364372 ow! that's sharp! (remodels for honedge line) 2025-06-02 22:05:00 +10: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
FrankTheFarmer fb36ba9720 Changelog where i log the changes i just made 2025-06-02 14:47:20 +10:00
FrankTheFarmer 87c2ce8f1a Floragato and Meowscarada swapped to json posers 2025-06-02 14:43:53 +10:00
FrankTheFarmer bb128fa7e1 Merged Floragato's battle cry with idle as a primary animation as a solution to its messed up battle cry 2025-06-02 14:43:27 +10:00
FrankTheFarmer dfcc6f2243 Uh oh spaghettio's portrait update 2025-06-02 14:42:40 +10:00
FrankTheFarmer 0b4d0d3e2e Tweaks to Quaxly poser. Mind your camel cases 2025-05-30 12:41:23 +10:00
FrankTheFarmer 561b5f25bb Merge branch 'main' into implement_pokemon 2025-05-30 12:33:50 +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
Carmendar a062b64588 Seel and Dewgong are now crying :( 2025-05-26 17:40:01 -05: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
GenotypeXD-Dev ee01ad20d9 Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon 2025-05-26 12:15:00 -06:00
GenotypeXD-Dev b0b5aa4169 Seel and Dewgong Remodel Texture fixes 2025-05-26 12:14:44 -06:00
Sterrezo 6b042cea47 Updated sounds.json and empty cries with the latest Pokémon 2025-05-26 12:03:15 +02:00