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
Nick 8497a2a083 Merge branch 'trade-dupe-fix' into 'main' 
Trade dupe fix

See merge request cable-mc/cobblemon!2336
 2026-07-31 15:22:15 -07:00
Nick aaa1338150 Merge branch '1.8.0-biggest-fix-ever' into '1.8.0' 
Get 1.8 to compile please

See merge request cable-mc/cobblemon!2213
 2026-04-22 23:06:44 -07:00
Nick ffaee877a7 Make sure we don't bundle everything + handle showdown init errors better 2026-03-14 19:54:10 -07:00
Nick 186f7dbbce Move Graal and Mongo to JiJ 2026-03-14 19:19:43 -07:00
Nick 3a2ff9de75 1.7.1 SNAPSHOT in prep for next development cycle 2025-11-21 17:06:08 -08:00
Nick e8d1e3766b Merge branch 'fix-pc-deserialisation' into 'main' 
Fix PC JSON loading

See merge request cable-mc/cobblemon!2020
 2025-11-20 12:09:54 -08:00
Nick be466d1610 Merge branch 'aprijuice-neoforge-crash-fix' into 'main' 
Fix Aprijuices crashing on Neoforge

See merge request cable-mc/cobblemon!1957
 2025-11-11 11:18:42 -08:00
NickandLandon 3c508c5bd1 Prepare for displaying a snapshot warning to users 2025-06-30 06:10:46 +00:00
Nick 274f7e6c81 Merge branch 'monster-milker-2000' into 'main' 
Datapackable Pokemon Item Interactions

See merge request cable-mc/cobblemon!1683
 2025-06-10 14:22:44 -07:00
Nick 73b72ff19d Merge branch 'ponigiri' into 'main' 
Adds Ponigiri, Poke Puffs, Sinister Tea, and berry data changes and tool tip changes

See merge request cable-mc/cobblemon!1658
 2025-05-12 15:22:58 -07:00
Nick a2cf66fbc1 Merge branch 'seat-generator' into 'main' 
Seat generator

See merge request cable-mc/cobblemon!1558
 2025-03-12 16:10:03 -07:00
Nick 7f631174d7 Use native snapshot extension 2025-02-17 14:27:05 -08:00
Nick 379344036f Reposilite maven publication endpoint 2025-02-17 14:24:20 -08:00
Nick 02b7d5eeae Merge branch 'fix/neoforge-payload-logging' into 'main' 
No longer log all packets by state, just register

See merge request cable-mc/cobblemon!1411
 2024-12-23 21:05:03 +00:00
Nick 614be610d4 No longer log all packets by state, just register 2024-12-23 13:02:40 -08:00
Nick 82c7c03e28 Initial tests for watchdog fix 2024-12-13 20:18:13 -08:00
Nick 2d7f3257d1 Merge branch 'hiro-fix' into 'main' 
I fix bugs too

Closes #1212, #1222, and #1228

See merge request cable-mc/cobblemon!1367
 2024-12-14 04:16:35 +00:00
Nick 04ecd9189c It would seem a particular build step was forgotten 2024-12-05 21:37:34 -08:00
Nick 55be22e942 Revert previous change, update stats differently instead 2024-12-05 21:29:13 -08:00
Nick d503d4a1eb Rework copy on properties, just clone fields rather than serialize + deserialize JSON 2024-12-02 19:10:30 -08:00
Nick f353548f9e Merge branch 'TheRaftShow' into 'main' 
Battle Rafts

See merge request cable-mc/cobblemon!1338
 2024-12-01 01:02:38 +00:00
Nick 19aa45e0af Merge branch 'bugfixes' into 'main' 
Fishing bugfixes

See merge request cable-mc/cobblemon!1337
 2024-11-30 03:26:06 +00:00
Nick 0fe8ebd008 Merge branch 'Offhand-bait-fixes' into 'main' 
Fix offhand bait being applied

See merge request cable-mc/cobblemon!1336
 2024-11-30 03:19:34 +00:00
Nick f45a1681fa Merge branch 'pokerod-tooltip-changes' into 'main' 
Add new tooltips for pokerods to show players how to add bait

See merge request cable-mc/cobblemon!1328
 2024-11-25 21:09:40 +00:00
Nick e6b287434b Merge branch 'off-hand-fishing-bait-changes' into 'main' 
Changes to how offhand bait is applied to rod

See merge request cable-mc/cobblemon!1327
 2024-11-25 20:13:38 +00:00
Nick d39ee60158 Merge branch 'lucky-sea-rate-changes' into 'main' 
Alter Luck of the Sea spawn bucket rates

See merge request cable-mc/cobblemon!1326
 2024-11-25 20:12:05 +00:00
Nick bbaf4332c6 Merge branch 'jumping-ancient-balls' into 'main' 
Ancient Pokeball particles and animations.

See merge request cable-mc/cobblemon!1324
 2024-11-25 19:20:20 +00:00
Nick 0dda070c4c Merge branch 'sound' into 'main' 
Poke Ball sound overhaul

See merge request cable-mc/cobblemon!1319
 2024-11-25 19:17:41 +00:00
Nick 81c272778f Merge branch 'we_are_cooking_now' of gitlab.com:cable-mc/pokemon-cobbled into we_are_cooking_now 2024-11-02 01:11:33 -07:00
Nick 31351116b5 Include a configuration for maxShiftBy 2024-11-02 01:11:18 -07:00
Nick d7962e7d48 Merge branch 'feature/more-bugs-fixed' into 'main' 
more smaller bugs fixed (neoforge users rejoice)

Closes #1068, #1072, and #1073

See merge request cable-mc/cobblemon!1192
 2024-10-10 16:57:59 +00:00
Nick 715112f8d9 Merge branch 'feature/shinies' into 'main' 
Shiny Pokémon Particles and Sound Effects! ✨✨✨💖

See merge request cable-mc/cobblemon!1183
 2024-10-10 16:52:39 +00:00
Nick 36e3816bf3 Merge branch 'feature/pokemon-debug-utils' into 'main' 
debug galore for pokemon

See merge request cable-mc/cobblemon!1175
 2024-09-24 23:05:41 +00:00
Nick aa875b06ab Merge branch 'feature/form-dfu' into 'main' 
introduce feature DFU to prevent loss of forms and other features when migrating from 1.20

Closes #993 and #541

See merge request cable-mc/cobblemon!1174
 2024-09-24 17:24:29 +00:00
Nick eefff036b7 Merge branch 'more-npcs' into 'main' 
Many NPC improvements for foundation

See merge request cable-mc/cobblemon!1171
 2024-09-23 23:02:00 +00:00
Nick b1b8c6e9db Merge branch 'bugfix/fix-for-slippy' into 'main' 
Fixed Jigsaw structure maximums

See merge request cable-mc/cobblemon!1173
 2024-09-23 22:06:16 +00:00
Nick 8cf6645cdd Merge branch 'dfu-fun' into 'main' 
DataFixers for a bunch of stuff

See merge request cable-mc/cobblemon!1156
 2024-09-18 17:36:37 +00:00
Nick 770abc2b9b Merge branch 'feature/fix-license' into 'main' 
fix missing license headers

See merge request cable-mc/cobblemon!1116
 2024-08-15 17:35:28 +00:00
Nick 2f2fae020c Merge branch 'dubwool-fix' into 'main' 
Fixed shiny Dubwool’s colored wool texture was not being used

See merge request cable-mc/cobblemon!1095
 2024-07-16 23:24:22 +00:00
Nick ee0d420560 Merge branch 'pasture-fixes' into 'main' 
Pasture fixes

Closes #879 and #935

See merge request cable-mc/cobblemon!1097
 2024-07-16 23:23:15 +00:00
Nick 00543bdf91 I prefer rocks anyways 2024-06-15 19:55:36 -07:00
Nick ede880344f Templating of new Item Components 2024-06-08 19:25:02 -07:00
Nick 03fb363420 Merge remote-tracking branch 'origin/1.20.5' into 1.20.5 2024-06-08 16:09:14 -07:00
Nick 24315154fc Fix a merge conflict for fossil multiblock structure 2024-06-08 16:09:00 -07:00
Nick bb4c3d8a48 Fix libs.versions.toml 2024-06-08 15:56:17 -07:00
Nick 9dc851d052 Add an image to our buildscript 2024-06-08 15:54:57 -07:00
Nick fc06b04e47 Merge remote-tracking branch 'origin/1.20.5' into 1.20.5 
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/BindingSoilBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/RestorationTankBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/entity/GildedChestBlockEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/entity/RestorationTankBlockEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemonFromPool.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/integration/adorn/AdornCompatibility.kt
#	fabric/src/main/java/com/cobblemon/mod/fabric/mixin/GuiMixin.java
#	fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
#	gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts
#	gradle/wrapper/gradle-wrapper.properties
#	neoforge/build.gradle.kts
#	neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt
 2024-06-08 15:52:31 -07:00
Nick ac5f9ac3c5 Sync with main, to the best of our abilities. Fixes some primary blurring on common menus 2024-06-08 15:50:32 -07:00
Nick 384724a906 Merge remote-tracking branch 'origin/1.20.5' into 1.20.5 
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
#	gradle/libs.versions.yml
#	neoforge/build.gradle.kts
 2024-06-07 23:24:06 -07:00
Nick 639417d6c8 Merge remote-tracking branch 'refs/remotes/origin/main' into 1.20.5 
# Conflicts:
#	common/build.gradle.kts
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/RestorationTankBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/entity/GildedChestBlockEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/entity/RestorationTankBlockEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemonFromPool.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/integration/adorn/AdornCompatibility.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/integration/jei/berry/BerryMutationProvider.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/integration/jei/berry/BerryMutationRecipe.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/ItemInteractionEvolution.kt
#	fabric/build.gradle.kts
#	fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
#	gradle.properties
#	gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts
#	gradle/libs.versions.yml
#	gradle/wrapper/gradle-wrapper.properties
#	neoforge/build.gradle.kts
#	neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt
#	settings.gradle.kts
 2024-06-07 22:44:45 -07:00
Nick 28cbc0a6fa Adjustments for driver selection, fixes NPE 2024-06-02 23:53:29 -07:00
Nick 5c74fabdc6 Add new event for driver selection 2024-06-02 22:25:21 -07:00
Nick ab53a2cad4 Merge remote-tracking branch 'origin/means-of-transportation' into means-of-transportation 
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/api/riding/seats/Seat.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
 2024-06-02 21:30:50 -07:00
Nick a629a59654 Merge remote-tracking branch 'origin/means-of-transportation' into means-of-transportation 
# Conflicts:
#	common/build.gradle.kts
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
 2024-06-02 00:16:24 -07:00
NickandHiroku 50a21d91e8 Form Sync on Form Change Fix 2024-05-26 00:02:40 +00:00
Nick a512a99fb2 Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into means-of-transportation 
# Conflicts:
#	build-logic/settings.gradle.kts
#	common/build.gradle.kts
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
#	gradle/build-logic/src/main/kotlin/utilities/Git.kt
#	gradle/libs.versions.yml
#	gradle/wrapper/gradle-wrapper.properties
#	settings.gradle.kts
 2024-05-18 12:04:34 -07:00
Nick 158aa05f24 Merge branch 'fix/downgrade-loom' into 'main' 
fix: resolve mapping issues by downgrading loom

See merge request cable-mc/cobblemon!1015
 2024-05-15 15:38:09 +00:00
Nick fd7b82dbe3 Merge branch 'build/gradle-updates' into 'main' 
gradle and build improvements

See merge request cable-mc/cobblemon!1006
 2024-05-11 23:40:09 +00:00
Nick 81ac6f3b44 Snapshot = true 2024-05-11 16:39:06 -07:00
Nick 03a63e8310 Big main sync 2024-05-11 11:19:12 -07:00
Nick 5b2d542fca Merge branch 'Myslippy-main-patch-94569' into 'main' 
Update CHANGELOG.md

See merge request cable-mc/cobblemon!1002
 2024-05-10 20:06:14 +00:00
Nick 3307bedf08 Add basic enough conditions to liquid controllers, allow them to run 2024-04-28 23:56:00 -07:00
Nick 4bf3bf07e4 Goodbye capabilities 2024-04-28 23:37:14 -07:00
Nick 6ea5a1f7ce Cleanup + don't defer render if in fabulous 2024-04-27 22:46:34 -07:00
Nick 6effa13dfb Work towards opacity on ridden models 2024-04-27 15:22:47 -07:00
Nick 5e78f89935 We're just going to claim stuff for this one 2024-04-26 21:01:49 -07:00
Nick 724c674992 Fix packet/mixin issues related to forge, bump KFF version, and build details 2024-04-24 22:07:31 -07:00
Nick 5a5442f666 Main sync 2024-04-19 19:01:30 -07:00
Nick cf3587557d Merge branch 'ui-icon' into 'main' 
Update shiny icon

See merge request cable-mc/cobblemon!963
 2024-04-15 19:14:48 +00:00
Nick bb05177985 Merge branch 'imposter_fix' into 'main' 
Imposter fixes

See merge request cable-mc/cobblemon!965
 2024-04-15 19:14:18 +00:00
Nick c8f0140870 Merge branch '1.5-Structures' into 'main' 
found a spelling error smh

See merge request cable-mc/cobblemon!964
 2024-04-15 19:13:00 +00:00
Nick 30466a6063 Merge branch 'shifting-shadows' into 'main' 
Scale shadows on sendout/recall

See merge request cable-mc/cobblemon!949
 2024-04-02 18:50:13 +00:00
Nick 9f63b62651 Merge branch '1.5-Structures' into 'main' 
Hi Hiro

See merge request cable-mc/cobblemon!928
 2024-03-21 16:42:25 +00:00
Nick fef655065b Merge branch 'its-dexter-time' of gitlab.com:cable-mc/pokemon-cobbled into its-dexter-time 2024-03-18 19:18:58 -07:00
Nick 1d2ce79fba Fix scroll widget being slightly off on both x and y axis 2024-03-18 19:18:50 -07:00
Nick e341948bd4 Merge branch 'tooling-fixes' into 'main' 
tooling: mark gradlew as executable & fix logs being created during unit tests

See merge request cable-mc/cobblemon!921
 2024-03-18 04:24:22 +00:00
Nick 885fc72d93 Revert "1.5 Structures final changes before Playtesting" 
This reverts commit 8130cd0998
 2024-03-15 17:56:22 +00:00
Nick 65bf9507d3 Fix invalid JSON 2024-03-13 04:48:50 +00:00
Nick e39d59c37a Merge branch 'gen10-will-wash-this-away' into 'main' 
Support Stellar tera type & fix tera type selection.

See merge request cable-mc/cobblemon!907
 2024-03-08 20:31:44 +00:00
NickandLicious de7df10f36 Quick Fix for Crash Report Details to Actually be Written 2024-03-08 10:30:22 +00:00
Nick 8583c9af4d Merge branch 'ores_galore' into 'main' 
terracotta sun stone ore

See merge request cable-mc/cobblemon!904
 2024-03-07 19:50:08 +00:00
NickandLicious 7ed6075410 Change Version Publication for Better Maven Support 2024-03-07 18:23:06 +00:00
Nick 8ae91587aa Merge branch 'feat/rework-starter-toast' into 'main' 
Removing Starter Toast when it is nice and crispy.

Closes #579, #656, #771, and #655

See merge request cable-mc/cobblemon!898
 2024-03-06 23:12:49 +00:00
Nick d010129864 Merge branch 'food_reorganization' into 'main' 
moved the items in the food category around to make more sense (previously...

See merge request cable-mc/cobblemon!903
 2024-03-06 21:24:18 +00:00
Nick 282f002895 Merge branch 'amo/sendout-upgrade' into 'main' 
Ancient Send Outs

See merge request cable-mc/cobblemon!902
 2024-03-06 21:22:48 +00:00
Nick d7069904c7 Better checks for capabilities, transitions now working between land and water 2024-02-10 23:05:04 -08:00
Nick 4217938ada Merge branch 'move-animations' into 'main' 
Simplistic move animations

See merge request cable-mc/cobblemon!871
 2024-02-10 22:51:29 +00:00
Nick 142eebe9e6 Apply model predicates, starting with Pokerod 2024-02-09 22:07:43 -08:00
Nick 3d48324a43 Begin work on liquid capabilities for mounts 2024-02-05 18:00:50 -08:00
Nick d5752982d7 Merge branch 'crystal_block' into 'main' 
internal changes to tumblestones

See merge request cable-mc/cobblemon!865
 2024-02-06 00:41:19 +00:00
Nick 0cac5714ac Merge branch 'sherd_updates' into 'main' 
added a missing sherd + added sherds to the vanilla ingredients tab

See merge request cable-mc/cobblemon!864
 2024-02-05 22:45:46 +00:00
Nick ce668b31ff Merge branch 'dynamic-lighting-compat' into 'main' 
Dynamic lighting compat

See merge request cable-mc/cobblemon!860
 2024-02-03 21:49:28 +00:00
Nick 90c74eddc8 Merge branch 'does_this_qualify_as_grafting' into 'main' 
Implement #748 Allow players to plant apricorn sprouts on leaves

Closes #748

See merge request cable-mc/cobblemon!854
 2024-01-30 17:53:47 +00:00
Nick 3600178d3b Merge branch 'lefties-not-the-store-pls-no-copyright' into 'main' 
Adds leaves_leftovers item tag.

See merge request cable-mc/cobblemon!858
 2024-01-30 17:52:26 +00:00
Nick f46b581327 Merge branch 'new-model-repo' into 'main' 
Added a bedrock model repo for miscellaneous models

See merge request cable-mc/cobblemon!855
 2024-01-26 23:16:16 +00:00
Nick a02261fcac Adjust max block speed/tick and dummy solution for movement state 2024-01-25 07:56:22 -08:00
Nick 996bf3f929 Sync properties to client, working demo of riding 2024-01-24 23:23:43 -08:00
Nick 8449aff799 Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into means-of-transportation 2024-01-23 19:07:09 -08:00
Nick 80df79f93a Sync properly with latest main 2024-01-15 23:58:11 -08:00
Nick 897419a0b6 Decently large restructure of riding design, not fully linked up just yet 2024-01-15 23:13:00 -08:00