v2.12.2

CHANGELOG.md

@@ -1,7 +1,17 @@
-**Update v2.12.1**
+**Update v2.12.2**
 
-- Fixed Garchomp halloween textures by @joker00666
-- Fixed Voltorb Shiny & Model by @rosegoldenowl
-- Sprites now verify each skin to ensure each skin has a sprite. Which means skins will have different displays in the addon.
-- Added Mewtwo Mega X Shadow/Armored Sprites
-- Added Mewtwo Shadow/Armored Sprites
+- Added in Santa Entity
+- Fixed Hex Mania Spawn egg translation not showing
+- Added another argument to `src.pokebedrock.modules.commands.redeem.10` to allow for a error reason.
+- Added Santa Quest Icons:
+    - Candy Cane
+    - Ability Icon
+    - Shiny Icon
+    - Snow Golem
+- Added Tinkaton Christmas Skin by @Jok3r00666
+- Added new Comfey Model and Christmas Skin by @DCRdemonKOD
+- Added Mew Christmas Skin by @Jok3r00666
+- Fixed the breaking sound of the custom ores (leaf stone, dusk, etc.)
+- Fixed the Mewtwo Shiny Armored skin which was broken.
+- Fixed the missing Female Pikachu Captin skin by @bruno
+- Deleted random Fossil Machine Geometry in ./models

manifest.json

@@ -3,16 +3,16 @@
   "header": {
     "name": "pack.name",
     "description": "pack.description",
-    "min_engine_version": [1, 21, 4],
+    "min_engine_version": [1, 21, 5],
     "uuid": "358dc189-8d9e-4fdb-b4e1-f8e0fb855f9a",
-    "version": [2, 12, 1]
+    "version": [2, 12, 2]
   },
   "modules": [
     {
       "description": "Resources Module",
       "type": "resources",
       "uuid": "388de949-18e5-4228-a447-f63237aa45a2",
-      "version": [2, 12, 1]
+      "version": [2, 12, 2]
     }
   ],
   "metadata": {

pokemon.json

@@ -159,6 +159,7 @@
 		"mewtwomegax",
 		"mewtwomegay",
 		"mew",
+		"mewchristmas",
 		"chikorita",
 		"bayleef",
 		"meganium",
@@ -454,6 +455,8 @@
 		"rockruff",
 		"mareanie",
 		"toxapex",
+		"comfey",
+		"comfeychristmas",
 		"mimikyu",
 		"mimikyubusted",
 		"mimikyutotem",
@@ -499,6 +502,7 @@
 		"tinkatink",
 		"tinkatuff",
 		"tinkaton",
+		"tinkatonchristmas",
 		"slitherwing",
 		"ironmoth",
 		"roaringmoon",
@@ -3335,6 +3339,18 @@
 				"canSleep": true
 			}
 		},
+		"mewchristmas": {
+			"name": "Mew-Christmas",
+			"skins": [],
+			"behavior": {
+				"canMove": true,
+				"canWalk": true,
+				"canSwim": true,
+				"canFly": true,
+				"canLook": true,
+				"canSleep": true
+			}
+		},
 		"chikorita": {
 			"name": "Chikorita",
 			"skins": [],
@@ -12548,6 +12564,18 @@
 				"canSleep": true
 			}
 		},
+		"comfeychristmas": {
+			"name": "Comfey-Chrismas",
+			"skins": [],
+			"behavior": {
+				"canMove": true,
+				"canWalk": true,
+				"canSwim": true,
+				"canFly": true,
+				"canLook": true,
+				"canSleep": true
+			}
+		},
 		"oranguru": {
 			"name": "Oranguru",
 			"skins": [],
@@ -15772,6 +15800,18 @@
 				"canSleep": true
 			}
 		},
+		"tinkatonchristmas": {
+			"name": "Tinkaton-Christmas",
+			"skins": [],
+			"behavior": {
+				"canMove": true,
+				"canWalk": true,
+				"canSwim": true,
+				"canFly": false,
+				"canLook": true,
+				"canSleep": true
+			}
+		},
 		"wiglett": {
 			"name": "Wiglett",
 			"skins": [],

texts/en_US.lang

@@ -1048,6 +1048,8 @@ item.spawn_egg.entity.pokeb:nurse_joy.name=Nurse Joy
 item.spawn_egg.entity.pokeb:trainer.name=Spawn Trainer
 item.spawn_egg.entity.pokeb:crate.name=Spawn Crate
 item.spawn_egg.entity.pokeb:floating_text.name=Spawn Floating Text
+item.spawn_egg.entity.pokeb:santa.name=Spawn Santa
+item.spawn_egg.entity.pokeb:move_tutor.name=Spawn Move Tutor
 item.spawn_egg.entity.pokeb:hex_mania.name=Spawn Hex Mania
 
 ## Pokemon Spawn Eggs
@@ -1265,6 +1267,7 @@ item.spawn_egg.entity.pokemon:cofagrigus.name=Cofagrigus
 item.spawn_egg.entity.pokemon:combee.name=Combee
 item.spawn_egg.entity.pokemon:combusken.name=Combusken
 item.spawn_egg.entity.pokemon:comfey.name=Comfey
+item.spawn_egg.entity.pokemon:comfeychristmas.name=Comfey-Christmas
 item.spawn_egg.entity.pokemon:conkeldurr.name=Conkeldurr
 item.spawn_egg.entity.pokemon:copperajah.name=Copperajah
 item.spawn_egg.entity.pokemon:copperajahgmax.name=Copperajah-Gmax
@@ -1770,6 +1773,7 @@ item.spawn_egg.entity.pokemon:metagrossmega.name=Metagross-Mega
 item.spawn_egg.entity.pokemon:metang.name=Metang
 item.spawn_egg.entity.pokemon:metapod.name=Metapod
 item.spawn_egg.entity.pokemon:mew.name=Mew
+item.spawn_egg.entity.pokemon:mewchristmas.name=Mew-Christmas
 item.spawn_egg.entity.pokemon:mewtwo.name=Mewtwo
 item.spawn_egg.entity.pokemon:mewtwomegax.name=Mewtwo-Mega-X
 item.spawn_egg.entity.pokemon:mewtwomegay.name=Mewtwo-Mega-Y
@@ -2233,6 +2237,7 @@ item.spawn_egg.entity.pokemon:timburr.name=Timburr
 item.spawn_egg.entity.pokemon:tinglu.name=Ting-Lu
 item.spawn_egg.entity.pokemon:tinkatink.name=Tinkatink
 item.spawn_egg.entity.pokemon:tinkaton.name=Tinkaton
+item.spawn_egg.entity.pokemon:tinkatonchristmas.name=Tinkaton-Christmas
 item.spawn_egg.entity.pokemon:tinkatuff.name=Tinkatuff
 item.spawn_egg.entity.pokemon:tirtouga.name=Tirtouga
 item.spawn_egg.entity.pokemon:toedscool.name=Toedscool
@@ -5344,7 +5349,7 @@ src.pokebedrock.modules.commands.redeem.6=§a+Rank: %s!
 src.pokebedrock.modules.commands.redeem.7=§a+Skin: %s!
 src.pokebedrock.modules.commands.redeem.8=§a+lvl %s %s!
 src.pokebedrock.modules.commands.redeem.9=§cFailed to Give item: %s Please Report this to Smell of curry!
-src.pokebedrock.modules.commands.redeem.10=§cFailed to add item: %s Please Report this to Smell of curry!
+src.pokebedrock.modules.commands.redeem.10=§cFailed to add item: %s, %s Please Report this to Smell of curry!
 src.pokebedrock.modules.commands.redeem.11=§aSetting code data...
 src.pokebedrock.modules.commands.repair.0=§cYou cannot use the "-repair" command because you don't have the required rank! Please head to pokebedrock.com to purchase a rank..
 src.pokebedrock.modules.commands.repair.1=§cYou have nothing to repair, your not holding any item!
@@ -5503,6 +5508,9 @@ src.pokebedrock.modules.forms.crate.resetCrate.2=§aReset Crate: %s's Animation!
 src.pokebedrock.modules.forms.hex_mania.viewQuests.0=[Hex Mania]: §7%s
 src.pokebedrock.modules.forms.hex_mania.viewInProgressQuest.0=§aSubmitted %sx %s to Hex Mania!
 src.pokebedrock.modules.forms.hex_mania.viewInProgressQuest.1=Failed to start battle: You have no available pokemon to fight!
+src.pokebedrock.modules.forms.santa.viewQuests.0=[Santa]: §7%s
+src.pokebedrock.modules.forms.santa.viewInProgressQuest.0=§aSubmitted %sx %s to Santa!
+src.pokebedrock.modules.forms.santa.viewInProgressQuest.1=Failed to start battle: You have no available pokemon to fight!
 src.pokebedrock.modules.forms.home.main.0=§cYou cannot create a home because you don't have anymore Home Points.
 src.pokebedrock.modules.forms.home.createHome.0=§cYou cannot create a home here because you are in a claim you are not trusted in!
 src.pokebedrock.modules.forms.kits.claimKit.0=§cKit cannot be claimed.

textures/item_texture.json

@@ -289,6 +289,12 @@
     "hex_mania_spawn_egg": {
       "textures": "textures/items/hex_mania_spawn_egg"
     },
+    "move_tutor_spawn_egg": {
+      "textures": "textures/items/move_tutor_spawn_egg"
+    },
+    "santa_spawn_egg": {
+      "textures": "textures/items/santa_spawn_egg"
+    },
     "crate_spawn_egg": {
       "textures": "textures/items/crate_spawn_egg"
     },
@@ -473,7 +479,7 @@
       "textures": "textures/items/healing_items/freshwater"
     },
     "moomoo_milk": {
-      "textures": "textures/items/healing_items/moomoo_milk"
+      "textures": "textures/items/healing_items/moomoomilk"
     },
     "aguav_berry": {
       "textures": "textures/items/held_items/aguavberry"
@@ -6288,6 +6294,15 @@
     },
     "mewtwoshadow": {
       "textures": "textures/sprites/default/mewtwoshadow.png"
+    },
+    "mewchristmas": {
+      "textures": "textures/sprites/default/mewchristmas.png"
+    },
+    "comfeychristmas": {
+      "textures": "textures/sprites/default/comfeychristmas.png"
+    },
+    "tinkatonchristmas": {
+      "textures": "textures/sprites/default/tinkatonchristmas.png"
     }
   }
 }