GenotypeXD-Dev
ea33d86dbd
Implemented Tynamo line and Skorupi Line
2025-08-09 13:45:05 -05:00
GenotypeXD-Dev
3499111c92
Changelog
2025-08-09 00:35:41 -05:00
GenotypeXD-Dev
28cd404bef
Implemented Espurr line and Morpeko, Poser fixes for hisuian braviary and galarian weezing
2025-08-09 00:34:41 -05:00
GenotypeXD-Dev
407c4baff2
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2025-08-08 21:20:12 -05:00
GenotypeXD-Dev
d0653c5b13
Implemented Weezing-Galar, Braviary-Hisui, Mr. Rime. Added the implemented tag to some of the elemental monkeys, skiddo line, and munna line. Fixed Toxtricity Battle Pose, Fixed Skiddo Line posers
2025-08-08 21:19:29 -05:00
RedGenesectNinja
12212605cd
Implemented Hoppip, Skiploom and Jumpluff
2025-08-04 19:01:29 -05:00
Kenji_64
dfc130cf55
Killed the oceans - added G. Corsola and Cursola
2025-07-31 15:13:26 +02:00
Kenji_64
7a7eed9c45
Implemented remodels for Mudkip, Marshtomp and Swampert
2025-07-31 15:12:35 +02:00
Tyzillion
37c4d4c7fe
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
2025-07-29 15:07:22 -04:00
Tyzillion
2b5cac4361
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2025-07-29 15:07:03 -04:00
Polymeta
50c3ffc774
Merge branch 'bugfix-entity-health' into 'main'
...
Couple Pokémon HP / Entity health in a more sensible way.
See merge request cable-mc/cobblemon!1750
2025-07-28 08:58:23 +00:00
Polymeta
daf32a5cf3
Merge branch 'food-tweaks' into 'main'
...
Eat your, well, lots of things
Closes #1616
See merge request cable-mc/cobblemon!1756
2025-07-28 08:56:41 +00:00
dhi_holo
af4d2077ae
Eat your, well, lots of things
2025-07-28 08:56:41 +00:00
GenotypeXD-Dev
c19a94a2d3
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2025-07-27 21:17:33 -05:00
GenotypeXD-Dev
fbe6328f97
Implemented Skiddo and gogoat
2025-07-27 21:13:43 -05:00
Polymeta
b1a3cbf29d
Merge branch 'cleanup-crew' into 'main'
...
Small Fixes
Closes #1640 and #1199
See merge request cable-mc/cobblemon!1753
2025-07-27 21:08:36 +00:00
dhi_holo
130c50a2d6
Small Fixes
2025-07-27 21:08:35 +00:00
GenotypeXD-Dev
d205650373
deleted accidentally duplicated files, added skwovet resolver
2025-07-27 14:36:30 -05:00
GenotypeXD-Dev
eb4fa676ca
Added Elektrike, Manectric, Yungoos, Gumshoos, Skwovet, Greedent, Toxel, Toxtricity Amped/Lowkey
2025-07-27 14:36:29 -05:00
GenotypeXD-Dev
2ec6ba382c
deleted accidentally duplicated files, added skwovet resolver
2025-07-27 14:27:22 -05:00
GenotypeXD-Dev
65203b6d57
Added Elektrike, Manectric, Yungoos, Gumshoo, Skwovet, Greedent, Toxel, Toxtricity Amped/Lowkey
2025-07-27 14:22:39 -05:00
Hiroku
0b65259ee7
Merge branch 'let-me-break-it-down-for-you-mark-we-can-bee-bees' into 'main'
...
Species JSON dictates if something acts like a bee (pollinates flowers and delivers to hive/nest)
See merge request cable-mc/cobblemon!1709
2025-07-27 12:16:12 +00:00
Paul
53897a2613
Removed debug code
2025-07-27 22:04:17 +10:00
Hiroku
3318ee801a
Merge branch 'extra_flows' into 'main'
...
Many more Pokemon function refinements and Molang Flows
See merge request cable-mc/cobblemon!1710
2025-07-26 11:04:31 +00:00
Hiroku
0b97d139af
Edit CobblemonFlows.kt
2025-07-26 10:51:35 +00:00
Paul
b7c5f489fd
More cleanup
2025-07-26 14:31:57 +10:00
Paul
39ec6187b5
Various cleanup items and important fixes for wandering caused by bee stuff
2025-07-26 14:29:05 +10:00
Paul
b7681b43f9
Merge remote-tracking branch 'origin/main' into let-me-break-it-down-for-you-mark-we-can-bee-bees
2025-07-26 13:26:19 +10:00
Konoha
ae594a0790
Merge branch 'main' into extra_flows
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt
2025-07-24 08:04:14 -04:00
Konoha
6af299406d
Merge remote-tracking branch 'origin/main'
2025-07-24 07:57:51 -04:00
Nadja Reitzenstein
29833df50e
Couple Pokémon HP / Entity health in a more sensible way.
...
Specifically, don't touch Battle HP for wild Pokémon so that you can't hurt a Pokémon down out of battle for an easier catch, and always round entity health up so that only a HP of 0 is a health of 0
2025-07-24 13:09:33 +02:00
Paul
01d42abdb2
look_at_target requires nearest living entities memory and sensor
2025-07-23 23:16:32 +10:00
Paul
baa3f47769
Removed unused memory
2025-07-23 19:11:19 +10:00
Paul
16e716411a
Merge remote-tracking branch 'origin/main' into let-me-break-it-down-for-you-mark-we-can-bee-bees
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/entity/npc/NPCBrain.kt
2025-07-23 18:58:19 +10:00
Paul
3bbc551fd7
Wander controls supporting keeping wanderers around a point, bees stay around their hive
2025-07-23 18:55:52 +10:00
Polymeta
74381d8e3c
move mixin away from ModifyConstant to improve compatibility with other mods
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-07-22 23:48:21 +01:00
Polymeta
6688c32a1d
Merge branch 'smashling' into 'main'
...
Create saccharine_sapling.json
See merge request cable-mc/cobblemon!1749
2025-07-22 21:39:24 +00:00
dhi_holo
45dcf6f23b
Create saccharine_sapling.json
2025-07-22 17:02:54 +10:00
Polymeta
e4d92ead6a
Merge branch 'log-spawn' into 'main'
...
Update saccharine log spawning
See merge request cable-mc/cobblemon!1742
2025-07-19 20:11:01 +00:00
Test
9631f3c9d5
Update saccharine log spawning
2025-07-19 20:11:01 +00:00
Polymeta
0787f2772d
Merge branch '1.7-Tree-and-Crop-Generation' into 'main'
...
SaccharineTreeFeature to consider #cobblemon:has_feature/saccharine_tree
See merge request cable-mc/cobblemon!1748
2025-07-19 19:24:00 +00:00
Polymeta
4011502e54
changelog and license
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-07-19 08:35:51 +01:00
Polymeta
06855f6404
adding placed features for grains and galarica nuts
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-07-19 08:17:37 +01:00
Slippy
815955b904
Hearty Grains, Galarica Nut Bushes, and Saccharine Trees now generate with appropriate rates and locations. Just need Poly to do the mixin work
2025-07-19 01:50:24 -05:00
Polymeta
df9eed0da3
Merge branch '1,21-Gigawatts' into 'main'
...
Lightning Interactions with Pokemon
See merge request cable-mc/cobblemon!1733
2025-07-19 06:08:35 +00:00
JazzMcNade
99b73aa8dd
Lightning Interactions with Pokemon
2025-07-19 06:08:34 +00:00
Polymeta
f2d5073c7c
enforce fabric versions to match what cobblemon is built against for consistency
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-07-19 00:02:49 +01:00
Paul
3fda5f7c7a
give all NPCs the dialogues and battling memories
2025-07-18 18:18:44 +10:00
Hiroku
1e573f80bb
Merge branch 'cvnty_gyarados' into 'implement_pokemon'
...
Fixed issue with gyarados_female.geo.json where it was a duplicate of gyarados_male.geo.json, now allowing for correct Implementation of Female Gyarados!
See merge request cable-mc/cobblemon!1747
2025-07-18 06:30:46 +00:00
Hiroku
9b81666437
Merge branch 'pokedex-percentage-command' into 'main'
...
Fix Pokedex Percentage Command
Closes #1525
See merge request cable-mc/cobblemon!1692
2025-07-18 04:58:34 +00:00