JazzMcNade
|
b191f4e9fb
|
Check hivecooldown memory registration
|
2025-11-23 15:42:56 -06:00 |
|
JazzMcNade
|
4e24e09924
|
Safer memory reading in hive occupant mixins
|
2025-11-22 16:19:30 -06:00 |
|
JazzMcNade
|
bb8b8a77c9
|
Fixed bees forgetting that they had nectar upon entering a hive
|
2025-11-22 11:07:37 -06: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 |
|
violet
|
9ee0cf941b
|
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
|
2025-11-21 14:29:35 -05:00 |
|
violet
|
8436c93317
|
marked togedemaru as implemented
|
2025-11-21 14:29:19 -05:00 |
|
Landon Wills
|
38bdfae0db
|
Fix mutation of vector after changing from Vector3f to Vec3
|
2025-11-21 06:57:06 -05:00 |
|
Landon
|
bd3a9e30f1
|
Merge branch 'fix-npc-behavior-json' into 'main'
Fix NPC Behavior Json key
See merge request cable-mc/cobblemon!2026
|
2025-11-21 11:02:11 +00:00 |
|
Hiroku
|
9ac8cc56f0
|
Merge branch 'main' into 'implement_pokemon'
# Conflicts:
# common/src/main/resources/data/cobblemon/species/generation5/patrat.json
# common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json
|
2025-11-21 09:45:22 +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 |
|
violet
|
025b5aae74
|
edited treecko line, braixen, and delphox's files
|
2025-11-21 04:27:03 -05:00 |
|
Deltric
|
2fddb21585
|
Fixed NPC behavior key fix, yes that's right behavior not behaviour @Hiroku.
|
2025-11-21 01:32:54 -06:00 |
|
violet
|
6b75976236
|
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2025-11-21 02:17:36 -05:00 |
|
Paul
|
fdf419ec8f
|
Rescraped for willFlee scraper bug, restoring flee behaviour for hundreds of pokes
|
2025-11-21 17:12:20 +10:00 |
|
Paul
|
d2ceb2d58a
|
Fixed wooper and whiscash forms being fished by all rods
|
2025-11-21 17:11:11 +10:00 |
|
Hiroku
|
6d8311a66c
|
Merge branch '1.7-spawns-update' into 'main'
Updated spawns for 1/100 chance form Pokémon.
See merge request cable-mc/cobblemon!2025
|
2025-11-21 07:07:00 +00:00 |
|
Veraxiel
|
18a3d1c22c
|
Updated spawns for 1/100 chance form Pokémon.
|
2025-11-21 01:54:50 -05:00 |
|
Hiroku
|
b382a1b2db
|
Merge branch '1.7-tag-cleanup' into 'main'
1.7 tag cleanup
See merge request cable-mc/cobblemon!2017
|
2025-11-21 06:29:22 +00:00 |
|
Paul
|
dd17fa138e
|
Fixed smeargle tail changing colour between relogs
|
2025-11-21 16:27:56 +10:00 |
|
Test
|
09dd623ea7
|
Amend dolphin controls overlay
|
2025-11-21 06:24:56 +00:00 |
|
Landon
|
8c01bb831f
|
Merge branch 'path-faster-and-less-and-faster' into 'main'
Following the owner should not be so aggressive. Path cooldown, and consider...
See merge request cable-mc/cobblemon!2019
|
2025-11-21 06:09:10 +00:00 |
|
Paul
|
2cb4372496
|
Removed cry from slowpoke tail'ing
|
2025-11-21 15:04:43 +10:00 |
|
dhi_holo
|
5ac2729a77
|
Crafting Fix
EV Feathers now unlock in recipe book, and Mochi cannot be crafted in a table, now requires campfire pot cooking
|
2025-11-21 14:46:13 +10:00 |
|
dhi_holo
|
32d145f3cc
|
Quick Brewing Only-ification
Removed 8 recipes that were meant to be removed, added translation for a newer tag that was missed over
|
2025-11-21 13:34:52 +10:00 |
|
Paul
|
a5f1a14e21
|
Merge remote-tracking branch 'weblate/lang-updates'
# Conflicts:
# common/src/main/resources/assets/cobblemon/lang/pt_br.json
|
2025-11-21 11:43:28 +10:00 |
|
Landon
|
57784b8620
|
Merge branch 'camera-farlands' into 'main'
Switch to using Doubles when positioning camera.
See merge request cable-mc/cobblemon!2021
|
2025-11-20 23:28:26 +00:00 |
|
JPAKx4
|
a29b3342a1
|
Switch to using Doubles when positioning camera.
|
2025-11-20 16:41:13 -06: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 |
|
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 |
|
Landon Wills
|
012682268e
|
Add safe check for nbt
|
2025-11-20 14:22:32 -05:00 |
|
Landon Wills
|
38428e4ea9
|
Fix PC JSON loading
|
2025-11-20 14:19:17 -05:00 |
|
Paul
|
567132bc0c
|
Even more aggressive optimizations for the nodemaker
|
2025-11-20 23:07:59 +10:00 |
|
Paul
|
e7209e4000
|
More aggressive optimizations for the nodemaker
|
2025-11-20 22:40:19 +10:00 |
|
Landon Wills
|
273b520c0b
|
Shave iterations off of node type checks
|
2025-11-20 02:13:27 -05:00 |
|
Guilherme Pereira
|
0f02313a14
|
prevent pokemon from being busy when capturing player gets killed
|
2025-11-20 03:13:55 -03:00 |
|
Guilherme Pereira
|
3249e4bbb1
|
prevent pokemon from doing damage when being captured
|
2025-11-20 03:13:15 -03:00 |
|
geumu
|
36aca65003
|
Translated using Weblate (Korean)
Currently translated at 67.0% (6010 of 8962 strings)
Translation: Cobblemon/Mod
Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ko/
|
2025-11-20 05:48:24 +00:00 |
|
Watuneni iteite
|
c6635213a2
|
Translated using Weblate (Japanese)
Currently translated at 99.2% (8897 of 8962 strings)
Translation: Cobblemon/Mod
Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ja/
|
2025-11-20 05:48:23 +00:00 |
|
JazzMcNade
|
bf6fab3936
|
Only check for nearby danger nodes if the hitbox is small
|
2025-11-19 23:18:11 -06:00 |
|
Watuneni iteite
|
b76158d1d7
|
Translated using Weblate (Japanese)
Currently translated at 99.2% (8896 of 8962 strings)
Translation: Cobblemon/Mod
Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ja/
|
2025-11-20 02:32:39 +00:00 |
|
geumu
|
916ec97fce
|
Translated using Weblate (Korean)
Currently translated at 66.6% (5972 of 8962 strings)
Translation: Cobblemon/Mod
Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ko/
|
2025-11-20 02:32:36 +00:00 |
|
Veraxiel
|
36b38d36cb
|
Updated biome tags.
|
2025-11-19 21:00:27 -05:00 |
|
Veraxiel
|
f1163977e1
|
Updated biome and seasoning tags. Updated Sinister Tea recipe filter.
|
2025-11-19 20:59:42 -05:00 |
|
Carmendar
|
a7dd6d52c8
|
Charizard and Mudsdale Look tweaks.
|
2025-11-19 19:29:19 -06:00 |
|
Watuneni iteite
|
6898804e83
|
Translated using Weblate (Japanese)
Currently translated at 96.9% (8686 of 8962 strings)
Translation: Cobblemon/Mod
Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ja/
|
2025-11-20 00:40:19 +00:00 |
|
Carmendar
|
2331603b27
|
Tyrantrum sleep t-pose fix.
|
2025-11-19 18:30:38 -06:00 |
|
Carmendar
|
c8e9cbbe59
|
Furfrou cry fix
|
2025-11-19 18:30:11 -06:00 |
|
Carmendar
|
d374635648
|
Aerodactyl Battle Cry and Texture fix
|
2025-11-19 18:29:39 -06:00 |
|
Polymeta
|
803d3be325
|
recipe and tag tweak
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
|
2025-11-19 23:59:55 +00:00 |
|