Plastered_Crab
|
df660329df
|
Merge branch '1.8.0' into sigma-pokemon
|
2026-04-03 08:17:22 -07:00 |
|
Test
|
0d33618e83
|
Merge branch '1.21.1-tm-fixes' into '1.8.0'
TM fixes, pokedex move screen updates
See merge request cable-mc/cobblemon!2191
|
2026-04-03 04:51:51 +00:00 |
|
Test
|
0803906f30
|
disk asset
|
2026-04-02 22:42:08 -04:00 |
|
Test
|
2c26046a3c
|
rmv unused method
|
2026-04-02 21:15:55 -04:00 |
|
Plastered_Crab
|
641c91d335
|
Merge branch '1.21.1-tm-fixes' into sigma-pokemon
|
2026-04-02 17:20:53 -07:00 |
|
Test
|
bdab3d04cb
|
update tinting, cluster hitboxes
|
2026-04-02 20:08:05 -04:00 |
|
Test
|
59488974d6
|
update tmm json
|
2026-04-01 22:52:48 -04:00 |
|
Test
|
3f0561456f
|
unused imports
|
2026-03-31 23:57:56 -04:00 |
|
Test
|
5279767829
|
merge
|
2026-03-31 23:52:26 -04:00 |
|
Test
|
e3f8aacd9e
|
Merge branch 'tmfix' into 1.21.1-tm-fixes
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/TypeGemClusterBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/tmmachine/TMMachineScreen.kt
|
2026-03-31 23:20:17 -04:00 |
|
Test
|
d381dd0d21
|
remove unnecessary TypeGemBlock, refactor monitor assets
|
2026-03-31 23:00:44 -04:00 |
|
Plastered_Crab
|
02f3d87bc6
|
Merge branch '1.21.1-tm-fixes' into sigma-pokemon
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TMMoveManager.kt
|
2026-03-31 13:40:43 -07:00 |
|
Plastered_Crab
|
2dad3c3197
|
Fix Type Gem Cluster bugs
|
2026-03-31 13:38:21 -07:00 |
|
Plastered_Crab
|
ea8e70d0fa
|
Fix Type Gem Cluster bugs
|
2026-03-31 13:36:01 -07:00 |
|
Plastered_Crab
|
64717be354
|
Add lang files for the Type Gem Blocks, Clusters and Deepslate Crystal Core
|
2026-03-31 11:34:13 -07:00 |
|
Plastered_Crab
|
bc9314b9d9
|
Add Baby Doll Eyes to TM list
|
2026-03-30 16:49:34 -07:00 |
|
Plastered_Crab
|
541f2dac40
|
Remove changes to TMMachineScreen about the Screensaver
|
2026-03-30 16:22:19 -07:00 |
|
Plastered_Crab
|
adba69c675
|
TM Machine visually shows disc in it if there is a TM in the output slot too
|
2026-03-30 16:08:27 -07:00 |
|
Plastered_Crab
|
ab831a2d9d
|
Default TMs now show in Move Dex as Unlocked
|
2026-03-30 16:07:58 -07:00 |
|
Plastered_Crab
|
faa939986a
|
TM Machine screensaver to kick in after 1 minute idling and goes away when moving the mouse
|
2026-03-30 15:32:53 -07:00 |
|
Plastered_Crab
|
b651bf1ded
|
Fix fully evolved pokemon not tracking unlocked moves as well as Discovered TM moves in the Pokedex Move Dex
|
2026-03-30 15:09:04 -07:00 |
|
Plastered_Crab
|
8eb77cfc97
|
Fix hitboxes of Type Gem Clusters
|
2026-03-30 14:50:11 -07:00 |
|
Jackson Bowes
|
5809b07443
|
Update 1.8 changelog for alphas
|
2026-03-30 11:11:42 -05:00 |
|
Jackson Bowes
|
3fb4ca05fe
|
Update file CHANGELOG-1.8.md
|
2026-03-30 10:55:28 -05:00 |
|
jackowes
|
19323143e5
|
swellow testing code be gone and mark change
|
2026-03-29 23:39:07 -05:00 |
|
jackowes
|
89de0c6392
|
it took me 3 hours to find this issue. Im and idiot
|
2026-03-29 21:51:09 -05:00 |
|
jackowes
|
ddddfec219
|
fix rider positioning and remove poseoffsets from all files and be explicit about the seat locator name in the json.
|
2026-03-29 19:32:48 -05:00 |
|
jackowes
|
b3c6d205ab
|
initial changes to allow for conditional seats. (test example with swellow. need to remember to remove it)
|
2026-03-29 16:55:04 -05:00 |
|
Plastered_Crab
|
b1e2eec156
|
Merge remote-tracking branch 'origin/sigma-pokemon' into sigma-pokemon
|
2026-03-27 16:30:32 -07:00 |
|
Plastered_Crab
|
46bb33a95f
|
Fix TM Move Manager to check for moveset of added mons
|
2026-03-27 16:30:07 -07:00 |
|
jackowes
|
39b169082c
|
Finalize alpha sizing. Fix alpha eye bloom rendering
|
2026-03-27 14:54:50 -05:00 |
|
Plastered_Crab
|
c13e9fb35d
|
Merge remote-tracking branch 'origin/sigma-pokemon' into sigma-pokemon
|
2026-03-27 08:21:21 -07:00 |
|
Plastered_Crab
|
5cc7dfa353
|
Alpha pokemon level matching uses stat boost particles now instead of test ones
|
2026-03-27 08:20:07 -07:00 |
|
jackowes
|
d4dab7b88a
|
fix foot sliding due to scaling
|
2026-03-26 18:48:40 -05:00 |
|
Plastered_Crab
|
6b697a7be1
|
Alphas spawn with 2 TM Moves instead of 4
|
2026-03-26 15:01:14 -07:00 |
|
Plastered_Crab
|
90fbe3be49
|
Merge remote-tracking branch 'origin/sigma-pokemon' into sigma-pokemon
|
2026-03-26 12:41:04 -07:00 |
|
Plastered_Crab
|
50dd1b154d
|
Change Shiny and ALpha rates on config for Honey and Fossil Machine
|
2026-03-26 12:40:38 -07:00 |
|
Tyzillion
|
ea3e389c41
|
Added alpha rewards tier lootpools and loot spawning molang functionality.
|
2026-03-26 00:18:14 -04:00 |
|
jackowes
|
10ed864325
|
Add in other eye effects and add in ride scale limiter
|
2026-03-25 23:08:01 -05:00 |
|
jackowes
|
0e9013c75e
|
alpha eye bloom. Needs work if its gonna be used
|
2026-03-25 22:39:46 -05:00 |
|
Polymeta
|
e54b22409a
|
Merge branch 'clamp-structure-height' into '1.8.0'
Allow Slippy to define a range in which the structure will spawn
See merge request cable-mc/cobblemon!2185
|
2026-03-25 23:20:08 +00:00 |
|
Plastered_Crab
|
65afff1c3c
|
Merge branch '1.8.0' into sigma-pokemon
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt
|
2026-03-25 15:54:14 -07:00 |
|
Plastered_Crab
|
230a2db160
|
Alpha Pokemon to spawn with 4 random TM moves from their learnset
|
2026-03-25 15:50:39 -07:00 |
|
Plastered_Crab
|
0fdadc90e8
|
Alpha Pokemon level matching to players does not go below the pokemon's min evolution requirement
|
2026-03-25 15:33:20 -07:00 |
|
MeAlam1
|
e03a3abe1d
|
Update CHANGELOG-1.8.md
|
2026-03-25 23:33:03 +01:00 |
|
MeAlam1
|
497f832995
|
Update StructureMixin.java
|
2026-03-25 23:29:42 +01:00 |
|
Plastered_Crab
|
ecd71fe077
|
Alpha pokemon do not get affected by baby scale
|
2026-03-25 14:09:24 -07:00 |
|
Plastered_Crab
|
9c5a04495d
|
Changes to herding system for alphas so they are prioritized
|
2026-03-25 14:01:11 -07:00 |
|
Plastered_Crab
|
6d3ddece03
|
Level Matching of Alphas based on nearest players
|
2026-03-25 11:30:31 -07:00 |
|
Plastered_Crab
|
99a0e83962
|
Added Shiny Chance and Alpha Chance to Honey Slathered Trees
|
2026-03-25 10:02:09 -07:00 |
|