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
|
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 |
|
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 |
|
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 |
|
Hiroku
|
8ee0d904ed
|
Merge branch '1.21.1-TMs' into '1.8.0'
Merge TMs into 1.8 FINALLY
See merge request cable-mc/cobblemon!1853
|
2026-03-25 11:24:07 +00:00 |
|
Paul
|
291196eda7
|
Removed unused mixin
|
2026-03-25 20:30:07 +10:00 |
|
Hiroku
|
b94e6d65b9
|
Merge branch '1.8.0' into '1.21.1-TMs'
# Conflicts:
# CHANGELOG-1.8.md
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/world/feature/CobblemonFeatures.kt
|
2026-03-25 10:23:42 +00:00 |
|
jackowes
|
60fdd3325e
|
remove duplicate registration
|
2026-03-22 17:26:41 -05:00 |
|
Paul
|
eedcdafcbe
|
Removed SpeciesLevel data file in favour of expanding the pokedex data
|
2026-03-22 14:46:44 +10:00 |
|
Paul
|
34595e01a9
|
Simplified some TM stuff
|
2026-03-21 22:33:29 +10:00 |
|
Paul
|
60b9ca7b7f
|
Fixed a lol woopsy
|
2026-03-21 19:21:07 +10:00 |
|
Paul
|
83aea117c6
|
TM bits of cleanup and some fixes
|
2026-03-21 16:52:56 +10:00 |
|
Plastered_Crab
|
78b348329c
|
Add more clusters to world genned type gem clusters
|
2026-03-17 19:17:35 -07:00 |
|
Plastered_Crab
|
b64013c995
|
Type Gem Cluster world gen fix
|
2026-03-17 18:30:13 -07:00 |
|
Plastered_Crab
|
85003c9829
|
Get TM Unlocking on Level Up working again - Needs review
|
2026-03-17 14:12:53 -07:00 |
|
Plastered_Crab
|
d9133e854a
|
Clean up TM move sync
|
2026-03-17 13:13:04 -07:00 |
|
Plastered_Crab
|
05afe191e6
|
Add new textures for Data Monitor screens
|
2026-03-10 15:24:57 -07:00 |
|
Plastered_Crab
|
e3b5067f31
|
Last Bug for the TM Machine squashed
|
2026-03-10 12:05:16 -07:00 |
|
Plastered_Crab
|
bfa2d470f0
|
remove a few config checks
|
2026-03-10 11:34:47 -07:00 |
|
Plastered_Crab
|
53c0b28deb
|
kill terablast
|
2026-03-10 11:33:59 -07:00 |
|
Plastered_Crab
|
5e9208d898
|
Fix small typos
|
2026-03-10 09:19:19 -07:00 |
|
Plastered_Crab
|
23a91ec2c9
|
Rescrape TMs to be current
|
2026-03-10 09:06:15 -07:00 |
|
Plastered_Crab
|
9998a328e3
|
Edit TM scraper
|
2026-03-10 09:02:38 -07:00 |
|
Plastered_Crab
|
9f07747cac
|
Cleanup Obtainment methods for TMs
|
2026-03-10 09:02:22 -07:00 |
|
Plastered_Crab
|
a7998bcec5
|
Cleanup Obtainment methods for TMs
|
2026-03-10 09:01:59 -07:00 |
|
Plastered_Crab
|
5983b29e9c
|
Added Changelog
|
2026-03-09 17:54:39 -07:00 |
|
Plastered_Crab
|
749f441913
|
Merge branch 'main' into 1.21.1-TMs
|
2026-03-09 17:41:11 -07:00 |
|
Plastered_Crab
|
dabbcceb9c
|
Add Configs for having TMs be infinite use
|
2026-03-09 17:08:24 -07:00 |
|
Plastered_Crab
|
11f8313fc3
|
Add Configs for unlocking all TM and Level Up Moves and for Pokedex and TM Machine
|
2026-03-09 14:27:27 -07:00 |
|
Plastered_Crab
|
32b813620b
|
Fix TM Machine Screen Back button to be more readable
|
2026-03-09 14:25:39 -07:00 |
|
Plastered_Crab
|
8147067b2e
|
Fix Disk Rack West / East interaction
|
2026-03-09 08:39:31 -07:00 |
|
Polymeta
|
f2d2ceb422
|
Merge branch 'patch-3' into 'main'
Fix incorrect spelling of "Pokémon" in some translation strings
See merge request cable-mc/cobblemon!2171
|
2026-03-08 21:35:45 +00:00 |
|
Micky
|
547ceae9ed
|
Fix incorrect spelling of "Pokémon" in some places
|
2026-03-08 17:52:43 +00:00 |
|
Plastered_Crab
|
24c6544e83
|
Sound Engine mixin to not have high octave pitches become flattened
|
2026-03-06 11:27:57 -08:00 |
|
Polymeta
|
a921d55812
|
fix campfirepot crash
|
2026-03-06 09:37:07 +00:00 |
|
Plastered_Crab
|
b422ee4d29
|
Disk Jockeyyyyyyyy
|
2026-03-05 14:41:56 -08:00 |
|
Plastered_Crab
|
a83867e153
|
When Data Monitor breaks it drops the stored disk, but not when moved by piston
|
2026-03-05 13:11:10 -08:00 |
|
Plastered_Crab
|
523973d2c0
|
Data monitor consumes the disk from player hand in Survival
|
2026-03-05 12:47:43 -08:00 |
|
Plastered_Crab
|
746160fa18
|
Disk Shelf works with Comparators and output a signal based on how many slots are filled
|
2026-03-05 12:06:05 -08:00 |
|