Polymeta
f287dde994
more rendering fixes
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-27 15:34:38 +00:00
Polymeta
f33c35ea43
more cleanup and fixing some of the dex displays
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-27 14:45:52 +00:00
Polymeta
e5acbe86c6
I'm going to need you to show some context
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-27 10:22:22 +00:00
Polymeta
271ae37e5b
you were not to be seen here
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-27 09:54:30 +00:00
Polymeta
004f0a50e8
TMs are now proper recipes
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-27 09:54:20 +00:00
Polymeta
348ecd0be2
clean up fishing rod rendering and have it display correct model
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-26 12:09:48 +00:00
Polymeta
8691bb4a05
fix some battle buttons not working
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-26 12:05:53 +00:00
Polymeta
e4ad12ddcf
dex entries stop complaining
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-26 12:05:21 +00:00
Polymeta
8b11fb7150
pokeball can be thrown again
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-26 12:04:58 +00:00
Polymeta
0223702f9d
display correct model in display case
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-25 17:10:37 +00:00
Polymeta
eaad6c18ab
TMs display properly again
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-25 12:07:25 +00:00
dhi_holo
627f3e3023
small model fixes
...
Fixes our 2 tall blocks in a shelf and added easter egg to campfire pots
2026-10-25 14:47:01 +10:00
dhi_holo
c408247bd4
Update DisplayCaseRenderer.kt
...
scaling is now pretty solid defaults
2026-10-25 13:05:13 +10:00
dhi_holo
ee7eafab72
Update technical_machine.json
2026-10-25 12:01:05 +10:00
dhi_holo
4d22a54507
Merge branch 'feature/version-bump' of https://gitlab.com/cable-mc/cobblemon into feature/version-bump
2026-10-25 11:51:16 +10:00
Polymeta
5012181fcd
licenses
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-25 00:28:11 +01:00
Polymeta
edd96ca426
new item model selector tm moves -> move type
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-25 00:10:26 +01:00
dhi_holo
9cefbb81a7
Update DisplayCaseRenderer.kt
...
Trying to improve the logic and make things a bit more consistent across the board
Current potential problems:
- Item Sprites do render a touch smaller than they maybe could be rendering
- Items with custom models (for example, Pokedexes) are a bit more complex (preferred solution: something on the items json side, rather than hardcoded into the display case rendering)
- Some way to let items without innate model stuff render unique models (like the relic coin pouch used to do, but resource pack driven)
2026-10-24 15:51:22 +10:00
dhi_holo
a0eb40d796
Recipe Fixes
2026-10-23 22:14:57 +10:00
dhi_holo
2f9f00c8e3
First Wave Data Folder Fixes
...
Basic fixes for advancements, some mod compat file fixes, and the inbuilt resource packs are now listed as compatible
2026-10-23 21:32:14 +10:00
dhi_holo
0c927854fd
Lang Fix
2026-10-23 20:43:25 +10:00
dhi_holo
d023fb8139
Items are Items, even when they're blocks
...
Fixes lang up a bit
2026-10-23 20:31:01 +10:00
dhi_holo
620deaa40b
Item Rendering
...
Items now all* render properly, and blocks are changed to match how they are in vanilla as of the modern changes
Also fixed a couple block renderings
(*Technical Machines are a beast so more designwork is needed there)
2026-10-23 20:19:59 +10:00
dhi_holo
541346095c
Facedex
...
Forgot this display context actually does have something for it
2026-10-23 12:37:55 +10:00
dhi_holo
d63c60e311
Pokedex First Person Fix
...
Didn't get a chance to double check first person after removing the mixin because I pulled the upstream changes and it broke stuff, this fixes the dex
2026-10-23 12:37:54 +10:00
dhi_holo
54d854f009
Poke Ball Gutting
...
Replacing the Poke Ball rendering with that of Minecraft's improved item system, as well as removed unneeded `items` files for variant models already covered by the remaining files
Pokedexes are also partially converted, with the lectern rendering being wrong (not sure how to properly fix that, may need to bring the original coder for the lectern in for that)
2026-10-23 10:51:15 +10:00
Polymeta
2fb8f798f1
fix world crashing from habitatblocks
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-22 16:22:42 +01:00
Polymeta
02e1e0157b
loom 1.17
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-22 14:02:22 +01:00
Polymeta
ccbd7ea6e3
neoforge is so back too now
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-22 13:38:20 +01:00
dhi_holo
6b24bf5cae
Wearable Fixes
...
All Wearable Items now can be equipped properly, and render their correct models in the correct contexts. More may be done here in future, but it works and that was the goal
2026-10-22 18:43:29 +10:00
Polymeta
0f65a986ed
WE ARE SO BACK
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-21 17:04:54 +01:00
Polymeta
2ef169e43d
we are going to be here for a while
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-20 15:45:20 +01:00
Polymeta
65fc9e63dd
I can see the light
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-20 00:08:48 +01:00
Polymeta
7e4252c699
THE VOICES IN MY HEADDDDDD
...
Signed-off-by: Polymeta <4726322-Polymeta@users.noreply.gitlab.com >
2026-10-19 17:08:22 +01:00
Polymeta
1ac83162ea
Merge branch 'main' into feature/version-bump
...
# Conflicts:
# common/build.gradle.kts
# common/src/main/java/com/cobblemon/mod/common/mixin/BeeEntityMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/ChunkStorageMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/ClientPacketListenerMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/PlayerMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/ServerEntityMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/ServerPlayerMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/StructureMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/client/ClientRecipeBookMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/client/HumanoidModelMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemInHandRendererMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemRendererMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/client/ModelLoaderMixin.java
# common/src/main/java/com/cobblemon/mod/common/mixin/client/RecipeBookComponentMixin.java
# common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlockEntities.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonImplementation.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItemComponents.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PlantTumblestoneCriterionCondition.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/effects/CleanseAllEffect.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/effects/CleanseNegativeEffect.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/data/ClientDataSynchronizer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/data/ServerJsonDataRegistry.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/events/entity/SpawnBucketChosenEvent.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/events/entity/SpawnEvent.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/events/fishing/BobberBucketChosenEvent.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/gui/ParentWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteraction.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteractions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/item/PokemonSelectingItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Moves.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClasses.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPresets.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/permission/CobblemonPermissions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/AbstractPokedexManager.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/Dexes.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexValueCalculator.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/SpeciesDexRecord.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/entry/DexEntries.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/filter/SearchFilter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonSpecies.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/aspect/AspectParticleMap.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/ChoiceSpeciesFeatureProvider.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/Learnset.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/requirement/Requirement.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/riding/Seat.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMaterials.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/SpawnBucket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/SpawnDetailPresets.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/TimeRange.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/MoonPhase.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningPrecalculation.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/influence/SpawningInfluence.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/influence/detector/GrottoBlockDetector.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/selection/SpawningSelector.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/Spawner.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/PokemonStore.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreManager.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreTypes.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/toast/Toast.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/types/ElementalType.kt
# common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleRules.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/GrowableStoneBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/PlaqueBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/SaccharineLeafBlock.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilMultiblockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokeSnackBlockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/entity/TintBlockEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/ClientMoLangFunctions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PartyOverlay.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PokemonGuiUtils.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/config/variable/CobblemonConfigVariable.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/moveselect/MoveSlotButton.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/party/PartyTutorialToasts.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/PokedexGUI.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/PokedexTooltip.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/EntriesScrollingWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/InfoTextScrollWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/PokemonInfoWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/startselection/StarterSelectionScreen.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/startselection/widgets/CategoryList.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/ModelWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/info/InfoWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/moves/MoveSlotWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/stats/StatWidget.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/toast/CobblemonToast.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/gui/toast/ToastTracker.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/CalculateSeatPositionsHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/RenderHelper.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/layer/PokemonOnShoulderRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JellicentModel.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/player/MountedPlayerRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/render/shader/CobblemonShaders.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/tooltips/SeasoningTooltipHelper.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/CalculateSeatPositionCommand.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnAllPokemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemon.kt
# common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/events/PokedexHandler.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/MedicinalLeekItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/RegionalFoodItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/WearableItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/EVIncreaseItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/FeatherItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/MochiItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PPUpItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/SinisterTeaItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/VitaminItem.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/pc/OpenPCPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/toast/ToastPacket.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/FormData.kt
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/adapters/LegacyItemConditionWrapperAdapter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/CodecBackedAdapter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/IdentifierAdapter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/IntRangesAdapter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/RegistryOpsProvider.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/SpawnBucketAdapter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP3.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/PokemonP3.kt
# common/src/main/kotlin/com/cobblemon/mod/common/util/math/QuaternionUtils.kt
# common/src/main/kotlin/com/cobblemon/mod/common/world/gamerules/CobblemonGameRules.kt
# common/src/main/resources/assets/cobblemon/models/item/relic_coin_pouch_case.json
# common/src/main/resources/assets/cobblemon/shaders/core/particle_cutout.fsh
# common/src/main/resources/cobblemon-common.accesswidener
# common/src/main/resources/data/cobblemon/advancement/catching/first_shiny_catch.json
# common/src/main/resources/data/cobblemon/recipe/blunder_policy.json
# common/src/main/resources/data/cobblemon/recipe/bright_powder.json
# common/src/main/resources/data/cobblemon/recipe/cake_with_moomoo_milk.json
# common/src/main/resources/data/cobblemon/recipe/dawn_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/dawn_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/dubious_disc.json
# common/src/main/resources/data/cobblemon/recipe/dusk_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/dusk_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/fire_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/fire_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/focus_sash.json
# common/src/main/resources/data/cobblemon/recipe/galarica_cuff.json
# common/src/main/resources/data/cobblemon/recipe/galarica_wreath.json
# common/src/main/resources/data/cobblemon/recipe/gold_nugget_from_blasting_coin.json
# common/src/main/resources/data/cobblemon/recipe/gold_nugget_from_smelting_coin.json
# common/src/main/resources/data/cobblemon/recipe/hard_stone.json
# common/src/main/resources/data/cobblemon/recipe/heal_powder.json
# common/src/main/resources/data/cobblemon/recipe/ice_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/ice_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/leaf_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/leaf_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/moon_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/moon_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/never_melt_ice.json
# common/src/main/resources/data/cobblemon/recipe/remedy.json
# common/src/main/resources/data/cobblemon/recipe/shiny_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/shiny_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/sun_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/sun_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/thunder_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/thunder_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/upgrade.json
# common/src/main/resources/data/cobblemon/recipe/water_stone_block.json
# common/src/main/resources/data/cobblemon/recipe/water_stone_from_block.json
# common/src/main/resources/data/cobblemon/recipe/weakness_policy.json
# common/src/main/resources/mixins.cobblemon-common.json
# fabric/src/main/java/com/cobblemon/mod/fabric/mixin/RecipeBookCategoriesMixin.java
# fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt
# fabric/src/main/resources/mixins.cobblemon-fabric.json
# gradle.properties
# gradle/build-logic/build.gradle.kts
# gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts
# gradle/build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts
# gradle/build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts
# gradle/libs.versions.toml
# neoforge/build.gradle.kts
# neoforge/src/main/java/com/cobblemon/mod/neoforge/mixin/client/ScreenMixin.java
# neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonEnumExtensions.kt
# neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt
# neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/CobblemonNeoForgeClient.kt
# neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/NeoForgeClientPlatformEventHandler.kt
# neoforge/src/main/resources/mixins.cobblemon-neoforge.json
2026-10-19 16:38:38 +01:00
Polymeta
f9dd1448e5
Merge branch 'item-2072' into 'main'
...
Added tab completion for the alpha property and three missing property aliases
Closes #2072
See merge request cable-mc/cobblemon!2388
2026-10-18 22:33:30 +00:00
Gitoido
ecf5d57ad2
chore: resolve conflicts
...
# Conflicts:
# common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt
2026-10-18 22:16:27 +00:00
Polymeta
8663888abc
Merge branch 'item-2013' into 'main'
...
Fixed GUI Pokémon cries playing on the Master category instead of Friendly Creatures
Closes #2013
See merge request cable-mc/cobblemon!2389
2026-10-18 22:14:04 +00:00
Polymeta
f452cd9a05
Merge branch 'fix/ride-interact-checks' into 'main'
...
fix: stricter riding checks on server side
Closes #2124
See merge request cable-mc/cobblemon!2499
2026-10-18 22:12:19 +00:00
Kiritiop
4fe9cd7fd6
Fixed GUI pokemon cries using the Master volume slider instead of Friendly Creatures, added a new file to prevent code duplication. Credit to Gitoido
2026-10-18 13:19:07 -04:00
Gitoido Okaski
2c1d11ed11
chore: remove duplicate check that was accounted for earlier
2026-10-18 15:29:35 +03:00
Gitoido Okaski
b88adf0479
fix: stricter riding checks on server side
2026-10-18 15:21:09 +03:00
Polymeta
b1066671f5
Merge branch 'quick-fix' into 'main'
...
Flowerbed Clearning jigsaw fix, dripstone oasis jigsaw removal
See merge request cable-mc/cobblemon!2497
2026-10-18 12:09:48 +00:00
Polymeta
387e85d4ad
Merge branch 'fix/preset-conditions-mergers' into 'main'
...
fix: Some spawn conditions merge minHeight/Depth data into max instead
Closes #2111
See merge request cable-mc/cobblemon!2498
2026-10-18 12:07:55 +00:00
Gitoido Okaski
77ab58d823
fix: spawn condition mergers writing minHeight/depth into maxHeight/depth instead
2026-10-18 14:14:28 +03:00
Slippy
1a9e736d8b
Flowerbed Clearning jigsaw fix, dripstone oasis jigsaw removal
2026-10-18 00:11:56 -05:00
Hiroku
aa39c1906e
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2495
2026-10-17 23:48:54 +00:00
ewwww
2e460e2ca2
fixed floating frogadier
2026-10-17 19:43:44 -04:00
Polymeta
a07ff7f442
Merge branch 'implement_pokemon' into 'main'
...
implement_pokemon
See merge request cable-mc/cobblemon!2494
2026-10-17 23:37:18 +00:00
Polymeta
5374569ea1
[skip-ci] tidy up changelog
...
Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com >
2026-10-18 00:15:37 +01:00