Paul
fc73384ea2
Respect attack target data disengaging in melee combat
2025-08-02 10:28:30 +10:00
Paul
52f21ffc82
License and registration please
2025-08-01 20:38:14 +10:00
Paul
9c31899f3c
Fixed up some missing lang for behaviours
2025-08-01 20:32:17 +10:00
Paul
3f090ce691
Merge remote-tracking branch 'origin/main' into trigger-behaviour
2025-07-28 11:34:37 +10: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
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
Paul
8e6681b3aa
Introduced EntityCallbacks
2025-07-27 22:02:30 +10:00
Paul
50427965ab
Merge remote-tracking branch 'origin/main' into trigger-behaviour
2025-07-26 21:41:09 +10:00
Hiroku
0b97d139af
Edit CobblemonFlows.kt
2025-07-26 10:51:35 +00:00
Paul
3966607373
Tidy up the script actions for adding/removing a Behaviour on an entity
2025-07-26 18:34:40 +10: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
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
dhi_holo
45dcf6f23b
Create saccharine_sapling.json
2025-07-22 17:02:54 +10: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
JazzMcNade
99b73aa8dd
Lightning Interactions with Pokemon
2025-07-19 06:08:34 +00:00
Paul
3fda5f7c7a
give all NPCs the dialogues and battling memories
2025-07-18 18:18:44 +10: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
Ceejay
b43f969c02
Fix Pokedex Percentage Command
2025-07-18 04:58:34 +00:00
Polymeta
02c4947513
fixed some typos in pokemon interactions
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-07-17 23:10:07 +01:00
Slippy
6158b36103
Saccharine trees are now rarer and generate in the correct biomes
2025-07-16 12:18:39 -05:00
Polymeta
2e14f8f8e8
hearty grains will generate with both blocks when of the right age
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-07-16 10:22:48 +01:00
Polymeta
bc80d6a171
SaccharineTreeFeature to consider #cobblemon:has_feature/saccharine_tree
...
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com >
2025-07-16 08:30:32 +01:00
Konoha
65a7fc6fd7
Implement includeLegacy parameters
2025-07-15 22:11:47 -04:00
Konoha
ce019631ce
Merge branch 'main' into extra_flows
2025-07-15 21:58:19 -04:00
Konoha
0534e0d201
Merge remote-tracking branch 'origin/main'
2025-07-15 21:51:31 -04:00
Konoha
895e3ca378
Update Benched Moves after teachLearnableMoves call
2025-07-15 21:51:14 -04:00
Test
3048e3d81d
fix data for variations and species features
2025-07-15 02:14:53 -04:00
Polymeta
77fb94d9ef
Merge branch 'fix-x-axis-offsets' into 'main'
...
Fix X-axis being a different direction than Blockbench and addded new property attachment_options
See merge request cable-mc/cobblemon!1730
2025-07-13 23:25:25 +00:00
Jordan
9078ee2191
Fix X-axis being a different direction than Blockbench and addded new property attachment_options
2025-07-13 23:25:24 +00:00
Gertimoshka
81b83aabc1
Plefora of Cooking related fixes/implementations
2025-07-13 22:56:49 +00:00
JazzMcNade
c69de804b9
Merge branch 'main' into PhantomsFearTheFurySwipes
2025-07-12 11:15:39 -05:00
JazzMcNade
fbbed7b20a
More license
2025-07-12 11:15:27 -05:00
Polymeta
a1b5f0a567
Merge branch 'i-cant-take-it-anymore' into 'main'
...
Block Texture Clean Up
See merge request cable-mc/cobblemon!1738
2025-07-12 12:07:01 +00:00
Konoha
6a7b71d5a7
Cleanup
2025-07-11 22:30:30 -04:00
dhi_holo
0a48014931
Design Meeting Changes
...
- Healing Machine recipe rebalanced
- Vivichoke Crops now drop one seed at full grown stage as well as the crop
- Vivichoke now can only be crafted into one seed, rather than two, to compensate for the above
2025-07-12 11:23:21 +10:00
Polymeta
a70fed25c5
Merge branch 'feature/type-madness' into 'main'
...
make elementaltypes showdown identifiable for consistency
See merge request cable-mc/cobblemon!1688
2025-07-11 21:01:59 +00:00