Slippy
79423ef5ee
Prehistoric_Birch_Tree Fix
2024-03-23 22:13:07 -05:00
Slippy
0d377dcbe0
Changes, fixes, and balancing of 1.5 structures
2024-03-20 22:17:13 -05:00
Hiroku
8b81b13d01
Merge branch 'archaeology_fixup' into 'main'
...
Archaeology Fixup
See merge request cable-mc/cobblemon!925
2024-03-20 12:34:33 +00:00
JazzMcNade
9ac3a9249d
Added comparator output for the Gilded Chest
2024-03-20 00:49:56 -05:00
Lily
4f340b2eee
- Fixed a bug involving hoppers and Gimmighoul chests
...
- Fixed certain structures not generating
- Fixed certain loot tables failing to load
2024-03-19 17:15:32 -04:00
Hiroku
5cff52df5f
Merge branch 'archaeology' into 'main'
...
Merging Structure Tweaks for Playtesting
See merge request cable-mc/cobblemon!924
2024-03-18 06:38:20 +00:00
Slippy
27020d3068
Loot table changes for structures
2024-03-18 01:14:55 -05:00
Paul
3ac4b8622f
Merge remote-tracking branch 'origin/main' into 1.5-Spawns
2024-03-18 15:41:22 +10:00
Paul
acd7a0583c
Fixed Ekans line spawns, fixed season tag references for new locations
2024-03-18 15:35:28 +10:00
Nick
e341948bd4
Merge branch 'tooling-fixes' into 'main'
...
tooling: mark gradlew as executable & fix logs being created during unit tests
See merge request cable-mc/cobblemon!921
2024-03-18 04:24:22 +00:00
broccolai
1a465abf9d
tooling: mark gradlew as executable & fix logs being created during unit tests
2024-03-18 04:24:22 +00:00
Paul
e56a6e5b1a
Updated qwilfish and overqwil spawns
2024-03-18 14:03:53 +10:00
Paul
33d707a73b
Spawn fixes
2024-03-18 14:02:17 +10:00
Paul
e3c3cd380c
Merge remote-tracking branch 'origin/main' into 1.5-Spawns
...
# Conflicts:
# utilityscripts/cobblemon_drops_csv_to_json.py
2024-03-18 13:42:02 +10:00
Paul
460e8f7501
Fixed various Pokemon not being marked as implemented when they are, fixed Golem and Lairon legs moving in a hurry
2024-03-18 11:37:24 +10:00
Tyzillion
f73e631f81
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
2024-03-17 19:28:46 -04:00
Tyzillion
0ca0c1a552
hitboxes adjusted.
2024-03-17 19:26:34 -04:00
broccoli
7875006c8e
tooling: improve tests by properly bootstrapping minecraft
...
- uses the fabric-loader-junit build
- rewrites the SpawnValidator to use #getResource instead of code file paths
- create a junit extension to bootstrap easier
2024-03-17 21:13:45 +00:00
Slippy
67bb63b638
Well that didn't work at all...
2024-03-17 14:34:42 -05:00
Slippy
511f97b963
Fixed structures unintentionally generating in the oceans. Fixed structures unintentionally generating on the surface.
2024-03-17 13:15:31 -05:00
Hiroku
54202bed98
Merge branch 'BalancedFossils' into 'main'
...
Play test values for fossil machine
See merge request cable-mc/cobblemon!920
2024-03-17 08:55:46 +00:00
Paul
e6313cf4c5
Reverted partial run change
2024-03-17 16:44:56 +10:00
JazzMcNade
7debc6e047
Increased timings, increased required natural material, updated material values, increased quirk cooldown. Fixed bugs revealed upon changing these values
2024-03-16 22:37:16 -05:00
Tyzillion
bf9b69a143
Updated Dragonite, Omanyte, Omastar, and Pinsir animations.
2024-03-16 21:44:02 -04:00
Hiroku
d7f34972c1
Merge branch 'MoreHoldItems' into 'main'
...
more held items woah
See merge request cable-mc/cobblemon!918
2024-03-17 00:58:35 +00:00
Veraxiel
fa7356d2ed
Update to Ocean tag.
2024-03-16 18:10:07 -04:00
Lily
8d1f41919d
nvm eject button can go back in 👍 😄
2024-03-16 16:11:48 -04:00
Lily
b40c21d99e
pull eject pack and eject button since they brick battles
2024-03-16 16:07:35 -04:00
Lily
461d8bd282
more held items woah
2024-03-16 14:37:32 -04:00
Tyzillion
84d34709a3
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
2024-03-16 13:44:49 -04:00
Tyzillion
b6c04e8746
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
...
# Conflicts:
# common/src/main/resources/data/cobblemon/species/generation2/heracross.json
# common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json
# common/src/main/resources/data/cobblemon/species/generation5/lilligant.json
# common/src/main/resources/data/cobblemon/species/generation5/zoroark.json
# common/src/main/resources/data/cobblemon/species/generation6/floette.json
# common/src/main/resources/data/cobblemon/species/generation6/goodra.json
# common/src/main/resources/data/cobblemon/species/generation7/kommoo.json
# common/src/main/resources/data/cobblemon/species/generation7/lurantis.json
# common/src/main/resources/data/cobblemon/species/generation7/salazzle.json
# common/src/main/resources/data/cobblemon/species/generation8/copperajah.json
2024-03-16 13:43:31 -04:00
dhi_holo
724332dd34
Added structure tags (for /locate command)
...
The reason for these is primarily the /locate command, combining biome variants together so if you're just looking for a structure of a specific kind, but the biome doesn't matter, you don't have to deal with deciding which to search for.
2024-03-16 18:23:02 +10:00
Veraxiel
f5bfd64495
Added some more spawns.
2024-03-16 01:32:55 -04:00
dhi_holo
898fdf983f
Puffing Bells
...
Hisui Puff hopefully fixed, and soothe bell recipe cleaned up (so many errors)
Also added the newer tags to the lang
2024-03-16 14:32:20 +10:00
broccoli
564ced926c
fix: don't access entity in adjustNodeType
...
Mojang has disposed of the entity by this point, leading to a crash that's
especially noticed in the Wander goal.
2024-03-16 02:16:28 +00:00
Paul
a93dd14fd8
Fixed soothe bell recipe
2024-03-16 12:08:44 +10:00
Paul
f0535901cb
Fixed prepared transition animations not playing (lol)
2024-03-16 11:47:16 +10:00
Paul
7a42df591f
Merge remote-tracking branch 'origin/main' into implement_pokemon
...
# Conflicts:
# common/src/main/resources/assets/cobblemon/particles/snowstorm.json
# common/src/main/resources/data/cobblemon/species/generation2/heracross.json
# common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json
# common/src/main/resources/data/cobblemon/species/generation5/lilligant.json
# common/src/main/resources/data/cobblemon/species/generation5/zoroark.json
# common/src/main/resources/data/cobblemon/species/generation6/floette.json
# common/src/main/resources/data/cobblemon/species/generation6/goodra.json
# common/src/main/resources/data/cobblemon/species/generation7/kommoo.json
# common/src/main/resources/data/cobblemon/species/generation7/lurantis.json
# common/src/main/resources/data/cobblemon/species/generation7/salazzle.json
# common/src/main/resources/data/cobblemon/species/generation8/copperajah.json
2024-03-16 11:21:54 +10:00
Veraxiel
616419880f
Updated spawn files.
2024-03-15 16:45:09 -04:00
Slippy
9fa38430c0
Deleted old structure file
2024-03-15 13:42:25 -05:00
Slippy
26012278e7
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into archaeology
2024-03-15 13:35:42 -05:00
Slippy
2c0967d293
1.5 structures for real???
2024-03-15 13:04:00 -05:00
Veraxiel
447d35f28b
Updated tags. Added presets.
2024-03-15 05:47:07 -04:00
Hiroku
bf82def925
Merge branch 'MoreHoldItems' into 'main'
...
Implement more held items
See merge request cable-mc/cobblemon!905
2024-03-15 02:57:05 +00:00
Hiroku
dace364701
Merge branch 'FossilMachineHandWaggling' into 'main'
...
When using a pokeball, fossil, or natural material on the fossil machine the...
See merge request cable-mc/cobblemon!911
2024-03-15 02:49:31 +00:00
Lily
d737444ac9
Merge branch 'main' into MoreHoldItems
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
2024-03-14 21:43:54 -04:00
Hiroku
95f58ba557
Merge branch 'panning_for_gilded_chests' into 'main'
...
make gilded chests waterloggable
See merge request cable-mc/cobblemon!910
2024-03-15 01:28:56 +00:00
Hiroku
8993b007a5
Merge branch 'FossilMachineChunkLoadFix' into 'main'
...
Fossil machine chunk load fix
See merge request cable-mc/cobblemon!912
2024-03-15 01:28:04 +00:00
apion
eea7477f7f
More changes to how things work in unloaded chunks
2024-03-14 01:19:10 -05:00
JazzMcNade
241abd79d7
FossilMultiblock multiblock getter performance improvement for chunkloading issues
2024-03-14 01:19:10 -05:00