dhi_holo
70e49bbbdb
More Tweaks
...
Eject Pack was fixed at some point, so I readded the recipe, loaded dice was tweaked, and started tweaking the consumed tags
2025-05-03 16:06:42 +10:00
dhi_holo
39fce8ca06
Cupping
...
Cups are now craftable for real, too, praise the drinkingssiah
2025-05-03 15:21:50 +10:00
dhi_holo
d288fe46da
Replace Pot Recipes
...
They were weird, now they're slightly less weird and feel more reasonable imo
2025-05-03 14:47:16 +10:00
dhi_holo
cefc97320a
Merge branch 'main' into fossilized-improvement
2025-05-03 14:38:35 +10:00
Test
a2094677cd
update pot cook button
2025-05-03 00:12:26 -04:00
Polymeta
eae4eb5121
Merge branch 'E' into 'main'
...
🇪
See merge request cable-mc/cobblemon!1646
2025-05-02 08:33:44 +00:00
Test
ed3a008515
🇪
2025-05-02 08:33:43 +00:00
Polymeta
462074ce43
Merge branch 'sketch-copy-move-fix' into 'main'
...
Sketch copy move fix
Closes #1503
See merge request cable-mc/cobblemon!1645
2025-05-02 08:32:33 +00:00
Polymeta
d54a85aa68
Merge branch 'aprijuice-visual-tweaks' into 'main'
...
Aprijuice visual tweaks
See merge request cable-mc/cobblemon!1647
2025-05-02 08:32:14 +00:00
Plastered_Crab
bf8433f6e9
Aprijuice visual tweaks
2025-05-02 08:32:13 +00:00
dhi_holo
374fc44089
Fossil Analyzer Visual Tweak
...
the top texture is now good
2025-05-02 18:30:30 +10:00
dhi_holo
f7664a04db
L-L-L-Lava
...
Wrong brainrot, ah well, funny achievement as it should be
Also changed the advancement icon for the galar fossils so it isn't just the same as the regular fossil resurrection advancement
2025-05-02 17:47:25 +10:00
CeeJay
51b0f768a0
looks better capitalized
2025-05-01 21:52:10 -04:00
CeeJay
106e487035
changelog for sketch fix
2025-05-01 21:51:08 -04:00
dhi_holo
2d772f5bf7
Update resurrect_galar_fossil.json
...
Should make one issue of the advancement no longer present, but the advancement itself doesn't work, pls fix Moe
2025-05-02 09:26:23 +10:00
dhi_holo
63af1713b9
Merge branch 'main' into fossilized-improvement
2025-05-01 15:39:28 +10:00
dhi_holo
8fecb12829
Three and a fix or two
...
Added Metal Alloy, Scroll of Darkness, and Scroll of Waters
Changed instances of `Hearty_Grains` to `HEARTY_GRAINS` to match conventions
Changed the Kings Rock wearable model to Gest's plane version
2025-05-01 15:15:26 +10:00
dhi_holo
d0b50a1ee0
Sprites!
...
Clear Amulet, Grip Claw, Lagging Tail, and Luminous Moss now have sprites! Praise Vera!
2025-05-01 13:45:41 +10:00
CeeJay
2ecbe28c87
remove extra line Fixes #1503
2025-04-30 21:48:12 -04:00
Polymeta
80112e0b70
pokemon can use flying pose again
...
Closes #1553
2025-05-01 00:05:38 +00:00
CeeJay
f776542365
regex to capture special characters along with spaces in sketch copying move
2025-04-29 23:39:41 -04:00
Polymeta
045ca3a07f
Merge branch 'sterr/silence' into 'main'
...
Pokemon no longer make sounds as they're being sent out and now respect silent nbt
See merge request cable-mc/cobblemon!1644
2025-04-29 16:04:25 +00:00
dhi_holo
a71bad07bd
One. Year. Later.
...
Re-enabled the commented out held items, which almost resolves #1548 , as they are still awaiting textures. But, I wanted to work with jsons, so this commit was made.
I also cleaned up/improved some recipe advancement jsons to be more accurate when reasonable
2025-04-29 20:37:22 +10:00
Sterrezo
2085f12fef
Pokemon no longer make sounds as they're being sent out and now respect silent nbt
2025-04-29 02:08:17 +02:00
Polymeta
36c4ea3b1a
Merge branch 'advancing' into 'main'
...
Advancement conformity and clarity
See merge request cable-mc/cobblemon!1642
2025-04-28 14:25:26 +00:00
MoeBoy76
804ad75ede
migrate missed advancements to use species tag
2025-04-28 22:40:52 +10:00
MoeBoy76
be11568041
fixed broken advancement and exta criterion that was missed, corrected changelog typo
2025-04-28 20:50:54 +10:00
MoeBoy76
8ad54287e4
advancement changes changelog
2025-04-28 08:55:02 +10:00
MoeBoy76
179d90d482
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into advancing
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CastPokeRodCriterionCondition.kt
# common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/ReelInPokemonCriterionCondition.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PokerodItem.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json
2025-04-28 08:43:07 +10:00
Hiroku
c3fb661f49
Merge branch 'smarterer-pokemons' into 'main'
...
What if Pokémon had brains?
See merge request cable-mc/cobblemon!1611
2025-04-27 09:47:35 +00:00
Paul
dccffe311f
Cleanup in a few task configs
2025-04-27 19:06:39 +10:00
Paul
d7d8d766d1
Improved starting checks on wander tasks when the wander chance is a constant or variable reference
2025-04-27 17:01:45 +10:00
Paul
54b2cc0a59
Added permission node for seeing hidden NPCs
2025-04-27 17:01:19 +10:00
Paul
62696931df
Fixed implemented list being doubled up
2025-04-27 16:57:45 +10:00
Paul
bfc7f83e07
Merge remote-tracking branch 'origin/main' into smarterer-pokemons
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/entity/npc/NPCEntity.kt
2025-04-27 14:16:02 +10:00
Hiroku
db573455ea
Merge branch 'cross-dimensional-packets' into 'main'
...
Prevent Cross Dimensional Packets
See merge request cable-mc/cobblemon!1630
2025-04-27 00:06:22 +00:00
Hiroku
3af002a39c
Changelog
2025-04-26 23:55:04 +00:00
Polymeta
a15c44325d
Merge branch 'riding-error-handling' into 'main'
...
Fail gracefully on riding deserialization errors
See merge request cable-mc/cobblemon!1639
2025-04-26 22:07:06 +00:00
Apion
33fc67ed58
Merge branch 'npc-gibberspeak' into 'main'
...
NPC gibberish
See merge request cable-mc/cobblemon!1616
2025-04-26 21:22:22 +00:00
Apion
b9f2bcc3a3
Fix missing import causing compile error
2025-04-26 17:10:59 -04:00
Apion
8a5a88b4f1
Merge branch 'particle-reorg' into 'main'
...
𝕿𝖍𝖊 𝕲𝖗𝖊𝖆𝖙 𝕻𝖆𝖗𝖙𝖎𝖈𝖑𝖊 𝕽𝖊𝖔𝖗𝖌 𝖔𝖋 2025
See merge request cable-mc/cobblemon!1627
2025-04-26 21:01:01 +00:00
Apion
af6b1190c1
Merge branch 'main' into npc-gibberspeak
...
# Conflicts:
# common/src/main/resources/cobblemon-common.accesswidener
# common/src/main/resources/mixins.cobblemon-common.json
2025-04-26 16:37:58 -04:00
Apion
7f0a6d4d48
Merge branch 'no-rolling' into 'main'
...
Option to disable rolling is now functional. I would not use this on anything...
See merge request cable-mc/cobblemon!1592
2025-04-26 20:22:15 +00:00
Apion
d7e4298a91
Fix compile error from flashback MR
2025-04-26 15:42:44 -04:00
Landon Wills
923b4e4266
Change from throwing exception to logging warning when we fail to deserialize riding behaviour
2025-04-26 12:08:33 -04:00
Hiroku
30f82bbad6
Merge branch 'flashback-compat' into 'main'
...
Fix flashback crash
See merge request cable-mc/cobblemon!1629
2025-04-26 07:45:13 +00:00
Hiroku
1823eb4979
Merge branch 'npc-stealth' into 'main'
...
[molang] easy access npc hiding
See merge request cable-mc/cobblemon!1573
2025-04-26 04:09:36 +00:00
Apion
ae4af68797
Fix compile errors
2025-04-25 21:55:26 -04:00
Polymeta
da7f4a2682
Merge branch 'oopsies-fix-cake-texture' into 'main'
...
Add new cooking pot recipes, fix EV yield berry effects, fix other recipes,...
See merge request cable-mc/cobblemon!1637
2025-04-25 22:27:50 +00:00
Polymeta
73c4762801
Merge branch 'new-recipes-fix-recipes-fix-baits-color-cakes' into 'main'
...
Add new cooking pot recipes, fix EV yield berry effects, fix other recipes,...
See merge request cable-mc/cobblemon!1636
2025-04-25 21:21:49 +00:00