Commit Graph
7060 Commits
Author SHA1 Message Date
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
GenotypeXD-Dev f5267c832f Add implemented tag to rufflet/Dewpider lines 2025-01-17 20:44:23 -07: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
lion 4d8c4b1d7b Small fixes 2025-01-17 23:49:58 +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
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
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 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
plastered_crab c26786c644 Put water back to how it was 2025-01-14 21:19:22 -08:00
GenotypeXD-Dev 5f3e1fb395 Implement Rufflet and Braviary 2025-01-14 20:29:55 -07:00
GenotypeXD-Dev 4befb0a16a Implement Dewpider and Araquanid 2025-01-14 20:18:11 -07:00
RedGenesectNinja aab55966a8 Fixed Foongus and Amoonguss not using shiny textures when shiny 2025-01-14 20:03:35 -06:00
Plastered_Crab ebb0277d80 Merge remote-tracking branch 'origin/we_are_cooking_now' into we_are_cooking_now
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/CampfireBlockEntityRenderer.kt
2025-01-14 17:20:34 -08:00
Plastered_Crab 2a73efa479 Create custom render type to allow Cooking Pot water pane to show particles through it (wip) 2025-01-14 17:19:53 -08:00
Guilherme Pereira 6e68d22d4a update campfire pot models (again) 2025-01-14 20:39:49 -03:00
Guilherme Pereira dee08e6572 fix cooking pot rotation 2025-01-14 18:38:34 -03:00
Guilherme Pereira 2383686e42 update campfire pot models 2025-01-14 17:54:16 -03:00
Guilherme Pereira b8de9c415e Merge branch 'we_are_cooking_now' of gitlab.com:cable-mc/cobblemon into we_are_cooking_now 2025-01-14 16:59:09 -03:00
Guilherme Pereira f0269a3638 fix cooking pot items not being properly synched with the client 2025-01-14 16:58:54 -03:00
Plastered_Crab dbbbd309dc Added TransparentColorMixer method 2025-01-14 11:06:07 -08:00