Put the snap back on

implement_pokemon

See merge request cable-mc/cobblemon!2507

CHANGELOG.md

@@ -3,29 +3,13 @@
 
 ### Additions
 
-### New rideable Pokémon
-
-### Pokémon Added
-
-### Model updates for the following Pokémon
-
-### Animation updates for the following Pokémon
-
 ### Changes
-- Reworked spawn presets and added structure tags for spawns
 
 ### Fixes
-- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
-- Fixed Minior's "Shields Down" ability not working as intended
-
-### Developer
 
 ### Molang & Datapacks
-- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
 
 ### Particles
 
-#### New Move Animations
-
 ### Localization
 - Updated translations for:

changelogs/CHANGELOG-1.8.4.md

@@ -0,0 +1,25 @@
+# Changelog
+## [1.8.4 (October 27th, 2026)](#1-8-4)
+
+### Changes
+- The Froakie line now blinks. The world will never be the same.
+
+### Fixes
+- Fixed heaps of spawns not working. This was caused by us missing something before release. RIP.
+- Fixed a crash caused by Fearow blinking while you're riding one. Makes sense to me.
+- Fixed Minior's "Shields Down" ability being very broken.
+- Fixed Dusclops using Squirtle's cry sound (lol).
+- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
+- Fixed a hitbox issue with placeable Orb held items attached to a ceiling.
+- Fixed something sneaky. I'll tell you about it later.
+
+### Molang & Datapacks
+- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
+
+### Particles
+- Updated Water Shuriken effect to be timed better when the opponent faints.
+
+### Localization
+- Updated translations for:
+  - Korean
+  - Simplified Chinese

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/Spawner.kt

@@ -198,7 +198,17 @@ interface Spawner {
         val mid = chunk.getBlockState(startPos)
         val above = chunk.getBlockState(abovePos)
 
-        return above.isPathfindable(PathComputationType.AIR) && mid.isAir
+        // Above must be non-solid
+        if (!above.isPathfindable(PathComputationType.AIR)) {
+            return false
+        }
+
+        // Position must be non-air
+        if (mid.isAir) {
+            return false
+        }
+
+        return true
     }
 
     fun constrainArea(area: SpawningZoneInput): SpawningZoneInput? {

common/src/main/kotlin/com/cobblemon/mod/common/block/OrbBlock.kt

@@ -30,7 +30,7 @@ class OrbBlock(properties: Properties) : SixFaceRotationalBlock(properties) {
 
         val FLOOR_NORTH = Shapes.box(0.3125, 0.0, 0.3125, 0.6875, 0.375, 0.6875)
         val WALL_NORTH = Shapes.box(0.3125, 0.3125, 0.625, 0.6875, 0.6875, 1.0)
-        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.375, 0.6875, 1.0, 0.6875)
+        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.3125, 0.6875, 1.0, 0.6875)
     }
 
     init {

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt

@@ -34,7 +34,7 @@ class DusclopsModel (root: ModelPart) : PokemonPosableModel(root) {
     lateinit var battleidle: Pose
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('squirtle', 'cry')".asExpressionLike()
+        animations["cry"] = "q.bedrock_stateful('dusclops', 'cry')".asExpressionLike()
 
         val blink = quirk { bedrockStateful("dusclops", "blink") }
 

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actoralt.particle.json

@@ -64,7 +64,7 @@
 				"rotation": "math.random_integer(0,3)*90"
 			},
 			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*2))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*2))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
+				"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
 			},
 			"minecraft:particle_appearance_billboard": {
 				"size": ["0.4*v.rsize", "0.4*v.rsize"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0656_froakie/froakie.geo.json

@@ -227,6 +227,14 @@
 						{"origin": [3.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [60, 42]}
 					]
 				},
+				{
+					"name": "eyelid_closed_left",
+					"parent": "head_left",
+					"pivot": [3.6, 19.7, -0.91],
+					"cubes": [
+						{"origin": [2.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [98, 2]}
+					]
+				},
 				{
 					"name": "face_ditto_left",
 					"parent": "head_left",
@@ -332,6 +340,14 @@
 						{"origin": [-5.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [51, 42], "mirror": true}
 					]
 				},
+				{
+					"name": "eyelid_closed_right",
+					"parent": "head_right",
+					"pivot": [-3.6, 19.7, -0.91],
+					"cubes": [
+						{"origin": [-5.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [89, 2], "mirror": true}
+					]
+				},
 				{
 					"name": "face_ditto_right",
 					"parent": "head_right",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0657_frogadier/frogadier.geo.json

@@ -134,229 +134,114 @@
 						"jaw2": [0, 27, -7.35]
 					}
 				},
-				{
-					"name": "head_right",
-					"parent": "head_angle",
-					"pivot": [-3.525, 31, 0.25],
-					"rotation": [5, 0, 0],
-					"cubes": [
-						{"origin": [-4.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
-						{"origin": [-3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [52, 55]}
-					]
-				},
-				{
-					"name": "locator_eye_right",
-					"parent": "head_right",
-					"pivot": [-4.5, 31, -2.5],
-					"rotation": [0, 90, 0],
-					"locators": {
-						"eye1": [-4.5, 31, -2.5]
-					}
-				},
-				{
-					"name": "eye_right",
-					"parent": "head_right",
-					"pivot": [-4.525, 31.35, -2.25],
-					"cubes": [
-						{"origin": [-4.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [66, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_neutral_right",
-					"parent": "eye_right",
-					"pivot": [-4.525, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [-4.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_angry_right",
-					"parent": "eye_right",
-					"pivot": [-4.435, 32.1, -2.5],
-					"cubes": [
-						{"origin": [-4.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [66, 26], "mirror": true},
-						{"origin": [-4.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 27], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_sad_right",
-					"parent": "eye_right",
-					"pivot": [-4.435, 32.85, -2.5],
-					"cubes": [
-						{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 19], "mirror": true},
-						{"origin": [-4.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-4.525, 30.85095, -3.02179],
-					"cubes": [
-						{"origin": [-4.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [73, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right2",
-					"parent": "pupil_right",
-					"pivot": [-4.55, 31.35095, -3.02179],
-					"cubes": [
-						{"origin": [-4.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "head_right",
-					"pivot": [-3.925, 31.35095, -2.27179],
-					"cubes": [
-						{"origin": [-4.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [77, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_eyelid_right",
-					"parent": "eyelid_right",
-					"pivot": [-4.425, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [-4.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [77, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right2",
-					"parent": "eyelid_right",
-					"pivot": [-3.925, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_happy_right",
-					"parent": "eyelid_right",
-					"pivot": [-4.325, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [-4.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [77, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "face_ditto_right",
-					"parent": "head_right",
-					"pivot": [-4.435, 32, -2.25]
-				},
-				{
-					"name": "eye_ditto_right",
-					"parent": "face_ditto_right",
-					"pivot": [-4.435, 32, -2.25],
-					"cubes": [
-						{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
-					]
-				},
-				{
-					"name": "eye_closed_ditto_right",
-					"parent": "face_ditto_right",
-					"pivot": [-4.335, 32, -2.25],
-					"cubes": [
-						{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
-						{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
-					]
-				},
 				{
 					"name": "head_left",
 					"parent": "head_angle",
-					"pivot": [3.525, 31, 0.25],
+					"pivot": [3.53, 31, 0.25],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [2.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
-						{"origin": [3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
+						{"origin": [2.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
+						{"origin": [3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
 					]
 				},
-				{
-					"name": "locator_eye_left",
-					"parent": "head_left",
-					"pivot": [4.5, 31, -2.5],
-					"rotation": [0, -90, 0],
-					"locators": {
-						"eye2": [4.5, 31, -2.5]
-					}
-				},
 				{
 					"name": "eye_left",
 					"parent": "head_left",
-					"pivot": [4.525, 31.35, -2.25],
+					"pivot": [4.53, 31.5, -2.25],
 					"cubes": [
-						{"origin": [3.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [88, 2]}
+						{"origin": [3.54, 29, -4.25], "size": [1, 5, 4], "uv": [88, 2]}
 					]
 				},
 				{
 					"name": "eye_neutral_left",
 					"parent": "eye_left",
-					"pivot": [4.525, 32.85095, -2.27179],
+					"pivot": [4.54, 33, -2.25],
 					"cubes": [
-						{"origin": [3.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
+						{"origin": [3.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
 					]
 				},
 				{
 					"name": "eye_angry_left",
 					"parent": "eye_left",
-					"pivot": [4.435, 32.1, -2.5],
+					"pivot": [4.44, 32.5, -2.25],
 					"cubes": [
-						{"origin": [3.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [88, 26]},
-						{"origin": [3.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 27]}
+						{"origin": [3.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [88, 26]},
+						{"origin": [3.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 27]}
 					]
 				},
 				{
 					"name": "eye_sad_left",
 					"parent": "eye_left",
-					"pivot": [4.435, 32.85, -2.5],
+					"pivot": [4.43, 33, -2.25],
 					"cubes": [
-						{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 19]},
-						{"origin": [3.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 20]}
+						{"origin": [3.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 19]},
+						{"origin": [3.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 20]}
 					]
 				},
 				{
 					"name": "pupil_left",
 					"parent": "eye_left",
-					"pivot": [4.525, 30.85095, -3.02179],
+					"pivot": [4.55, 31, -3.05],
 					"cubes": [
-						{"origin": [3.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [95, 0]}
+						{"origin": [3.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [95, 0]}
 					]
 				},
 				{
-					"name": "pupil_left2",
+					"name": "eye_shine_left",
 					"parent": "pupil_left",
-					"pivot": [4.55, 31.35095, -3.02179],
+					"pivot": [4.55, 31.5, -3.05],
 					"cubes": [
-						{"origin": [3.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
+						{"origin": [3.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
+					]
+				},
+				{
+					"name": "open_eye_left",
+					"parent": "head_left",
+					"pivot": [4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "uv": [99, 2]}
+					]
+				},
+				{
+					"name": "open_pupil_left",
+					"parent": "open_eye_left",
+					"pivot": [4.45, 31.5, -2.25],
+					"cubes": [
+						{"origin": [3.45, 31, -3.75], "size": [1, 1, 3], "uv": [99, 14]}
+					]
+				},
+				{
+					"name": "open_neutral_left",
+					"parent": "open_eye_left",
+					"pivot": [4.34, 33, -2.25],
+					"cubes": [
+						{"origin": [3.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
+					]
+				},
+				{
+					"name": "open_happy_left",
+					"parent": "open_eye_left",
+					"pivot": [4.35, 32, -2.25],
+					"cubes": [
+						{"origin": [3.35, 31, -3.75], "size": [1, 2, 3], "uv": [99, 20]}
 					]
 				},
 				{
 					"name": "eyelid_left",
 					"parent": "head_left",
-					"pivot": [3.925, 31.35095, -2.27179],
+					"pivot": [4.44, 31.5, -2.25],
 					"cubes": [
-						{"origin": [3.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [99, 2]}
+						{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [99, 26]}
 					]
 				},
 				{
-					"name": "pupil_eyelid_left",
-					"parent": "eyelid_left",
-					"pivot": [4.425, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [3.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [99, 14]}
-					]
-				},
-				{
-					"name": "eyelid_left2",
-					"parent": "eyelid_left",
-					"pivot": [3.925, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
-					]
-				},
-				{
-					"name": "pupil_happy_left",
-					"parent": "eyelid_left",
-					"pivot": [4.325, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [3.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [99, 20]}
-					]
+					"name": "locator_eye_left",
+					"parent": "head_left",
+					"pivot": [4.54, 31, -2.46],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"eye2": [4.54, 31, -2.46]
+					}
 				},
 				{
 					"name": "face_ditto_left",
@@ -368,7 +253,7 @@
 					"parent": "face_ditto_left",
 					"pivot": [4.435, 32, -2.25],
 					"cubes": [
-						{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
+						{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
 					]
 				},
 				{
@@ -376,8 +261,139 @@
 					"parent": "face_ditto_left",
 					"pivot": [4.335, 32, -2.25],
 					"cubes": [
-						{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
-						{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
+						{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
+						{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
+					]
+				},
+				{
+					"name": "head_right",
+					"parent": "head_angle",
+					"pivot": [-3.53, 31, 0.25],
+					"rotation": [5, 0, 0],
+					"cubes": [
+						{"origin": [-4.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
+						{"origin": [-3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "head_right",
+					"pivot": [-4.53, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.54, 29, -4.25], "size": [1, 5, 4], "uv": [66, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_neutral_right",
+					"parent": "eye_right",
+					"pivot": [-4.54, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_angry_right",
+					"parent": "eye_right",
+					"pivot": [-4.44, 32.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [66, 26], "mirror": true},
+						{"origin": [-4.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 27], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_sad_right",
+					"parent": "eye_right",
+					"pivot": [-4.43, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 19], "mirror": true},
+						{"origin": [-4.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "pupil_right",
+					"parent": "eye_right",
+					"pivot": [-4.55, 31, -3.05],
+					"cubes": [
+						{"origin": [-4.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [73, 0], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_shine_right",
+					"parent": "pupil_right",
+					"pivot": [-4.55, 31.5, -3.05],
+					"cubes": [
+						{"origin": [-4.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "open_eye_right",
+					"parent": "head_right",
+					"pivot": [-4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "uv": [77, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "open_pupil_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.45, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.45, 31, -3.75], "size": [1, 1, 3], "uv": [77, 14], "mirror": true}
+					]
+				},
+				{
+					"name": "open_neutral_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.34, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "open_happy_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.35, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.35, 31, -3.75], "size": [1, 2, 3], "uv": [77, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "eyelid_right",
+					"parent": "head_right",
+					"pivot": [-4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [77, 26], "mirror": true}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "head_right",
+					"pivot": [-4.54, 31, -2.46],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"eye1": [-4.54, 31, -2.46]
+					}
+				},
+				{
+					"name": "face_ditto_right",
+					"parent": "head_right",
+					"pivot": [-4.435, 32, -2.25]
+				},
+				{
+					"name": "eye_ditto_right",
+					"parent": "face_ditto_right",
+					"pivot": [-4.435, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_closed_ditto_right",
+					"parent": "face_ditto_right",
+					"pivot": [-4.335, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
+						{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0658_greninja/greninja.geo.json

@@ -830,11 +830,6 @@
 						{"origin": [-3.5, 38.3, 33.75], "size": [7, 5, 9], "uv": [106, 33]}
 					]
 				},
-				{
-					"name": "tongue6",
-					"parent": "tongue5",
-					"pivot": [0, 40.8, 40.5]
-				},
 				{
 					"name": "muzzle",
 					"parent": "head_angle",
@@ -913,6 +908,15 @@
 						{"origin": [-0.1, 44.3, -8.11], "size": [4, 2, 1], "uv": [87, 72]}
 					]
 				},
+				{
+					"name": "eyelid_base_left",
+					"parent": "eye_left_base",
+					"pivot": [1.9, 43.9, -8.11],
+					"cubes": [
+						{"origin": [-0.1, 45.3, -8.11], "size": [4, 1, 1], "uv": [87, 76]},
+						{"origin": [-0.1, 41.9, -8.11], "size": [4, 4, 1], "uv": [87, 79]}
+					]
+				},
 				{
 					"name": "eye_left",
 					"parent": "eye_left_base",
@@ -950,7 +954,7 @@
 					"parent": "eye_left",
 					"pivot": [1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 76]}
+						{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 85]}
 					]
 				},
 				{
@@ -958,7 +962,7 @@
 					"parent": "eye_left",
 					"pivot": [1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 79]}
+						{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 88]}
 					]
 				},
 				{
@@ -995,6 +999,15 @@
 						{"origin": [-3.9, 44.3, -8.11], "size": [4, 2, 1], "uv": [76, 72], "mirror": true}
 					]
 				},
+				{
+					"name": "eyelid_base_right",
+					"parent": "eye_right_base",
+					"pivot": [-1.9, 43.9, -8.11],
+					"cubes": [
+						{"origin": [-3.9, 45.3, -8.11], "size": [4, 1, 1], "uv": [76, 76], "mirror": true},
+						{"origin": [-3.9, 41.9, -8.11], "size": [4, 4, 1], "uv": [76, 79], "mirror": true}
+					]
+				},
 				{
 					"name": "eye_right",
 					"parent": "eye_right_base",
@@ -1032,7 +1045,7 @@
 					"parent": "eye_right",
 					"pivot": [-1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 76], "mirror": true}
+						{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 85], "mirror": true}
 					]
 				},
 				{
@@ -1040,7 +1053,7 @@
 					"parent": "eye_right",
 					"pivot": [-1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 79], "mirror": true}
+						{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 88], "mirror": true}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0022_fearow/fearow.json

@@ -8,7 +8,6 @@
   "poses": {
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "isBattle": false,
       "animations": [
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
         "q.look('head_ai')",
@@ -35,6 +34,9 @@
           "part": "wing_closed_left",
           "isVisible": true
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "walking": {
@@ -65,6 +67,9 @@
           "part": "wing_closed_left",
           "isVisible": true
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "hover": {
@@ -96,6 +101,9 @@
           "part": "wing_closed_left",
           "isVisible": false
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "fly": {
@@ -128,6 +136,9 @@
           "part": "wing_closed_left",
           "isVisible": false
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "sleep": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0656_froakie/froakie.json

@@ -27,7 +27,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'ground_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "walking": {
          "poseTypes": ["WALK"],
@@ -36,7 +36,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -46,7 +46,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'water_swim')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "float": {
          "poseTypes": ["STAND","FLOAT"],
@@ -55,7 +55,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'water_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "sleep": {
          "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0657_frogadier/frogadier.json

@@ -27,7 +27,7 @@
             "q.look('head_ai', 1, 1, 5, -45, 45, -45)",
             "q.bedrock('frogadier', 'ground_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "walking": {
          "poseTypes": ["WALK"],
@@ -36,7 +36,7 @@
             "q.look('head_ai', 1, 1, 0, -45, 45, -45)",
             "q.bedrock('frogadier', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -46,7 +46,7 @@
             "q.look('head_ai')",
             "q.bedrock('frogadier', 'water_swim')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "float": {
          "poseTypes": ["STAND","FLOAT"],
@@ -55,7 +55,7 @@
             "q.look('head_ai')",
             "q.bedrock('frogadier', 'water_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "sleep": {
          "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0658_greninja/greninja.json

@@ -66,7 +66,7 @@
             "q.bedrock('greninja', math.random(0, 1) < 0.4 ? 'ground_idle_alt' : 'ground_idle')"
          ],
          "quirks": [
-            "q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
+            "q.bedrock_quirk('greninja', 'blink')","q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
          ]
       },
       "walking": {
@@ -78,7 +78,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"]
       },
       "running": {
          "poseTypes": ["WALK"],
@@ -89,7 +89,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'ground_run')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"]
       },
       "surface-swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -101,7 +101,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_swim')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -118,7 +118,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_idle')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -136,7 +136,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_swim')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -153,7 +153,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_idle')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",

common/src/main/resources/assets/cobblemon/lang/en_us.json

@@ -383,7 +383,7 @@
   "item.cobblemon.eject_pack.tooltip_1": "Switches out the holder if any stats are lowered",
   "item.cobblemon.eject_pack.tooltip_2": "Consumed after use",
   "item.cobblemon.electric_seed": "Electric Seed",
-  "item.cobblemon.electric_seed.tooltip": "Boosts the holder's Defense in Electric terrain",
+  "item.cobblemon.electric_seed.tooltip": "Boosts the holder's Defense in Electric Terrain",
   "item.cobblemon.everstone": "Everstone",
   "item.cobblemon.everstone.tooltip": "Prevents the holder from evolving",
   "item.cobblemon.eviolite": "Eviolite",
@@ -402,7 +402,7 @@
   "item.cobblemon.focus_sash.tooltip_1": "Prevents the holder from fainting in a single hit",
   "item.cobblemon.focus_sash.tooltip_2": "Consumed after use",
   "item.cobblemon.grassy_seed": "Grassy Seed",
-  "item.cobblemon.grassy_seed.tooltip": "Boosts the holder's Defense in Grassy terrain",
+  "item.cobblemon.grassy_seed.tooltip": "Boosts the holder's Defense in Grassy Terrain",
   "item.cobblemon.grip_claw": "Grip Claw",
   "item.cobblemon.hard_stone": "Hard Stone",
   "item.cobblemon.hard_stone.tooltip": "Boosts the power of the holder's Rock-type moves",
@@ -507,7 +507,7 @@
   "item.cobblemon.mirror_herb.tooltip_1": "Allows the holder to mirror an opponent's stat increases to boost its own stats",
   "item.cobblemon.mirror_herb.tooltip_2": "Consumed after use",
   "item.cobblemon.misty_seed": "Misty Seed",
-  "item.cobblemon.misty_seed.tooltip": "Boosts the holder's Sp. Def in Misty terrain",
+  "item.cobblemon.misty_seed.tooltip": "Boosts the holder's Sp. Def in Misty Terrain",
   "item.cobblemon.power_herb": "Power Herb",
   "item.cobblemon.power_herb.tooltip_1": "Allows the holder to immediately use a move that normally requires a change of turn to charge",
   "item.cobblemon.power_herb.tooltip_2": "Consumed after use",
@@ -535,7 +535,7 @@
   "item.cobblemon.power_weight": "Power Weight",
   "item.cobblemon.power_weight.tooltip": "Grants 8 HP EVs when gaining experience in battle",
   "item.cobblemon.psychic_seed": "Psychic Seed",
-  "item.cobblemon.psychic_seed.tooltip": "Boosts the holder's Sp. Def in Psychic terrain",
+  "item.cobblemon.psychic_seed.tooltip": "Boosts the holder's Sp. Def in Psychic Terrain",
   "item.cobblemon.flame_orb": "Flame Orb",
   "item.cobblemon.flame_orb.tooltip": "Burns the holder",
   "item.cobblemon.smoke_ball": "Smoke Ball",

common/src/main/resources/assets/cobblemon/lang/ko_kr.json

@@ -6526,7 +6526,7 @@
     "cobblemon.move.10000000voltthunderbolt": "1000만볼트",
     "cobblemon.species.unown-x.desc": "고대 문자를 닮은 모습의 포켓몬이다. 먼저 생겨난 것은 문자인가 안농인가. 연구 중이지만 아직도 수수께끼다.",
     "cobblemon.ui.pokedex.info.form.qwilfish-hisui": "히스이의 모습",
-    "cobblemon.ui.pokedex.info.form.groudon-primal": "원시그란돈",
+    "cobblemon.ui.pokedex.info.form.groudon-primal": "원시회귀",
     "cobblemon.ui.pokedex.info.form.burmy-sandy": "모래땅도롱",
     "cobblemon.ui.pokedex.info.form.abomasnow-mega": "메가눈설왕",
     "cobblemon.species.rotom-frost.desc": "특수한 모터로 움직이는 냉장고에 들어갔다. 냉기를 뿜으며 싸운다.",
@@ -6758,7 +6758,7 @@
     "cobblemon.species.salamence-mega.desc": "앞다리를 껍질 틈에 얹어서 비행 태세를 갖춘다. 복잡한 지형도 고속으로 날아다닌다.",
     "cobblemon.species.metagross-mega.desc": "이길 수 없다고 판단하면 발톱으로 상대를 붙잡고 대폭발의 카운트를 시작한다.",
     "cobblemon.species.latios-mega.desc": "본 것이나 생각한 이미지를 상대방에게 영상으로 보여주는 능력을 지녔다. 인간의 말을 이해할 수 있다.",
-    "cobblemon.ui.pokedex.info.form.kyogre-primal": "원시가이오가",
+    "cobblemon.ui.pokedex.info.form.kyogre-primal": "원시회귀",
     "cobblemon.species.deoxys-attack.desc": "공격적인 형상으로 변화한 테오키스. 다른 모습을 보여 적을 혼란시키는 힘을 가졌다.",
     "cobblemon.ui.pokedex.info.form.deoxys-speed": "스피드폼",
     "cobblemon.ui.pokedex.info.form.burmy-trash": "슈레도롱",
@@ -9549,5 +9549,125 @@
     "cobblemon.config.ui.world_spawning_blocklist": "월드별 스폰 차단 목록",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "포켓몬 생성 로직을 비활성화하는 월드입니다.",
     "advancements.cobblemon.obtain_tm": "기술을 보여줘!",
-    "advancements.cobblemon.obtain_tm.description": "TM을 찾거나 제작하세요"
+    "advancements.cobblemon.obtain_tm.description": "TM을 찾거나 제작하세요",
+    "itemGroup.cobblemon.tm_item": "코블몬: 기술머신",
+    "block.cobblemon.pomohana": "이글이글꽃",
+    "block.cobblemon.pauvillea": "파칙파칙꽃",
+    "block.cobblemon.lobaila": "훌라훌라꽃",
+    "block.cobblemon.wistensu": "하늘하늘꽃",
+    "block.cobblemon.voltaconia": "찌릿꽃",
+    "block.cobblemon.verdroot": "풀빛뿌리",
+    "block.cobblemon.lucibell": "빛방울꽃",
+    "block.cobblemon.mistleaf": "안개잎",
+    "cobblemon.ui.pokedex.info.evolution_tree": "진화 계통",
+    "cobblemon.ui.pokedex.evolution.item_interact.tooltip": "진화하려면 %1$s 필요",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_species": "%1$s와(과) 교환 시 진화",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_any_species": "교환 시 진화",
+    "cobblemon.ui.pokedex.evolution.shedder.tooltip": "남는 몬스터볼과 파티 빈칸도 필요",
+    "cobblemon.ui.pokedex.evolution.or": "또는",
+    "cobblemon.ui.pokedex.evolution.one_of": "다음 중 하나:",
+    "cobblemon.ui.pokedex.requirement.advancement.tooltip": "발전 과제 %1$s 달성 필요",
+    "cobblemon.ui.pokedex.requirement.battle_critical_hits.tooltip": "배틀에서 급소 %1$s회 맞히기",
+    "cobblemon.ui.pokedex.requirement.biome.anticondition.tooltip": "%1$s 바이옴 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.biome.both.tooltip": "%1$s 바이옴 안, %2$s 바이옴 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.biome.tooltip": "%1$s 바이옴에 있기",
+    "cobblemon.ui.pokedex.requirement.blocks_traveled.tooltip": "%1$s블록 이동하기",
+    "cobblemon.ui.pokedex.requirement.damage_taken.tooltip": "배틀에서 기절하지 않고 데미지 %1$s 받기",
+    "cobblemon.ui.pokedex.requirement.defeat.tooltip": "배틀에서 %1$s을(를) 쓰러뜨리기",
+    "cobblemon.ui.pokedex.requirement.friendship.tooltip": "친밀도 %1$s 이상 필요",
+    "cobblemon.ui.pokedex.requirement.has_move.tooltip": "기술 %1$s 배우고 있기",
+    "cobblemon.ui.pokedex.requirement.has_move_type.tooltip": "%1$s 타입 기술 배우고 있기",
+    "cobblemon.ui.pokedex.requirement.held_item.tooltip": "%1$s 지니고 있기",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.min": "레벨 %1$s부터 진화",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.between": "레벨 %1$s~%2$s 사이에 진화",
+    "cobblemon.ui.pokedex.requirement.moon_phase.tooltip": "달 모양이 %1$s일 때 진화",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_amped": "§a노력§r, §a용감§r, §a고집§r, §a개구쟁이§r, §a온순§r, §a장난꾸러기§r, §a촐랑§r, §a성급§r, §a명랑§r, §a천진난만§r, §a덜렁§r, §a건방§r, §a변덕§r 성격 중 하나",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_low_key": "§a외로움§r, §a대담§r, §a무사태평§r, §a겁쟁이§r, §a성실§r, §a조심§r, §a의젓§r, §a냉정§r, §a수줍음§r, §a차분§r, §a얌전§r, §a신중§r 성격 중 하나",
+    "cobblemon.ui.pokedex.requirement.negate.tooltip": "아님: %1$s",
+    "cobblemon.ui.pokedex.requirement.nickname.malamar": "이름이 §aDinnerbone§r 또는 §aGrumm§r이어야 함",
+    "cobblemon.ui.pokedex.requirement.party_member.anticondition.tooltip": "파티에 %1$s 포켓몬이 없기",
+    "cobblemon.ui.pokedex.requirement.party_member.tooltip": "파티에 %1$s 포켓몬이 있기",
+    "cobblemon.ui.pokedex.requirement.pokemon_properties.tooltip": "조건: %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.and": "%1$s, %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.custom.cocoon_species": "%1$s 고치",
+    "cobblemon.ui.pokedex.requirement.properties.held_item": "%1$s 지닌",
+    "cobblemon.ui.pokedex.requirement.properties.int_feature": "%1$s %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.nature": "%1$s 성격",
+    "cobblemon.ui.pokedex.requirement.properties.nickname": "이름이 %1$s인",
+    "cobblemon.ui.pokedex.requirement.properties.type": "%1$s 타입",
+    "cobblemon.ui.pokedex.requirement.property_range.tooltip": "%1$s이(가) %2$s~%3$s 사이여야 함",
+    "cobblemon.ui.pokedex.requirement.recoil.tooltip": "배틀에서 반동 데미지 %1$s 받기",
+    "cobblemon.ui.pokedex.requirement.stat_compare.tooltip": "%1$s이(가) %2$s보다 높아야 함",
+    "cobblemon.ui.pokedex.requirement.stat_equal.tooltip": "%1$s와(과) %2$s이(가) 같아야 함",
+    "cobblemon.ui.pokedex.requirement.structure.anticondition.tooltip": "%1$s 구조물 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.structure.both.tooltip": "%1$s 구조물 안, %2$s 구조물 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.structure.tooltip": "%1$s 구조물에 있기",
+    "cobblemon.ui.pokedex.requirement.time_range.tooltip": "%1$s에 진화",
+    "cobblemon.ui.pokedex.requirement.use_move.tooltip": "배틀에서 기술 %1$s 사용하기",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.raining": "비가 올 때 진화",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.thundering": "뇌우가 칠 때 진화",
+    "cobblemon.ui.moon_phase.full_moon": "보름달",
+    "cobblemon.ui.moon_phase.waning_gibbous": "기우는 볼록달",
+    "cobblemon.ui.moon_phase.third_quarter": "하현달",
+    "cobblemon.ui.moon_phase.waning_crescent": "그믐달",
+    "cobblemon.ui.moon_phase.new_moon": "삭",
+    "cobblemon.ui.moon_phase.waxing_crescent": "초승달",
+    "cobblemon.ui.moon_phase.first_quarter": "상현달",
+    "cobblemon.ui.moon_phase.waxing_gibbous": "차오르는 볼록달",
+    "cobblemon.ui.time_range.any": "언제든",
+    "cobblemon.ui.time_range.day": "낮",
+    "cobblemon.ui.time_range.night": "밤",
+    "cobblemon.ui.time_range.noon": "정오",
+    "cobblemon.ui.time_range.midnight": "자정",
+    "cobblemon.ui.time_range.dawn": "새벽",
+    "cobblemon.ui.time_range.dusk": "해 질 녘",
+    "cobblemon.ui.time_range.twilight": "황혼",
+    "cobblemon.ui.time_range.morning": "아침",
+    "cobblemon.ui.time_range.afternoon": "오후",
+    "cobblemon.ui.time_range.predawn": "동트기 전",
+    "cobblemon.ui.time_range.evening": "저녁",
+    "cobblemon.subtitle.item.bright_powder.use": "반짝가루가 빛남",
+    "cobblemon.config.ui.type_gem_max_connected": "연결된 타입주얼 블록 최대 수",
+    "cobblemon.config.ui.type_gem_min_growth": "타입주얼 최소 성장",
+    "cobblemon.config.ui.type_gem_growth_chance": "타입주얼 성장 확률",
+    "cobblemon.config.ui.type_gem_initial_expansion_cycles": "타입주얼 초기 확장 횟수",
+    "cobblemon.battle.activate.ficklebeam": "%1$s은(는) 전력을 다해 공격한다!",
+    "tag.item.cobblemon.oricorio_flowers": "꽃꿀 꽃",
+    "tag.item.cobblemon.terrain_plants": "필드 식물",
+    "tag.item.cobblemon.tall_flowers": "큰 꽃",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_kalosbiome": "칼로스",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_unovabiome": "하나",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_kalosbiome": "칼로스",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_galarbiome": "가라르",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_galarbiome": "가라르",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_sinnohbiome": "신오",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_unovabiome": "하나",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_johtobiome": "성도",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_unovabiome": "하나",
+    "cobblemon.ui.pokedex.info.form.vivillon-icy snow": "빙설의 모양",
+    "cobblemon.species.vivillon-icy-snow.desc": "태어난 땅의 기후나 풍토에 영향을 받아 모양이 달라진다. 얼어붙은 땅에서의 모습이다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-high plains": "황야의 모양",
+    "cobblemon.species.vivillon-high-plains.desc": "태어난 땅의 기후나 풍토에 영향을 받아 모양이 달라진다. 비가 적게 내리는 땅에서의 모습이다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-inferno": "지옥의 모양",
+    "cobblemon.species.vivillon-inferno.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-void": "공허의 모양",
+    "cobblemon.species.vivillon-void.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-forsaken": "망각의 모양",
+    "cobblemon.species.vivillon-forsaken.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.species.minior-red.desc": "겉껍질이 벗겨진 모습. 코어의 색이 다른 이유는 먹은 먹이의 성분이 다르기 때문이다."
 }

common/src/main/resources/assets/cobblemon/lang/zh_cn.json

@@ -9677,5 +9677,6 @@
     "cobblemon.config.ui.world_spawning_blocklist": "维度生成黑名单",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "禁用宝可梦生成逻辑的维度。",
     "advancements.cobblemon.obtain_tm": "让我看看你的招式",
-    "advancements.cobblemon.obtain_tm.description": "发现或刻写一个招式学习器"
+    "advancements.cobblemon.obtain_tm.description": "发现或刻写一个招式学习器",
+    "itemGroup.cobblemon.tm_item": "招式学习器"
 }

common/src/main/resources/data/cobblemon/action_effects/moves/watershuriken.json

@@ -42,7 +42,8 @@
     },
     {
       "type": "pause",
-      "pause": 0.5
+      "condition": "q.target_fainted == false",
+      "pause": 1.25
     }
   ]
 }

common/src/main/resources/data/cobblemon/action_effects/moves/watershuriken_greninja.json

@@ -141,7 +141,8 @@
     },
     {
       "type": "pause",
-      "pause": 0.5
+      "condition": "q.target_fainted == false",
+      "pause": 1.25
     }
   ]
 }

gradle.properties

@@ -14,7 +14,7 @@ parchment_version = 2024.07.28@zip
 java_version = 21
 
 mod_id=cobblemon
-mod_version=1.8.4
+mod_version=1.8.5
 snapshot=true
 
 fabric.loom.multiProjectOptimisation=false