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 |
|
Guilherme Pereira
|
690ccbd260
|
refactor check riding statistics method for server player mixin
|
2025-12-08 12:06:20 -03: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
|
86cb865742
|
fixed mochi items being consumed twice
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-12-08 13:01:14 +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 |
|
Jacob Hartmann
|
9c5bfda20f
|
Updating texture paths
|
2025-12-07 20:34:09 -07:00 |
|
Gertimoshka
|
6d545fc1ca
|
Fixes a crash caused by malformed riding prespectives json file when trying to ride a pokemon
|
2025-12-07 11:47:04 +02: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 |
|
500-internal-server-error
|
36881b70be
|
fix spectator crash
|
2025-12-06 20:51:48 +07:00 |
|
jasoncramer
|
9b052478f6
|
fix: use regional form data for spawn bait influence
|
2025-12-05 14:23:05 -05:00 |
|
Hiroku
|
339f8339f0
|
Merge branch 'RestorePokemonItemPickup' into 'main'
Restore Pokemon item pickup
See merge request cable-mc/cobblemon!2073
|
2025-12-05 08:19:41 +00:00 |
|
JazzMcNade
|
e5666e7a82
|
Restore Pokemon item pickup. Remove unnecessary check in shouldBeSaved()
|
2025-12-05 01:30:20 -06:00 |
|
Neovitalism
|
56b2ba08ad
|
Prevents outside influences from crashing the logical server.
Before when it was completed exceptionally w/ the pokesnack spawner, it would crash the server.
|
2025-12-04 03:03:57 -06:00 |
|
Khvrram
|
7e6ca7be5e
|
Merge branch cobblemon:main into main
|
2025-12-04 01:59:17 +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 |
|
lion
|
d826aeeb07
|
Fix can drop held item function
|
2025-12-03 08:17:35 +00:00 |
|
JazzMcNade
|
30650e1f9f
|
Code simplication
|
2025-12-02 20:12:37 -06:00 |
|
JazzMcNade
|
eaa558a7c8
|
Check for creative on using empty bottle
|
2025-12-02 00:36:53 -06:00 |
|
JazzMcNade
|
0dc725e513
|
Can only receive honey at max age. Adds result to hand if possible. Checks for creative and server/client
|
2025-12-02 00:28:23 -06:00 |
|
Sterrezo
|
9c102a7850
|
Merge branch 'main' into sterr/ride-sound-changes
|
2025-12-01 15:45:40 +01:00 |
|
Sterrezo
|
22a1eaab19
|
Volume balancing
|
2025-12-01 15:35:22 +01:00 |
|
Sterrezo
|
0118ace5fc
|
Implemented stereo flight loops
|
2025-12-01 15:09:37 +01:00 |
|
Sterrezo
|
d4a93abbf7
|
Added support for submerged ride sounds
|
2025-12-01 14:27:55 +01:00 |
|
Sterrezo
|
d0ee3f3e9d
|
Added an option for ride sounds to not play for the passengers
|
2025-12-01 13:56:56 +01:00 |
|
Khvrram
|
46ae53f565
|
Merge branch cobblemon:main into main
|
2025-12-01 04:25:52 +00:00 |
|
Khvrram
|
f9de415020
|
Orientation after crash fix
|
2025-12-01 00:23:39 +00:00 |
|
Khurram Valiyev
|
4d123b6e4b
|
Fixed shiny Pokémon not respecting the silent flag on spawn.
|
2025-11-29 22:50:52 -05: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 |
|
Hiroku
|
0fef74dce7
|
Edit OneToOneFileStoreAdapter.kt
|
2025-11-29 09:46:27 +00:00 |
|
Hiroku
|
b08647bb32
|
Revert "Merge branch 'main' into 'main'"
This reverts merge request !2062
|
2025-11-29 04:26:57 +00:00 |
|
Ezequiel Neri Ferreira
|
84a29ebc2a
|
Editar en_us.json
|
2025-11-29 04:22:49 +00:00 |
|
dhi_holo
|
1cacbe8306
|
Why
It's called Shears, that's the item name, why does NeoForge use a Shear tag instead
Atleast Fabric has that tag as well so it's not a hard fix
|
2025-11-29 12:30:45 +10:00 |
|
Paul
|
12d224d15a
|
Reinforce switchForm for crashes
|
2025-11-29 11:25:58 +10: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 |
|
Kenji_64
|
c7c272c79c
|
Had to fix Dragapult (again)
|
2025-11-28 21:04:50 +01:00 |
|
Kenji_64
|
c759161367
|
Added cries to Eelektrik and Eelektross
|
2025-11-28 21:01:27 +01:00 |
|
Landon
|
19b7b4804f
|
Merge branch 'add-defend-owner-task' into 'main'
Make Pokémon only attack mobs targeting the player
See merge request cable-mc/cobblemon!2051
|
2025-11-28 18:30:05 +00:00 |
|
Landon
|
3a005cc813
|
Merge branch '1.7.1-spawns' into 'main'
Updated Dratini line spawns.
See merge request cable-mc/cobblemon!2055
|
2025-11-28 18:28:24 +00:00 |
|
Veraxiel
|
c3ddfce0a7
|
Updated Dratini spawn.
|
2025-11-28 12:38:53 -05:00 |
|
Landon Wills
|
e105c5d4d7
|
Remove multipliers, adjust expression
|
2025-11-28 12:17:42 -05:00 |
|
Landon Wills
|
3d816f57e2
|
Increase pitch rotation of Jet
|
2025-11-28 12:13:55 -05:00 |
|
Landon
|
1e6dcfba9b
|
Merge branch 'change-freelook-default' into 'main'
Change free look binding default to Left Alt
See merge request cable-mc/cobblemon!2053
|
2025-11-28 16:30:35 +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 |
|
Guilherme Pereira
|
c155b5575d
|
change free look binding default to left alt
|
2025-11-28 09:35:13 -03:00 |
|
Jerzykv
|
9c6b8b231a
|
oops 2
|
2025-11-28 13:30:16 +01:00 |
|
Jerzykv
|
92b404dac4
|
oops
|
2025-11-28 13:27:19 +01:00 |
|
Jerzykv
|
8a1c536d68
|
Fixed Furfrou's pink and magenta trims being swapped
|
2025-11-28 12:56:07 +01:00 |
|
Jerzykv
|
04719d22a5
|
Fixed a tiny issue with Ceruledge's poser
|
2025-11-28 12:55:54 +01:00 |
|
Jerzykv
|
dacc312756
|
Implemented Tinkatink line remodels
|
2025-11-28 12:55:26 +01:00 |
|