Guilherme Pereira
c86103fd31
add player edible cake
2025-01-20 18:49:18 -03:00
Plastered_Crab
5190bbe723
Prep for adding new cooking recipe items
2025-01-18 22:08:16 -08:00
Plastered_Crab
3663ce2555
Merge remote-tracking branch 'origin/we_are_cooking_now' into we_are_cooking_now
2025-01-18 15:00:46 -08:00
Plastered_Crab
b5fc52d9b1
Merge branch 'main' into we_are_cooking_now
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonBlockTags.kt
# common/src/main/resources/data/cobblemon/recipe/cooking_pot/whipped_dream_from_cooking_pot.json
# common/src/main/resources/data/minecraft/tags/block/logs.json
# common/src/main/resources/data/minecraft/tags/item/logs.json
# common/src/main/resources/data/minecraft/tags/item/logs_that_burn.json
2025-01-18 14:59:52 -08:00
Paul
30a3d6ed83
Updated drops, fixed drops script
2025-01-18 20:02:04 +10:00
Hiroku
761b306590
Merge branch 'implement_pokemon' into 'main'
...
Pokemon Implementation
Closes #1230 and #1137
See merge request cable-mc/cobblemon!1472
2025-01-18 04:22:13 +00:00
GenotypeXD-Dev
f5267c832f
Add implemented tag to rufflet/Dewpider lines
2025-01-17 20:44:23 -07:00
GenotypeXD-Dev
7f6e0c0377
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
...
# Conflicts:
# common/src/main/resources/data/cobblemon/species/generation5/braviary.json
# common/src/main/resources/data/cobblemon/species/generation5/rufflet.json
# common/src/main/resources/data/cobblemon/species/generation7/araquanid.json
# common/src/main/resources/data/cobblemon/species/generation7/dewpider.json
2025-01-17 20:41:58 -07:00
GenotypeXD-Dev
420d42b36d
Added implemented tag to rufflet/Dewpider lines
2025-01-17 20:39:02 -07:00
Tyzillion
a45028d83b
Palean Tauros < Paldean Tauros
2025-01-17 22:23:42 -05:00
Tyzillion
76ab7e998b
Removed duplicate category on changelog.
2025-01-17 22:20:35 -05:00
Tyzillion
cbbfa974aa
Updated Changelog and merged main to branch.
2025-01-17 22:16:08 -05:00
Tyzillion
9dc6649eb7
Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into implement_pokemon
...
# Conflicts:
# common/src/main/resources/data/cobblemon/dex_entries/pokemon/galar/dubwool.json
# common/src/main/resources/data/cobblemon/species/generation5/petilil.json
# common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json
# common/src/main/resources/data/cobblemon/species/generation9/palafin.json
2025-01-17 22:13:08 -05:00
Tyzillion
97ef0dda0a
Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon
2025-01-17 21:53:23 -05:00
Hiroku
71334dc889
Merge branch 'lion-eats-bugs' into 'main'
...
Small fixes
Closes #1198
See merge request cable-mc/cobblemon!1471
2025-01-17 23:49:58 +00:00
lion
4d8c4b1d7b
Small fixes
2025-01-17 23:49:58 +00:00
Hiroku
0701380a36
Merge branch 'the_great_scraper_migration' into 'implement_pokemon'
...
Migrate species data to accurate sourcing (and fixes)
See merge request cable-mc/cobblemon!1452
2025-01-17 23:47:25 +00:00
Konoha
2b03e5660e
Nicely asking the giant centipede not to crush me in my sleep.
2025-01-17 18:08:11 -05:00
Konoha
b44a53efce
Merge branch 'implement_pokemon' into the_great_scraper_migration
...
# Conflicts:
# common/src/main/resources/data/cobblemon/species/generation1/golem.json
# common/src/main/resources/data/cobblemon/species/generation1/graveler.json
# common/src/main/resources/data/cobblemon/species/generation5/braviary.json
# common/src/main/resources/data/cobblemon/species/generation5/rufflet.json
# common/src/main/resources/data/cobblemon/species/generation5/sandile.json
# common/src/main/resources/data/cobblemon/species/generation7/araquanid.json
# common/src/main/resources/data/cobblemon/species/generation7/dewpider.json
2025-01-17 17:58:55 -05:00
Konoha
5678776938
Restricted label for competitive rules.
2025-01-17 16:49:42 -05:00
Konoha
f3985d8250
Refactors form moves back to form_change.
...
Adds the Pink Flower as a dex variation.
Re-adds alternate "striped" key for "fish_stripes"
Corrects scraper generated sweet_decoration back to just decoration
2025-01-17 16:30:16 -05:00
Konoha
b497c603ca
Re-runs the scrape against latest implementation.
...
Implements Delibird and dex variation for Mooshtank.
2025-01-17 15:23:58 -05:00
Konoha
b9807773ee
Merge branch 'refs/heads/implement_pokemon' into the_great_scraper_migration
...
# Conflicts:
# common/src/main/resources/data/cobblemon/species/generation1/snorlax.json
# common/src/main/resources/data/cobblemon/species/generation1/tauros.json
# common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json
# common/src/main/resources/data/cobblemon/species/generation4/munchlax.json
# common/src/main/resources/data/cobblemon/species/generation4/piplup.json
# common/src/main/resources/data/cobblemon/species/generation5/accelgor.json
# common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json
# common/src/main/resources/data/cobblemon/species/generation5/ducklett.json
# common/src/main/resources/data/cobblemon/species/generation5/escavalier.json
# common/src/main/resources/data/cobblemon/species/generation5/karrablast.json
# common/src/main/resources/data/cobblemon/species/generation5/shelmet.json
# common/src/main/resources/data/cobblemon/species/generation5/swanna.json
# common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json
# common/src/main/resources/data/cobblemon/species/generation6/binacle.json
# common/src/main/resources/data/cobblemon/species/generation8/kubfu.json
# common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json
# common/src/main/resources/data/cobblemon/species/generation9/armarouge.json
# common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json
# common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json
# common/src/main/resources/data/cobblemon/species_feature_assignments/tauros_bull_breed.json
# common/src/main/resources/data/cobblemon/species_features/bull_breed.json
2025-01-17 13:20:34 -05:00
Guilherme Pereira
ca79b70815
add shapes to lure cakes
2025-01-17 13:05:37 -03:00
Hiroku
aba02d7b53
Merge branch 'youre-telling-me-theres-a-second-loader-worth-of-tags' into 'main'
...
Tag Changes (Everything)
Closes #1350
See merge request cable-mc/cobblemon!1464
2025-01-17 09:19:42 +00:00
Hiroku
0eef30af4a
Merge branch 'fix-pasture-overlap-when-draggin-pokemon' into 'main'
...
Fix pasture overlap when dragging Pokémon on PC
See merge request cable-mc/cobblemon!1469
2025-01-17 06:44:53 +00:00
pv
3a064c7269
Merge branch cobblemon:main into fix-pasture-overlap-when-draggin-pokemon
2025-01-17 05:58:14 +00:00
Luan Nadaletti
1cece70687
fix Pasture overlap being overlapped from selected Pokemon
2025-01-17 02:56:24 -03:00
dhi_holo
c2d85df3e0
Merge branch 'main' into youre-telling-me-theres-a-second-loader-worth-of-tags
2025-01-17 11:04:36 +10:00
dhi_holo
a7c0242575
Update CobblemonItemTags.kt
...
I don't get how that got there, legitimately. Only idea I have is when I auto-pilot typed in createTag (which is what the block file uses) while doing the items, it auto-imported it.
2025-01-17 11:04:29 +10:00
Hiroku
97a7554e79
Merge branch 'hanging-in-there' into 'main'
...
Close Combat Crossover Collab... Paintings
Closes #853
See merge request cable-mc/cobblemon!1466
2025-01-16 22:52:06 +00:00
Hiroku
77108ae687
Merge branch 'fix-karrablast-trade-evolution' into 'main'
...
Fix Karrablast trade evolution
See merge request cable-mc/cobblemon!1465
2025-01-16 22:30:34 +00:00
lion
413271546f
Fix Karrablast trade evolution
2025-01-16 22:30:34 +00:00
Hiroku
75e3c4be7a
Merge branch 'fortunate-tweaking' into 'main'
...
Breaking Crop Improvements
See merge request cable-mc/cobblemon!1467
2025-01-16 22:26:04 +00:00
Hiroku
7891347d90
Merge branch 'fix-fast-ball-capture-rate' into 'main'
...
Fix Fast Ball capture rate ignoring Pokémon stat
Closes #1352
See merge request cable-mc/cobblemon!1468
2025-01-16 21:37:51 +00:00
Luan Nadaletti
0a9b1c5c97
fix fast ball capture rate
2025-01-16 17:39:46 -03:00
Guilherme Pereira
898c956f17
add rendering for the inner part of the cake
2025-01-16 17:01:37 -03:00
Guilherme Pereira
2ce48c9dff
add custom lure cake color based on seasonings
2025-01-16 10:36:33 -03:00
dhi_holo
89d86aa6e3
Probably Pointless
...
Updated the block and item tag kt files to be up to date with all current tags, not touching biome stuff because I don't want to process that, I don't *think* there's a reason for me to make sure it's all referenced, but I was thinking it over, and it's better safe than having addon mod devs shouting at me in 7 months when the list is twice as long or something. Probably.
2025-01-16 21:47:41 +10:00
dhi_holo
fd45dacad2
Update CHANGELOG.md
...
no other crops needed tweaking after investigation, so reworded and finalized
2025-01-16 21:01:47 +10:00
dhi_holo
a336f0968a
Fortunate Mints
...
Mint seeds can drop a couple more with fortune, cleaned up the loot tables a touch
2025-01-16 20:21:41 +10:00
Guilherme Pereira
f64ec12a6a
update licenses
2025-01-15 19:55:56 -03:00
Guilherme Pereira
474d3f3b55
add campfire pot bubbles color
2025-01-15 19:54:26 -03:00
dhi_holo
9d6ae6952c
Pick Up Your Berries!
...
Breaking any age 0 berries will drop their item again
2025-01-16 08:53:24 +10:00
Guilherme Pereira
c87e6a391d
refactor cooking pot renderer
2025-01-15 18:34:43 -03:00
Guilherme Pereira
192fd4dba7
make campfire pot bubbles disapear on lid close
2025-01-15 17:22:10 -03:00
dhi_holo
19c6f98ea4
Phase 1: Proof of Concept
...
Oran Berries now drop themselves when broken at growth age 0
Tomorrow, the other 68 berries.
2025-01-15 23:28:49 +10:00
Carmendar
dbc1674416
Added new anims for the Sandile line (Extra sandy!), and fixed Slaking's portrait.
2025-01-15 00:56:14 -06:00
dhi_holo
3e8c0ed14e
Finally, we have them all
...
Closes #853 after 7 months of having it on my to-do list. Happy Crossovers!
2025-01-15 16:35:21 +10:00
GenotypeXD-Dev
5f8ee45f1e
Added Flight/Swim behavior to Rufflet/Dewpider lines
2025-01-14 22:34:42 -07:00
Guilherme Pereira
Plastered_Crab
Paul
GenotypeXD-Dev
Tyzillion
Konoha
pv
dhi_holo
Carmendar