mirrors/cobblemon
1
0
Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-20 14:16:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
16,756 Commits 222 Branches 22 Tags
main
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Apion 3fbcfe842d Merge branch '1.8-structure-fixes' into 'main' 
Remoeved the old habitat test structure, added tags for habitats and the new...

See merge request cable-mc/cobblemon!2234
 2026-04-28 21:57:10 +00:00
Apion 7c3158c63b Merge branch 'particle-sounds-1.7' into 'main' 
Refactored move sound file names, added all new move sounds

See merge request cable-mc/cobblemon!1965
 2025-11-13 00:35:43 +00:00
Apion 8510e05177 Remove redundant local field in MountedCameraRenderer.kt 2025-11-12 16:13:56 -05:00
Apion 8b2ffd0f29 Merge branch 'apion-bugfix' into 'main' 
Fix bug with camera mixin on NeoForge

See merge request cable-mc/cobblemon!1956
 2025-11-12 19:57:34 +00:00
Apion 18cebc794b Clean up variable names in CameraMixin 2025-11-12 14:11:14 -05:00
Apion 64e84dab64 Merge remote-tracking branch 'origin/main' into apion-bugfix 
# Conflicts:
#	common/src/main/java/com/cobblemon/mod/common/mixin/client/CameraMixin.java
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/camera/MountedCameraRenderer.kt
 2025-11-12 13:21:18 -05:00
Apion 929e4b2391 Licenses 2025-11-08 15:43:50 -05:00
Apion c593a8b7e6 Fixed CameraMixin on neoforge 2025-11-08 15:00:22 -05:00
Apion d0fc166e09 Fix SoundEngineMixin on neoforge 2025-11-08 14:44:33 -05:00
Apion b4c971398d Fix BrewingStandMenuMixin on neoforge 2025-11-08 14:01:02 -05:00
Apion 52fc6b2575 Merge branch 'Lure-Cake-Crash-Fix' into 'main' 
Lure cake crash fix

See merge request cable-mc/cobblemon!1662
 2025-05-14 00:42:12 +00:00
Apion 01c44537d0 Fix naked Gastly 2025-05-10 22:56:16 -04:00
Apion 2d4800a733 Fix issue where locator X axis was not aligned with blockbench. 2025-05-10 21:50:52 -04:00
Apion 33fc67ed58 Merge branch 'npc-gibberspeak' into 'main' 
NPC gibberish

See merge request cable-mc/cobblemon!1616
 2025-04-26 21:22:22 +00:00
Apion b9f2bcc3a3 Fix missing import causing compile error 2025-04-26 17:10:59 -04:00
Apion 8a5a88b4f1 Merge branch 'particle-reorg' into 'main' 
𝕿𝖍𝖊 𝕲𝖗𝖊𝖆𝖙 𝕻𝖆𝖗𝖙𝖎𝖈𝖑𝖊 𝕽𝖊𝖔𝖗𝖌 𝖔𝖋 2025

See merge request cable-mc/cobblemon!1627
 2025-04-26 21:01:01 +00:00
Apion af6b1190c1 Merge branch 'main' into npc-gibberspeak 
# Conflicts:
#	common/src/main/resources/cobblemon-common.accesswidener
#	common/src/main/resources/mixins.cobblemon-common.json
 2025-04-26 16:37:58 -04:00
Apion 7f0a6d4d48 Merge branch 'no-rolling' into 'main' 
Option to disable rolling is now functional. I would not use this on anything...

See merge request cable-mc/cobblemon!1592
 2025-04-26 20:22:15 +00:00
Apion d7e4298a91 Fix compile error from flashback MR 2025-04-26 15:42:44 -04:00
Apion ae4af68797 Fix compile errors 2025-04-25 21:55:26 -04:00
Apion 84a0ceb7e1 Remove flashback dep (again) 2025-04-21 17:45:05 -04:00
Apion ccde7ffbb1 Merge branch 'main' into flashback-compat 2025-04-21 17:41:35 -04:00
Apion aacbcb1f28 Merge branch 'jackowes/concrete_bird' into 'main' 
Overhaul of bird and fix of jet velocity bug

See merge request cable-mc/cobblemon!1563
 2025-03-23 23:37:47 +00:00
Apion 4212903c67 Merge branch 'fix-tm-automation' into '1.21.1-TMs' 
General Fixes and Implementation of the TM Machine for 1.21.1

See merge request cable-mc/cobblemon!1542
 2025-03-01 08:52:01 +00:00
Apion 0fb5d4f69b Merge branch 'riding-sheet-scraper' into 'main' 
Added scraper for riding sheet

See merge request cable-mc/cobblemon!1546
 2025-03-01 08:34:14 +00:00
Apion 9556c57c69 Fix broken accesswideners 2025-02-23 21:33:54 -08:00
Apion 9246523853 Merge branch 'particle-stuff' into 'main' 
A bunch of particle changes

See merge request cable-mc/cobblemon!1295
 2024-12-28 03:03:56 +00:00
Apion db2c2f0089 A bunch of particle changes 2024-12-28 03:03:56 +00:00
ApionandPolymeta be2a0be806 Fixes #1182 2024-12-15 18:25:02 +00:00
Apion f07707221f Merge branch 'implement_pokemon' into 'main' 
Pokémon fixes and tweaks

Closes #1230 and #1137

See merge request cable-mc/cobblemon!1371
 2024-12-14 23:57:34 +00:00
Apion 093e0f2811 Merge branch 'more-dfu-sad' into 'main' 
Fixes for JSON Pokemon store

See merge request cable-mc/cobblemon!1285
 2024-11-13 16:07:10 +00:00
Apion 1a782e4185 Fixes for JSON Pokemon store 2024-11-13 16:07:10 +00:00
Apion 2e054dd5e1 Merge branch 'lang-updates' into 'main' 
Weblate translations

See merge request cable-mc/cobblemon!1286
 2024-11-13 16:07:02 +00:00
Apion 5e47102c10 Weblate translations 2024-11-13 16:07:02 +00:00
Apion e56a7d5325 Merge branch 'move-effects' into 'main' 
Added particles for some moves.

See merge request cable-mc/cobblemon!1283
 2024-11-13 16:00:39 +00:00
Apion e1705056f2 Merge branch 'shiny-shimmering-splendid' into 'main' 
🍋‍🟩 API Feature: Shiny chance event and player context

See merge request cable-mc/cobblemon!1274
 2024-11-13 15:48:16 +00:00
Apion 57d380e18f Merge branch 'HiddenAbilityEvolutionFix' into 'main' 
Hidden Ability Evolution Fix

Closes #1149

See merge request cable-mc/cobblemon!1270
 2024-11-10 04:21:33 +00:00
Apion 2b796f7e4c Merge branch 'npc-fixo' into 'main' 
Allow simple NPC parties to be static, added autoHealParty property to NPC...

See merge request cable-mc/cobblemon!1266
 2024-11-10 03:58:09 +00:00
Apion 0942553bb7 Merge branch 'lang-updates' into 'main' 
Update translations

See merge request cable-mc/cobblemon!1245
 2024-11-03 00:55:23 +00:00
Apion ac7d2f6075 Update translations 2024-11-03 00:55:23 +00:00
ApionandHiroku 74222fe727 Implement a bunch of pokemon 2024-11-02 22:57:58 +00:00
Apion a30dacb4be Merge branch 'move-effects' into 'main' 
Added particles and sounds for moves.

See merge request cable-mc/cobblemon!1240
 2024-11-02 21:14:20 +00:00
Apion 1b41cc04eb Merge branch 'feature/fixes-and-tweaks' into 'main' 
fix a NF crash and introduce small mixing to enhance search in creative

Closes #1128

See merge request cable-mc/cobblemon!1227
 2024-10-31 22:38:31 +00:00
Apion e3913d1231 Merge branch 'one-seex-events' into 'main' 
Serverside events & Fishing event function registry

See merge request cable-mc/cobblemon!1193
 2024-10-26 22:58:42 +00:00
Apion 9bdb8102c1 Merge branch 'bugfix/1-6-fixes' into 'main' 
Dex variation definitions for many pokes, show all pose types in dex

See merge request cable-mc/cobblemon!1168
 2024-09-21 23:01:33 +00:00
Apion 4ec8b01efb Merge branch 'feature/jarring-changes' into 'main' 
JarInJar fabric kotlin instead of shadowing kotlin libs to avoid compatibility issues

Closes #933

See merge request cable-mc/cobblemon!1161
 2024-09-21 22:44:42 +00:00
Apion 471eef6c31 Merge branch 'SinglesSendoutAdjustments' into 'main' 
SinglesSendoutAdjustments

See merge request cable-mc/cobblemon!1166
 2024-09-21 22:40:15 +00:00
Apion fe0e32de76 Merge branch 'Whaet' into 'main' 
Update treasure.json

See merge request cable-mc/cobblemon!1160
 2024-09-20 06:43:35 +00:00
Apion 3c4da18040 Merge branch 'bugfix/1-6-fixes' into 'main' 
1.6 fixes

Closes #991, #973, and #989

See merge request cable-mc/cobblemon!1159
 2024-09-20 05:16:46 +00:00
ApionandNick 2b4b8fe13a DataFixers for a bunch of stuff 2024-09-18 17:36:37 +00:00
Apion 232e0f478a Merge branch 'fix/storage-registry-support' into 'main' 
Fixed NBT on pokemon held items not serializing, updated to 1.21.1

See merge request cable-mc/cobblemon!1153
 2024-09-15 06:17:18 +00:00
Apion 9c3a0704b9 Merge branch 'feature/bug-squashing' into 'main' 
various smaller bugfixes

Closes #969, #970, #971, #972, and #967

See merge request cable-mc/cobblemon!1135
 2024-09-12 23:28:49 +00:00
Apion 84dfd56c12 Merge branch 'Slippy-is-a-Coder-Now' into 'main' 
Slippy is a coder now

See merge request cable-mc/cobblemon!1108
 2024-08-15 21:25:57 +00:00
Apion 2bd1382b85 Merge branch 'feature/simplify-modelloader-mixin' into 'sega_bass_pro_fishing_2' 
Stop throwing errors in the model loader that generate misleading crash-reports

See merge request cable-mc/cobblemon!1110
 2024-08-08 16:11:08 +00:00
ApionXD 4b116fcd26 Removed tab chars in zh_tw.json 2024-07-20 10:09:37 -04:00
Apion 237e4901d1 Change forge paths to neo in CI 2024-07-07 00:27:54 +00:00
Apion ff553e1610 Merge branch 'pokemon-to-codec' into 'sega_bass_pro_fishing_2' 
Pokemon Codec for both sides & s2c comm

See merge request cable-mc/cobblemon!1077
 2024-07-06 19:34:42 +00:00
Apion 311dc3dc9c Merge branch 'json-poser-conversion' into 'implement_pokemon' 
Json poser conversion

See merge request cable-mc/cobblemon!1081
 2024-06-27 23:50:31 +00:00
Apion 257352c75d Merge branch 'held-item-manager-item-checker' into 'main' 
Held item manager item checker

See merge request cable-mc/cobblemon!883
 2024-06-27 23:14:34 +00:00
Apion 1e7fa34c44 Merge branch 'no-entity-rendering' into 'sega_bass_pro_fishing_2' 
Major refactor of animation system

See merge request cable-mc/cobblemon!1055
 2024-06-06 11:22:07 +00:00
Apion fad10da89f Merge branch 'forcespawn_cmd_fix' into 'main' 
Fixes #877

Closes #877

See merge request cable-mc/cobblemon!1056
 2024-06-01 15:19:06 +00:00
Apion 4db36ef6fa Merge branch 'tmetcalfe89/abstract-shedding' into 'main' 
abstracted shedinja logic for datapackability

See merge request cable-mc/cobblemon!1014
 2024-05-30 04:02:21 +00:00
Apion 2a0ae1a466 Merge branch 'tumbled-bricks' into 'main' 
Tumbled Blocks and Bricks

See merge request cable-mc/cobblemon!1051
 2024-05-30 02:58:57 +00:00
Apion e6e9137cb5 Merge branch 'AmauraFetusClippingFix' into 'main' 
Amaura fetus clipping fix

Closes #873

See merge request cable-mc/cobblemon!1053
 2024-05-30 00:49:20 +00:00
Apion b4b01ef0b6 Merge branch 'sound' into 'main' 
Updated all generic impact assets

See merge request cable-mc/cobblemon!1048
 2024-05-26 12:45:16 +00:00
Apion cc741c0478 Merge branch 'remulched' into 'main' 
Cheap Mulch!

See merge request cable-mc/cobblemon!1039
 2024-05-24 12:28:03 +00:00
Apion 706221aead Merge branch 'LangFixes' into 'main' 
A Couple of Lang Fixes

See merge request cable-mc/cobblemon!1035
 2024-05-24 08:15:24 +00:00
Apion 26bfca893b Merge branch 'main' into 'LangFixes' 
# Conflicts:
#   CHANGELOG.md
 2024-05-24 07:01:46 +00:00
Apion 389d2a0adc Merge branch '1.5-fixes-112313' into 'main' 
1.5 fixes 112313

See merge request cable-mc/cobblemon!1034
 2024-05-24 04:45:10 +00:00
Apion 5e6091c782 Merge branch 'tmetcalfe89/revive-event' into 'main' 
added fossil revived event

See merge request cable-mc/cobblemon!1029
 2024-05-22 07:26:52 +00:00
ApionandHiroku 86db95a7dc Make wooloos dyable 2024-05-18 01:40:13 +00:00
Apion 8924d0fe0f Merge branch 'navneetset-main-patch-27693' into 'main' 
Fix PC store downsizing not working with .resize()

See merge request cable-mc/cobblemon!1016
 2024-05-15 12:12:04 +00:00
Apion 3813ec3c92 Merge branch 'sound' into 'main' 
Renamed Relic Coin Sack sound assets. Added new sounds for Relic Coin Pouches.

See merge request cable-mc/cobblemon!1013
 2024-05-14 14:12:24 +00:00
Apion a1687e8304 Merge branch 'tmetcalfe89/ensure-defeat-count' into 'main' 
Ensure update total defeat count on battle win

See merge request cable-mc/cobblemon!1010
 2024-05-14 07:25:09 +00:00
Apion d69f1f17b6 Merge branch 'implement_pokemon' into 'main' 
Daily Implementation Mission

See merge request cable-mc/cobblemon!987
 2024-05-02 06:59:35 +00:00
Apion a76146f8e9 Merge branch 'JSON-Poser-Tweaks' into 'main' 
Json poser tweaks

See merge request cable-mc/cobblemon!986
 2024-05-02 05:53:59 +00:00
Apion 7f1dd4546b Merge branch 'can-moe-scrape' into 'main' 
Blueberry DLC

Closes #757, #649, and #758

See merge request cable-mc/cobblemon!953
 2024-05-02 05:48:29 +00:00
Apion 239acc0623 Merge branch '1.5-structure-fixes' into 'main' 
One more try

See merge request cable-mc/cobblemon!978
 2024-04-26 22:12:46 +00:00
Apion c02fa1f85e Merge branch '1.5-Drops-and-Fixes' into 'main' 
New drops and some tag/script fixes.

See merge request cable-mc/cobblemon!938
 2024-03-27 20:29:11 +00:00
Apion 503b1069fd Merge branch 'MultiBlockEntityClientCrashFix' into 'main' 
MultiBlockEntity Safer Casting

See merge request cable-mc/cobblemon!937
 2024-03-27 20:27:01 +00:00
Apion a270371632 Merge branch 'sturdier_tumblestones' into 'main' 
fix tumblestone blocks being breakable without a pickaxe

See merge request cable-mc/cobblemon!892
 2024-02-28 18:23:21 +00:00
Apion ff4d9ae208 Merge branch 'gimmighoul_gholdengo' into 'main' 
Add Gimmighoul, Gholdengo, Relic Coins and Gilded Chests

See merge request cable-mc/cobblemon!888
 2024-02-28 02:03:37 +00:00
Apion b489e747bb Merge branch 'type_gem' into 'main' 
added type gems

See merge request cable-mc/cobblemon!880
 2024-02-20 13:22:41 +00:00
Apion 6ca1d23f45 Merge branch 'no_more_pick_block' into 'main' 
disallow pick-stacking blocks that are part of a multiblock structure to prevent weird issues with NBT copying

See merge request cable-mc/cobblemon!874
 2024-02-19 23:38:26 +00:00
Apion a18b54849f Merge branch 'FetusAnimsUpdate' into 'main' 
Many updates, asset changes, and refactors for the fossil machine

See merge request cable-mc/cobblemon!863
 2024-02-10 01:24:04 +00:00
Apion 0c26cb026c Remove extra braces 2024-02-04 03:57:40 +00:00
Apion cb1226013d Removed unneeded access widener 2024-02-04 03:47:39 +00:00
Apion 66d8a01917 Merge branch 'hold-my-event' into 'main' 
Implement HeldItemEvent. Remove unnecessary setter method for already public var.

See merge request cable-mc/cobblemon!857
 2024-01-29 23:55:57 +00:00
ApionandNick ff1241304b Added a bedrock model repo for miscellaneous models 2024-01-26 23:16:16 +00:00
Apion 92fff27b4e Merge branch 'can-moe-scrape' into 'main' 
Add gen 9 DLC movesets

See merge request cable-mc/cobblemon!846
 2024-01-12 03:16:58 +00:00
Apion 824bc1b080 Merge branch 'botanypots' into 'main' 
Botanypots integration - with additional fixes

See merge request cable-mc/cobblemon!844
 2024-01-12 03:12:38 +00:00
Apion 527518d0c2 Merge branch 'funny_butterfly' into 'main' 
changes to vivillon advancements and patterns

See merge request cable-mc/cobblemon!842
 2024-01-09 21:21:10 +00:00
Apion 2ccda57c66 Merge branch 'botanypots' into 'main' 
Added BotanyPots integration

Closes #642

See merge request cable-mc/cobblemon!828
 2024-01-06 15:17:50 +00:00
Apion 2d6c7f5148 Merge branch 'dialogue' into 'main' 
Dialogue

See merge request cable-mc/cobblemon!834
 2024-01-03 12:20:39 +00:00
ApionandNick f82fa2b4e6 Improve Berry Rendering Perf 2024-01-03 07:35:27 +00:00
Apion 2cdc781e93 Merge branch 'battles-unlanguished' into 'main' 
Added langs and update interpreter

See merge request cable-mc/cobblemon!801
 2023-12-01 05:45:42 +00:00
Apion 85f08c9d28 Merge branch 'regionalise' into 'main' 
Regionalise

See merge request cable-mc/cobblemon!800
 2023-11-30 00:51:21 +00:00
ApionandHiroku 132a43c5c7 Added ability to spectate pokemon battles 2023-11-10 05:28:50 +00:00
ApionXDandapion da27b80e82 Fixed bug where tall grass wouldn't be deleted when a berry tree replaced its lower block 2023-09-06 10:50:07 -04:00
ApionXD 0240f925f6 Fixed bug where tall grass wouldn't be deleted when a berry tree replaced its lower block 2023-09-05 10:32:12 -04:00