Waldleufer
bf330c112b
Allowing any combination of Folder and File Name [skip-ci]
2024-04-10 21:47:26 +02:00
Waldleufer
e6a487dc52
Handling custom file name groupings and custom output folders in the public spawn writer [skip-ci]
2024-04-03 22:28:37 +02:00
Nick
30466a6063
Merge branch 'shifting-shadows' into 'main'
...
Scale shadows on sendout/recall
See merge request cable-mc/cobblemon!949
2024-04-02 18:50:13 +00:00
Mia
fd59b81bff
Scale shadows on sendout/recall
2024-04-02 18:50:13 +00:00
Paul
a37fdf709a
Fixed Inkay evo method. Fixes #787
2024-04-01 18:51:55 +10:00
Paul
5023f28d04
Fixed underwalking the target position leading to walking in place. Fixes #790
2024-04-01 18:40:57 +10:00
Hiroku
67de28386a
Merge branch 'ball-animation-changes' into 'main'
...
Breakout Animation, Overhauled Sendout Logic
See merge request cable-mc/cobblemon!943
2024-04-01 01:03:16 +00:00
Hiroku
cd37d3538e
Formatting
2024-04-01 00:39:38 +00:00
Hiroku
3d03ee5eb3
Merge branch 'gilded_chest_names' into 'main'
...
Preserve and display custom names for gilded chests
Closes #792
See merge request cable-mc/cobblemon!945
2024-03-31 12:11:57 +00:00
Paul
0b685ed453
Actually that one field is nullable
2024-03-31 21:47:10 +10:00
Hiroku
115e990df6
Update GildedChestBlock.kt
2024-03-31 10:19:16 +00:00
Hiroku
2ee38f0a29
Merge branch '1.5-Structures' into 'main'
...
fixed spelling error in gilded chest loot table
See merge request cable-mc/cobblemon!948
2024-03-31 10:18:03 +00:00
Slippy
756ef48ba2
coins are more common in sus blocks
2024-03-31 04:52:02 -05:00
Slippy
2c4df6622a
fixed spelling error in gilded chest loot table
2024-03-31 04:30:48 -05:00
Hiroku
425c41bc4b
Merge branch 'waterloggable-tumblestones' into 'main'
...
Make tumblestones waterloggable
Closes #793
See merge request cable-mc/cobblemon!946
2024-03-31 07:22:48 +00:00
Hiroku
9f7a99b583
Merge branch '1.5-Structures' into 'main'
...
1.5 structures
See merge request cable-mc/cobblemon!947
2024-03-31 07:22:22 +00:00
Slippy
f1213abdf4
candy adjustment
2024-03-31 01:04:02 -05:00
Slippy
9b1d847f59
added absorb bulb to some fossil loot tables
2024-03-31 00:09:28 -05:00
Slippy
bf900a0167
Just an enormous amount of changes to loot tables and structures
2024-03-30 23:57:54 -05:00
miasmus
d60d828e93
make tumblestones waterloggable
2024-03-30 23:00:08 -04:00
Slippy
703282eca1
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into 1.5-Structures
2024-03-30 19:39:12 -05:00
miasmus
5d7e6f6487
Preserve and display custom names for gilded chests
2024-03-30 19:38:38 -04:00
Hiroku
4e3e6405d0
Merge branch 'FossilMachineBalancing01' into 'main'
...
Fossil machine balancing01
See merge request cable-mc/cobblemon!944
2024-03-30 23:01:44 +00:00
JazzMcNade
1e161a52ee
Fixed an index out of bounds issue related to having a extreme excess of material in the tank
2024-03-30 02:27:04 -05:00
JazzMcNade
65b2204783
Decreased required material to 128 (from 256). Decreased restoration time to 12min (from 15min).
2024-03-30 02:14:06 -05:00
Flarkinater
76d9137ae4
Merge branch 'main' into ball-animation-changes
2024-03-29 22:09:21 -04:00
Flarkinater
9f6c44fd75
Sendout location is only shifted vertically when necessary
2024-03-29 22:08:40 -04:00
Flarkinater
6c086f5555
Fixed merge conflict goofs
2024-03-29 21:58:26 -04:00
Slippy
a9115bfb15
XL RCs are less common
2024-03-29 01:27:30 -05:00
Hiroku
f2c5113f0b
Merge branch 'json-addict' into 'main'
...
Advancement and Tag Updates
See merge request cable-mc/cobblemon!942
2024-03-29 05:31:33 +00:00
Hiroku
e29a2402e9
Merge branch 'spawning-gamerule-change' into 'main'
...
Move doPokemonSpawning gamerule logic
See merge request cable-mc/cobblemon!941
2024-03-29 05:30:53 +00:00
Hiroku
aa4857abbb
Merge branch 'Quick-Move-Stacked-PokePotion-Bases' into 'main'
...
Add the ability to quick move stacked PokePotion bases into Brewing Stands.
See merge request cable-mc/cobblemon!935
2024-03-29 05:29:13 +00:00
Hiroku
d29653233d
Merge branch 'main' into 'Quick-Move-Stacked-PokePotion-Bases'
...
# Conflicts:
# CHANGELOG.md
2024-03-29 05:28:22 +00:00
Hiroku
1b51a128d7
Merge branch 'OldAmberSpriteUpdate' into 'main'
...
Corrected Old Amber Sprite
See merge request cable-mc/cobblemon!939
2024-03-29 05:27:10 +00:00
Hiroku
245011cf5e
Merge branch '1.5-Structures' into 'main'
...
Oh boy that's a lot of changes and fixes to structures
See merge request cable-mc/cobblemon!940
2024-03-29 05:26:30 +00:00
Flarkinater
100bf7fee4
Merge remote-tracking branch 'origin/main' into ball-animation-changes
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
2024-03-29 00:05:58 -04:00
Flarkinater
be043a0ea1
Fixed minor issue with shifting Pokemon vertically during suffocation sendout check
2024-03-28 23:41:24 -04:00
Flarkinater
a902f4a8a3
Fixed suffocation avoidance when sending out Pokemon adjacent to a wall, other related fixes
2024-03-28 23:05:30 -04:00
Flarkinater
442f54839f
Improved spacing when targeting walls and above blocks
2024-03-28 22:09:41 -04:00
dhi_holo
20a97984a2
Misc Structures
...
Just a couple tags containing all structures not represented in a sub-tag, if someone wants to go in and make more tags to reduce the ones in here feel free, just make sure it adds up.
2024-03-29 10:54:10 +10:00
dhi_holo
d1517548bd
Update en_us.json
...
Gamerule Translation so it's not just a shitty string anymore
2024-03-29 10:09:22 +10:00
dhi_holo
3e1f9dc9b0
2 Shiny
...
Updated shiny icon for summary and advancement
2024-03-29 09:54:52 +10:00
miasmus
fd19e65f79
move doPokemonSpawing gamerule logic
2024-03-28 16:42:42 -04:00
dhi_holo
6b10d81bc8
Update en_us.json
...
Capital fixes because it wasn't right
2024-03-28 23:53:56 +10:00
dhi_holo
f3b9c03fc2
Advancement Updates
...
Reorgainised the advancements Healing Power, Consult the Fossil, and Free Roam: Enabled, renamed Tumbling Down to be correct, and changed the Shiny advancement to use Shiny icon.
2024-03-28 21:39:56 +10:00
Flarkinater
92653c1307
When targeting a wall, Pokemon are sent out far enough away to avoid suffocation, based on their size. Wailord rejoice!
2024-03-27 23:42:24 -04:00
Flarkinater
c372114da5
Improved avoidance of unsafe locations when sending out Pokemon
2024-03-27 23:26:07 -04:00
Slippy
2b95138c46
Oh boy that's a lot of changes and fixes to structures
2024-03-27 20:02:02 -05:00
JazzMcNade
864e6be461
Corrected Old Amber Sprite
2024-03-27 19:53:10 -05:00
Apion
c02fa1f85e
Merge branch '1.5-Drops-and-Fixes' into 'main'
...
New drops and some tag/script fixes.
See merge request cable-mc/cobblemon!938
2024-03-27 20:29:11 +00:00