diff --git a/processing_scripts/database_update/old/moves/moves.json b/processing_scripts/database_update/old/moves/moves.json
index 82b5e2cb8d..e66c53235f 100644
--- a/processing_scripts/database_update/old/moves/moves.json
+++ b/processing_scripts/database_update/old/moves/moves.json
@@ -26684,6 +26684,1446 @@
"protectionMoves": false,
"extraInfo": -1,
"customSize": "3.0,4.0"
+ },
+ {
+ "name": "terablast",
+ "readableName": "Tera Blast",
+ "type": "Normal",
+ "category": "Special",
+ "pp": "10",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "If the user has Terastallized, it unleashes energy of its Tera Type. This move inflicts damage using the Attack or Sp. Atk stat—whichever is higher for the user.",
+ "secondaryEffect": "Changes type if the user is Terastallized. Damage inflicted depends on user's Attack or Special Attack. Highest stat used to determine if move is Physical or Special.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "silktrap",
+ "readableName": "Silk Trap",
+ "type": "Bug",
+ "category": "Other",
+ "pp": "10",
+ "pwr": "0",
+ "acc": "101",
+ "battleEffect": "The user spins a silken trap, protecting itself from damage while lowering the Speed stat of any attacker that makes direct contact.",
+ "secondaryEffect": "Lowers opponent's Attack one stage if hit by physical contact. Fails on successive uses",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "4",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "axekick",
+ "readableName": "Axe Kick",
+ "type": "Fighting",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "120",
+ "acc": "90",
+ "battleEffect": "The user attacks by kicking up into the air and slamming its heel down upon the target. This may also confuse the target. If it misses, the user takes damage instead.",
+ "secondaryEffect": "May confuse the opponent. If the move misses, the user takes 25% damage",
+ "effectRate": "30 %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "lastrespects",
+ "readableName": "Last Respects",
+ "type": "Ghost",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "50",
+ "acc": "100",
+ "battleEffect": "The user attacks to avenge its allies. The more defeated allies there are in the user's party, the greater the move's power.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "luminacrash",
+ "readableName": "Lumina Crash",
+ "type": "psychic",
+ "category": "special",
+ "pp": "10",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "The user attacks by unleashing a peculiar light that even affects the mind. This also harshly lowers the target's Sp. Def stat.",
+ "secondaryEffect": "Lowers the target's Special Defense by two stages",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "orderup",
+ "readableName": "Order Up",
+ "type": "Dragon",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "The user attacks to avenge its allies. The more defeated allies there are in the user's party, the greater the move's power.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "jetpunch",
+ "readableName": "Jet Punch",
+ "type": "Water",
+ "category": "physical",
+ "pp": "15",
+ "pwr": "60",
+ "acc": "100",
+ "battleEffect": "The user summons a torrent around its fist and punches at blinding speed. This move always goes first.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "1",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "Yes",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "spicyextract",
+ "readableName": "Spicy Extract",
+ "type": "Grass",
+ "category": "other",
+ "pp": "15",
+ "pwr": "0",
+ "acc": "101",
+ "battleEffect": "The user emits an incredibly spicy extract, sharply boosting the target's Attack stat and harshly lowering the target's Defense stat.",
+ "secondaryEffect": "Raises the target's Attack stat by two stages. Lowers the target's Defense by two stages",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "Yes",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "spinout",
+ "readableName": "Spin Out",
+ "type": "Steel",
+ "category": "physical",
+ "pp": "5",
+ "pwr": "100",
+ "acc": "100",
+ "battleEffect": "The user spins furiously by straining its legs, inflicting damage on the target. This also harshly lowers the user's Speed stat.",
+ "secondaryEffect": "Lowers opponent's Speed two stages.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "populationbomb",
+ "readableName": "Population Bomb",
+ "type": "Normal",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "20",
+ "acc": "90",
+ "battleEffect": "The user's fellows gather in droves to perform a combo attack that hits the target one to ten times in a row.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "icespinner",
+ "readableName": "Ice Spinner",
+ "type": "Ice",
+ "category": "physical",
+ "pp": "15",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "The user's fellows gather in droves to perform a combo attack that hits the target one to ten times in a row.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "glaiverush",
+ "readableName": "Glaive Rush",
+ "type": "Dragon",
+ "category": "physical",
+ "pp": "5",
+ "pwr": "120",
+ "acc": "100",
+ "battleEffect": "The user throws its entire body into a reckless charge. Attacks from opposing Pokémon during the next turn cannot miss and will inflict double damage.",
+ "secondaryEffect": "Makes target's moves not miss and inflict double damage during the next turn",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "revivalblessing",
+ "readableName": "Revival Blessing",
+ "type": "Normal",
+ "category": "other",
+ "pp": "1",
+ "pwr": "0",
+ "acc": "101",
+ "battleEffect": "The user bestows a loving blessing, reviving a party Pokémon that has fainted and restoring half that Pokémon's max HP.",
+ "secondaryEffect": "Revives a fainted Pokémon up to 50% maximum Hit Points",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "saltcure",
+ "readableName": "Salt Cure",
+ "type": "Rock",
+ "category": "physical",
+ "pp": "15",
+ "pwr": "40",
+ "acc": "100",
+ "battleEffect": "The user salt cures the target, inflicting damage every turn. Steel and Water types are more strongly affected by this move.",
+ "secondaryEffect": "Inflicts damage on the target at the end of each turn. Doubles damage inflicted on Water or Steel-type opponents",
+ "effectRate": "100 %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "tripledive",
+ "readableName": "Triple Dive",
+ "type": "Water",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "30",
+ "acc": "95",
+ "battleEffect": "The user performs a perfectly timed triple dive, hitting the target with splashes of water three times in a row.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "mortalspin",
+ "readableName": "Mortal Spin",
+ "type": "Poison",
+ "category": "physical",
+ "pp": "15",
+ "pwr": "30",
+ "acc": "100",
+ "battleEffect": "The user performs a spin attack that can also eliminate the effects of such moves as Bind, Wrap, and Leech Seed. This also poisons opposing Pokémon.",
+ "secondaryEffect": "Poisons the opponent",
+ "effectRate": "100 %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "doodle",
+ "readableName": "Doodle",
+ "type": "Normal",
+ "category": "other",
+ "pp": "10",
+ "pwr": "0",
+ "acc": "100",
+ "battleEffect": "The user captures the very essence of the target in a sketch. This changes the Abilities of the user and its ally Pokémon to that of the target.",
+ "secondaryEffect": "Changes the Abilities of all your Pokémon on the field to that of the targetted Pokémon",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "filletaway",
+ "readableName": "Fillet Away",
+ "type": "Normal",
+ "category": "other",
+ "pp": "10",
+ "pwr": "0",
+ "acc": "101",
+ "battleEffect": "The user sharply boosts its Attack, Sp. Atk, and Speed stats by using its own HP.",
+ "secondaryEffect": "Raises the user's Attack, Special Attack and Speed by 2 stages. Reduces 25% maximum HP from the user",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "kowtowcleave",
+ "readableName": "Kowtow Cleave",
+ "type": "Dark",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "85",
+ "acc": "101",
+ "battleEffect": "The user slashes at the target after kowtowing to make the target let down its guard. This attack never misses.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "flowertrick",
+ "readableName": "Flower Trick",
+ "type": "Grass",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "70",
+ "acc": "101",
+ "battleEffect": "The user throws a rigged bouquet of flowers at the target. This attack never misses and always lands a critical hit.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "torchsong",
+ "readableName": "Torch Song",
+ "type": "Fire",
+ "category": "special",
+ "pp": "10",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "The user blows out raging flames as if singing a song, scorching the target. This also boosts the user's Sp. Atk stat.",
+ "secondaryEffect": "Raises user's Special Attack one stage",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "Yes",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "aquastep",
+ "readableName": "Aqua Step",
+ "type": "Water",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "The user toys with the target and attacks it using light and fluid dance steps. This also boosts the user's Speed stat.",
+ "secondaryEffect": "Raises user's Speed one stage.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "ragingbull",
+ "readableName": "Raging Bull",
+ "type": "Normal",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "90",
+ "acc": "100",
+ "battleEffect": "The user performs a tackle like a raging bull. This move's type depends on the user's form. It can also break barriers, such as Light Screen and Reflect.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "makeitrain",
+ "readableName": "Make It Rain",
+ "type": "Steel",
+ "category": "special",
+ "pp": "5",
+ "pwr": "120",
+ "acc": "100",
+ "battleEffect": "The user attacks by throwing out a mass of coins. This also lowers the user's Sp. Atk stat. Money is earned after the battle.",
+ "secondaryEffect": "Lowers user's Special Attack by one stage. Drops coins that can be picked up as money at the end of the battle",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "ruination",
+ "readableName": "Ruination",
+ "type": "Dark",
+ "category": "special",
+ "pp": "10",
+ "pwr": "1",
+ "acc": "90",
+ "battleEffect": "The user summons a ruinous disaster. This cuts the target's HP in half.",
+ "secondaryEffect": "Cuts the opponent's Hit Points by 50% of the current value",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "collisioncourse",
+ "readableName": "Collision Course",
+ "type": "Fighting",
+ "category": "physical",
+ "pp": "5",
+ "pwr": "100",
+ "acc": "100",
+ "battleEffect": "The user transforms and crashes to the ground, causing a massive prehistoric explosion. This move's power is boosted more than usual if it's a supereffective hit.",
+ "secondaryEffect": "Boosts damage by 50% if the move is Super Effective on the target",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "electrodrift",
+ "readableName": "Electro Drift",
+ "type": "Electric",
+ "category": "special",
+ "pp": "5",
+ "pwr": "100",
+ "acc": "100",
+ "battleEffect": "The user races forward at ultrafast speeds, piercing its target with futuristic electricity. This move's power is boosted more than usual if it's a supereffective hit.",
+ "secondaryEffect": "Boosts damage by 50% if the move is Super Effective on the target",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "shedtail",
+ "readableName": "Shed Tail",
+ "type": "Normal",
+ "category": "other",
+ "pp": "10",
+ "pwr": "0",
+ "acc": "101",
+ "battleEffect": "The user creates a substitute for itself using its own HP before switching places with a party Pokémon in waiting.",
+ "secondaryEffect": "Creates a decoy using 1/4 of the user's maximum HP. Switches out to another Pokémon in the part with the Substitute still out",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "chillyreception",
+ "readableName": "Chilly Reception",
+ "type": "Ice",
+ "category": "other",
+ "pp": "10",
+ "pwr": "0",
+ "acc": "101",
+ "battleEffect": "The user tells a chillingly bad joke before switching places with a party Pokémon in waiting. This summons a snowstorm lasting five turns.",
+ "secondaryEffect": "Switches user with another Pokémon in the party. Summons a Snowstorm",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "NO",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "tidyup",
+ "readableName": "Tidy Up",
+ "type": "Normal",
+ "category": "other",
+ "pp": "10",
+ "pwr": "0",
+ "acc": "101",
+ "battleEffect": "The user tidies up and removes the effects of Spikes, Stealth Rock, Sticky Web, Toxic Spikes, and Substitute. This also boosts the user's Attack and Speed stats.",
+ "secondaryEffect": "User removes trapping moves. Increased Attack and Speed by 1 stage.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "Snowscape",
+ "readableName": "Snowscape",
+ "type": "Ice",
+ "category": "other",
+ "pp": "10",
+ "pwr": "0",
+ "acc": "101",
+ "battleEffect": "The user summons a snowstorm lasting five turns. This boosts the Defense stats of Ice types.",
+ "secondaryEffect": "Causes Snowstorm for 5 rounds.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "pounce",
+ "readableName": "Pounce",
+ "type": "Bug",
+ "category": "physical",
+ "pp": "20",
+ "pwr": "50",
+ "acc": "100",
+ "battleEffect": "The user attacks by pouncing on the target. This also lowers the target's Speed stat.",
+ "secondaryEffect": "Lowers opponent's Speed one stage.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "trailblaze",
+ "readableName": "Trailblase",
+ "type": "Grass",
+ "category": "physical",
+ "pp": "20",
+ "pwr": "50",
+ "acc": "100",
+ "battleEffect": "The user attacks suddenly as if leaping out from tall grass. The user's nimble footwork boosts its Speed stat.",
+ "secondaryEffect": "Raises user's Speed one stage.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "chillingwater",
+ "readableName": "Chilling Water",
+ "type": "Water",
+ "category": "special",
+ "pp": "20",
+ "pwr": "50",
+ "acc": "100",
+ "battleEffect": "The user attacks the target by showering it with water that's so cold it saps the target's power. This also lowers the target's Attack stat.",
+ "secondaryEffect": "Lowers opponent's Attack one stage.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "hyperdrill",
+ "readableName": "Hyper Drill",
+ "type": "Normal",
+ "category": "physical",
+ "pp": "5",
+ "pwr": "100",
+ "acc": "100",
+ "battleEffect": "The user spins the pointed part of its body at high speed to pierce the target. This attack can hit a target using a move such as Protect or Detect.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "No",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "twinbeam",
+ "readableName": "Twin Beam",
+ "type": "Psychic",
+ "category": "special",
+ "pp": "10",
+ "pwr": "40",
+ "acc": "100",
+ "battleEffect": "The user shoots mystical beams from its eyes to inflict damage. The target is hit twice in a row.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "ragefist",
+ "readableName": "Rage Fist",
+ "type": "Ghost",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "50",
+ "acc": "100",
+ "battleEffect": "The user converts its rage into energy to attack. The more times the user has been hit by attacks, the greater the move's power.",
+ "secondaryEffect": "Increases base power by 50 based on how many times the user has been hit by damage from other Pokémon's attacks",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "armorcannon",
+ "readableName": "Armor Cannon",
+ "type": "Fire",
+ "category": "special",
+ "pp": "5",
+ "pwr": "120",
+ "acc": "100",
+ "battleEffect": "The user shoots its own armor out as blazing projectiles. This also lowers the user's Defense and Sp. Def stats.",
+ "secondaryEffect": "Lowers user's Defense & Special Defense stats by one stage.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "bitterblade",
+ "readableName": "Bitter Blade",
+ "type": "Fire",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "90",
+ "acc": "100",
+ "battleEffect": "The user focuses its bitter feelings toward the world of the living into a slashing attack. The user's HP is restored by up to half the damage taken by the target.",
+ "secondaryEffect": "User recovers half the damage inflicted.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "doubleshock",
+ "readableName": "Double Shock",
+ "type": "Electric",
+ "category": "physical",
+ "pp": "5",
+ "pwr": "120",
+ "acc": "100",
+ "battleEffect": "The user discharges all the electricity from its body to perform a high-damage attack. After using this move, the user will no longer be Electric type.",
+ "secondaryEffect": "Removes Electric-type from user. If user was pure Electric-type, it is now without a type.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "gigatonhammer",
+ "readableName": "Gigaton Hammer",
+ "type": "Steel",
+ "category": "physical",
+ "pp": "5",
+ "pwr": "160",
+ "acc": "100",
+ "battleEffect": "The user swings its whole body around to attack with its huge hammer. This move can't be used twice in a row.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "comeuppance",
+ "readableName": "Comeuppance",
+ "type": "Dark",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "1",
+ "acc": "100",
+ "battleEffect": "The user retaliates with much greater force against the opponent that last inflicted damage on it.",
+ "secondaryEffect": "Damages the last Pokémon to hit the user with 150% of the damage inflicted on the user",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "Yes",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "aquacutter",
+ "readableName": "Aqua Cutter",
+ "type": "Water",
+ "category": "physical",
+ "pp": "20",
+ "pwr": "70",
+ "acc": "100",
+ "battleEffect": "The user expels pressurized water to cut at the target like a blade. This move has a heightened chance of landing a critical hit.",
+ "secondaryEffect": "No effect.",
+ "effectRate": "-- %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "Yes",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "blazingtorque",
+ "readableName": "Blazing Torque",
+ "type": "Fire",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "This move is only used by a Starmobile. It may Burn the opponent",
+ "secondaryEffect": "May induce burn.",
+ "effectRate": "30 %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "wickedtorque",
+ "readableName": "Wicked Torque",
+ "type": "Dark",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "This move is only used by a Starmobile.",
+ "secondaryEffect": "Lowers opponent's Sp. Def one stage",
+ "effectRate": "10 %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "noxioustorque",
+ "readableName": "Noxious Torque",
+ "type": "Poison",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "80",
+ "acc": "100",
+ "battleEffect": "This move is only used by a Starmobile. It may Poison the opponent",
+ "secondaryEffect": "May induce poison.",
+ "effectRate": "30 %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "combattorque",
+ "readableName": "Combate Torque",
+ "type": "Fighting",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "100",
+ "acc": "100",
+ "battleEffect": "This move is only used by a Starmobile. It may lower the opponent's Defense",
+ "secondaryEffect": "Lowers opponent's Defense one stage.",
+ "effectRate": "30 %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
+ },
+ {
+ "name": "magicaltroque",
+ "readableName": "Magical Torque",
+ "type": "Fairy",
+ "category": "physical",
+ "pp": "10",
+ "pwr": "100",
+ "acc": "100",
+ "battleEffect": "This move is only used by a Starmobile. It may confuse the opponent",
+ "secondaryEffect": "--",
+ "effectRate": "30 %",
+ "tmNum": "None",
+ "speedPriority": "0",
+ "target": "Ally",
+ "contact": "No",
+ "soundType": "No",
+ "punchType": "No",
+ "snatchable": "No",
+ "zMove": "No",
+ "defrosts": "No",
+ "wideArea": "No",
+ "magiccoat": "No",
+ "protect": "Yes",
+ "mirrormove": "No",
+ "multiTarget": false,
+ "interceptable": true,
+ "ohko": false,
+ "protectionMoves": false,
+ "extraInfo": -1
}
]
}
\ No newline at end of file
diff --git a/src/generated/resources/assets/pokecube_abilities/lang/en_us.json b/src/generated/resources/assets/pokecube_abilities/lang/en_us.json
index a5055b55d3..98c3022ac0 100644
--- a/src/generated/resources/assets/pokecube_abilities/lang/en_us.json
+++ b/src/generated/resources/assets/pokecube_abilities/lang/en_us.json
@@ -325,5 +325,36 @@
"ability.conqueror.name": "Conqueror",
"ability.shackle.name": "Shackle",
"ability.decoy.name": "Decoy",
- "ability.shield.name": "Shield"
+ "ability.shield.name": "Shield",
+ "ability.anger-shell.name": "Anger Shell",
+ "ability.armor-tail.name": "Armor Tail",
+ "ability.beads-of-ruin.name": "Beads of Ruin",
+ "ability.commander.name": "Commander",
+ "ability.costar.name": "Costar",
+ "ability.cud-chew.name": "Cud Chew",
+ "ability.earth-eater.name": "Earth Eater",
+ "ability.electromorphosis.name": "Electromorphosis",
+ "ability.good-as-gold.name": "Good as Gold",
+ "ability.guard-dog.name": "Guard Dog",
+ "ability.hadron-engine.name": "Hadron Engine",
+ "ability.lingering-aroma.name": "Lingering Aroma",
+ "ability.mycelium-might.name": "Mycelium Might",
+ "ability.opportunist.name": "Opportunist",
+ "ability.orichalcum-pulse.name": "Orichalcum Pulse",
+ "ability.protosynthesis.name": "Protosynthesis",
+ "ability.purifying-salt.name": "Purifying Salt",
+ "ability.quark-drive.name": "Quark Drive",
+ "ability.rocky-payload.name": "Rocky Payload",
+ "ability.seed-sower.name": "Seed Sower",
+ "ability.sharpness.name": "Sharpness",
+ "ability.supreme-overlord.name": "Supreme Overlord",
+ "ability.sword-of-ruin.name": "Sword of Ruin",
+ "ability.tablets-of-ruin.name": "Tablets of Ruin",
+ "ability.thermal-exchange.name": "Thermal Exchange",
+ "ability.toxic-debris.name": "Toxic Debris",
+ "ability.vessel-of-ruin.name": "Vessel of Ruin",
+ "ability.well-baked-body.name": "Well Baked Body",
+ "ability.wind-power.name": "Wind Power",
+ "ability.wind-rider.name": "Wind Rider",
+ "ability.zero-to-hero.name": "Zero to Hero"
}
\ No newline at end of file
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/en_us.json b/src/generated/resources/assets/pokecube_mobs/lang/en_us.json
index e4287abe61..926d04355f 100644
--- a/src/generated/resources/assets/pokecube_mobs/lang/en_us.json
+++ b/src/generated/resources/assets/pokecube_mobs/lang/en_us.json
@@ -177,6 +177,9 @@
"entity.pokecube.pinsir": "Pinsir",
"entity.pokecube.pinsir-mega": "Pinsir",
"entity.pokecube.tauros": "Tauros",
+ "entity.pokecube.tauros-paldea": "Tauros",
+ "entity.pokecube.tauros-blaze": "Tauros",
+ "entity.pokecube.tauros-aqua": "Tauros",
"entity.pokecube.magikarp": "Magikarp",
"entity.pokecube.gyarados": "Gyarados",
"entity.pokecube.gyarados-mega": "Gyarados",
@@ -255,6 +258,7 @@
"entity.pokecube.sunflora": "Sunflora",
"entity.pokecube.yanma": "Yanma",
"entity.pokecube.wooper": "Wooper",
+ "entity.pokecube.wooper-paldea": "Wooper",
"entity.pokecube.quagsire": "Quagsire",
"entity.pokecube.espeon": "Espeon",
"entity.pokecube.umbreon": "Umbreon",
@@ -1111,5 +1115,115 @@
"entity.pokecube.overqwil": "Overqwil",
"entity.pokecube.enamorus-incarnate": "Enamorus",
"entity.pokecube.enamorus-therian": "Enamorus",
+ "entity.pokecube.sprigatito": "Sprigatito",
+ "entity.pokecube.floragato": "Floragato",
+ "entity.pokecube.meowscarada": "Meowscarada",
+ "entity.pokecube.fuecoco": "Fuecoco",
+ "entity.pokecube.crocalor": "Crocalor",
+ "entity.pokecube.skeledirge": "Skeledirge",
+ "entity.pokecube.quaxly": "Quaxly",
+ "entity.pokecube.quaxwell": "Quaxwell",
+ "entity.pokecube.quaquaval": "Quaquaval",
+ "entity.pokecube.lechonk": "Lechonk",
+ "entity.pokecube.oinkologne-male": "Oinkologne",
+ "entity.pokecube.oinkologne-female": "Oinkologne",
+ "entity.pokecube.dudunsparce-two-segment": "Dudunsparce",
+ "entity.pokecube.dudunsparce-three-segment": "Dudunsparce",
+ "entity.pokecube.tarountula": "Tarountula",
+ "entity.pokecube.spidops": "Spidops",
+ "entity.pokecube.nymble": "Nymble",
+ "entity.pokecube.lokix": "Lokix",
+ "entity.pokecube.rellor": "Rellor",
+ "entity.pokecube.rabsca": "Rabsca",
+ "entity.pokecube.greavard": "Greavard",
+ "entity.pokecube.houndstone": "Houndstone",
+ "entity.pokecube.flittle": "Flittle",
+ "entity.pokecube.espathra": "Espathra",
+ "entity.pokecube.farigiraf": "Farigiraf",
+ "entity.pokecube.wiglett": "Wiglett",
+ "entity.pokecube.wugtrio": "Wugtrio",
+ "entity.pokecube.dondozo": "Dondozo",
+ "entity.pokecube.veluza": "Veluza",
+ "entity.pokecube.finizen": "Finizen",
+ "entity.pokecube.palafin": "Palafin",
+ "entity.pokecube.palafin-hero": "Palafin",
+ "entity.pokecube.smoliv": "Smoliv",
+ "entity.pokecube.dolliv": "Dolliv",
+ "entity.pokecube.arboliva": "Arboliva",
+ "entity.pokecube.capsakid": "Capsakid",
+ "entity.pokecube.scovillain": "Scovillain",
+ "entity.pokecube.tadbulb": "Tadbulb",
+ "entity.pokecube.bellibolt": "Bellibolt",
+ "entity.pokecube.varoom": "Varoom",
+ "entity.pokecube.revavroom": "Revavroom",
+ "entity.pokecube.orthworm": "Orthworm",
+ "entity.pokecube.tandemaus": "Tandemaus",
+ "entity.pokecube.maushold": "Maushold",
+ "entity.pokecube.cetoddle": "Cetoddle",
+ "entity.pokecube.cetitan": "Cetitan",
+ "entity.pokecube.frigibax": "Frigibax",
+ "entity.pokecube.arctibax": "Arctibax",
+ "entity.pokecube.baxcalibur": "Baxcalibur",
+ "entity.pokecube.tatsugiri": "Tatsugiri",
+ "entity.pokecube.cyclizar": "Cyclizar",
+ "entity.pokecube.pawmi": "Pawmi",
+ "entity.pokecube.pawmo": "Pawmo",
+ "entity.pokecube.pawmot": "Pawmot",
+ "entity.pokecube.wattrel": "Wattrel",
+ "entity.pokecube.kilowattrel": "Kilowattrel",
+ "entity.pokecube.bombirdier": "Bombirdier",
+ "entity.pokecube.squawkabilly-blue": "Squawkabilly",
+ "entity.pokecube.squawkabilly-green": "Squawkabilly",
+ "entity.pokecube.squawkabilly-white": "Squawkabilly",
+ "entity.pokecube.squawkabilly-yellow": "Squawkabilly",
+ "entity.pokecube.flamigo": "Flamigo",
+ "entity.pokecube.klawf": "Klawf",
+ "entity.pokecube.nacli": "Nacli",
+ "entity.pokecube.naclstack": "Naclstack",
+ "entity.pokecube.garganacl": "Garganacl",
+ "entity.pokecube.glimmet": "Glimmet",
+ "entity.pokecube.glimmora": "Glimmora",
+ "entity.pokecube.shroodle": "Shroodle",
+ "entity.pokecube.grafaiai": "Grafaiai",
+ "entity.pokecube.fidough": "Fidough",
+ "entity.pokecube.dachsbun": "Dachsbun",
+ "entity.pokecube.maschiff": "Maschiff",
+ "entity.pokecube.mabosstiff": "Mabosstiff",
+ "entity.pokecube.bramblin": "Bramblin",
+ "entity.pokecube.brambleghast": "Brambleghast",
+ "entity.pokecube.gimmighoul-chest": "Gimmighoul",
+ "entity.pokecube.gimmighoul-roaming": "Gimmighoul",
+ "entity.pokecube.gholdengo": "Gholdengo",
+ "entity.pokecube.great-tusk": "Great Tusk",
+ "entity.pokecube.brute-bonnet": "Brute Bonnet",
+ "entity.pokecube.sandy-shocks": "Sandy Shocks",
+ "entity.pokecube.screem-tail": "Screem Tail",
+ "entity.pokecube.flutter-mane": "Flutter Mane",
+ "entity.pokecube.slither-wing": "Slither Wing",
+ "entity.pokecube.roaring-moon": "Roaring Moon",
+ "entity.pokecube.iron-treads": "Iron Treads",
+ "entity.pokecube.iron-moth": "Iron Moth",
+ "entity.pokecube.iron-hands": "Iron Hands",
+ "entity.pokecube.iron-jugulis": "Iron Jugulis",
+ "entity.pokecube.iron-thorns": "Iron Thorns",
+ "entity.pokecube.iron-bundle": "Iron Bundle",
+ "entity.pokecube.iron-valiant": "Iron Valiant",
+ "entity.pokecube.ting-lu": "Ting Lu",
+ "entity.pokecube.chien-pao": "Chien Pao",
+ "entity.pokecube.wo-chien": "Wo Chien",
+ "entity.pokecube.chi-yu": "Chi Yu",
+ "entity.pokecube.koraidon": "Koraidon",
+ "entity.pokecube.miraidon": "Miraidon",
+ "entity.pokecube.tinkatink": "Tinkatink",
+ "entity.pokecube.tinkatuff": "Tinkatuff",
+ "entity.pokecube.tinkaton": "Tinkaton",
+ "entity.pokecube.charcadet": "Charcadet",
+ "entity.pokecube.armarouge": "Armarouge",
+ "entity.pokecube.ceruledge": "Ceruledge",
+ "entity.pokecube.toedscool": "Toedscool",
+ "entity.pokecube.toedscruel": "Toedscruel",
+ "entity.pokecube.kingambit": "Kingambit",
+ "entity.pokecube.clodsire": "Clodsire",
+ "entity.pokecube.annihilape": "Annihilape",
"entity.pokecube.missingno": "MissingNo."
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/entity_types/friendly.json b/src/generated/resources/data/pokecube/tags/entity_types/friendly.json
index afd217c5f5..7bf58f5951 100644
--- a/src/generated/resources/data/pokecube/tags/entity_types/friendly.json
+++ b/src/generated/resources/data/pokecube/tags/entity_types/friendly.json
@@ -23,6 +23,7 @@
"pokecube:happiny",
"pokecube:cosmog",
"pokecube:komala",
- "pokecube:audino"
+ "pokecube:audino",
+ "pokecube:tarountula"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/entity_types/hostile.json b/src/generated/resources/data/pokecube/tags/entity_types/hostile.json
index 9549a2599f..877b002ef5 100644
--- a/src/generated/resources/data/pokecube/tags/entity_types/hostile.json
+++ b/src/generated/resources/data/pokecube/tags/entity_types/hostile.json
@@ -124,6 +124,8 @@
"pokecube:dracovish",
"pokecube:eternatus-eternamax",
"pokecube:zarude",
- "pokecube:kleavor"
+ "pokecube:kleavor",
+ "pokecube:koraidon",
+ "pokecube:miraidon"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/entity_types/pokemob.json b/src/generated/resources/data/pokecube/tags/entity_types/pokemob.json
index 4d96e842fa..2d5c2ff7bb 100644
--- a/src/generated/resources/data/pokecube/tags/entity_types/pokemob.json
+++ b/src/generated/resources/data/pokecube/tags/entity_types/pokemob.json
@@ -1113,6 +1113,19 @@
"pokecube:sneasler",
"pokecube:overqwil",
"pokecube:enamorus-incarnate",
- "pokecube:enamorus-therian"
+ "pokecube:enamorus-therian",
+ "pokecube:sprigatito",
+ "pokecube:floragato",
+ "pokecube:meowscarada",
+ "pokecube:fuecoco",
+ "pokecube:crocalor",
+ "pokecube:skeledirge",
+ "pokecube:quaxly",
+ "pokecube:quaxwell",
+ "pokecube:quaquaval",
+ "pokecube:tarountula",
+ "pokecube:farigiraf",
+ "pokecube:koraidon",
+ "pokecube:miraidon"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/entity_types/wall_climbing.json b/src/generated/resources/data/pokecube/tags/entity_types/wall_climbing.json
index 55ee1d3a0d..330847edb3 100644
--- a/src/generated/resources/data/pokecube/tags/entity_types/wall_climbing.json
+++ b/src/generated/resources/data/pokecube/tags/entity_types/wall_climbing.json
@@ -1,6 +1,7 @@
{
"replace": false,
"values": [
- "#pokecube:ants"
+ "#pokecube:ants",
+ "pokecube:tarountula"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/pokemob/hms/fly.json b/src/generated/resources/data/pokecube/tags/pokemob/hms/fly.json
index 69faab4324..c7d45d68a8 100644
--- a/src/generated/resources/data/pokecube/tags/pokemob/hms/fly.json
+++ b/src/generated/resources/data/pokecube/tags/pokemob/hms/fly.json
@@ -28,6 +28,8 @@
"pokecube:buzzwole",
"pokecube:necrozma",
"pokecube:orbeetle-gmax",
- "pokecube:decidueye-hisui"
+ "pokecube:decidueye-hisui",
+ "pokecube:koraidon",
+ "pokecube:miraidon"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/pokemob/legends.json b/src/generated/resources/data/pokecube/tags/pokemob/legends.json
index d2afe99f32..1ef9730843 100644
--- a/src/generated/resources/data/pokecube/tags/pokemob/legends.json
+++ b/src/generated/resources/data/pokecube/tags/pokemob/legends.json
@@ -135,6 +135,8 @@
"pokecube:calyrex-ice",
"pokecube:spectrier",
"pokecube:calyrex-shadow",
- "pokecube:calyrex"
+ "pokecube:calyrex",
+ "pokecube:koraidon",
+ "pokecube:miraidon"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/pokemob/shoulder_allowed.json b/src/generated/resources/data/pokecube/tags/pokemob/shoulder_allowed.json
index 5c4da71426..ce3ce7831d 100644
--- a/src/generated/resources/data/pokecube/tags/pokemob/shoulder_allowed.json
+++ b/src/generated/resources/data/pokecube/tags/pokemob/shoulder_allowed.json
@@ -53,6 +53,9 @@
"pokecube:milcery",
"pokecube:snom",
"pokecube:morpeko-full-belly",
- "pokecube:dreepy"
+ "pokecube:dreepy",
+ "pokecube:sprigatito",
+ "pokecube:fuecoco",
+ "pokecube:quaxly"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/pokemob/starters.json b/src/generated/resources/data/pokecube/tags/pokemob/starters.json
index 39b0f6afe3..2220d2ad94 100644
--- a/src/generated/resources/data/pokecube/tags/pokemob/starters.json
+++ b/src/generated/resources/data/pokecube/tags/pokemob/starters.json
@@ -24,6 +24,9 @@
"pokecube:popplio",
"pokecube:grookey",
"pokecube:scorbunny",
- "pokecube:sobble"
+ "pokecube:sobble",
+ "pokecube:sprigatito",
+ "pokecube:fuecoco",
+ "pokecube:quaxly"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/pokemob_movements/floats.json b/src/generated/resources/data/pokecube/tags/pokemob_movements/floats.json
index 63aac331ed..cd62e8b969 100644
--- a/src/generated/resources/data/pokecube/tags/pokemob_movements/floats.json
+++ b/src/generated/resources/data/pokecube/tags/pokemob_movements/floats.json
@@ -59,6 +59,7 @@
"pokecube:palkia",
"pokecube:cresselia",
"pokecube:darkrai",
+ "pokecube:victini",
"pokecube:munna",
"pokecube:musharna",
"pokecube:yamask",
@@ -98,7 +99,7 @@
"pokecube:phantump",
"pokecube:diancie",
"pokecube:diancie-mega",
- "pokecube:hoopa_confined",
+ "pokecube:hoopa",
"pokecube:hoopa-unbound",
"pokecube:comfey",
"pokecube:minior",
@@ -115,6 +116,7 @@
"pokecube:milcery",
"pokecube:dreepy",
"pokecube:drakloak",
- "pokecube:calyrex"
+ "pokecube:calyrex",
+ "pokecube:miraidon"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube/tags/pokemob_movements/walks.json b/src/generated/resources/data/pokecube/tags/pokemob_movements/walks.json
index c4556d4cc0..2268b2104c 100644
--- a/src/generated/resources/data/pokecube/tags/pokemob_movements/walks.json
+++ b/src/generated/resources/data/pokecube/tags/pokemob_movements/walks.json
@@ -226,6 +226,13 @@
"pokecube:sliggoo-hisui",
"pokecube:googra_hisui",
"pokecube:avalugg-hisui",
- "pokecube:decidueye-hisui"
+ "pokecube:decidueye-hisui",
+ "pokecube:sprigatito",
+ "pokecube:fuecoco",
+ "pokecube:quaxly",
+ "pokecube:tarountula",
+ "pokecube:farigiraf",
+ "pokecube:koraidon",
+ "pokecube:miraidon"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/aqua-cutter.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/aqua-cutter.json
new file mode 100644
index 0000000000..8047709ff2
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/aqua-cutter.json
@@ -0,0 +1,12 @@
+{
+ "name": "aqua-cutter",
+ "power": 70,
+ "pp": 20,
+ "priority": 0,
+ "type": "water",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Aqua Cutter inflicts damage and has an increased critical hit ratio. If used by a Pokémon with Sharpness, its power is increased by 50%."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/aqua-step.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/aqua-step.json
new file mode 100644
index 0000000000..a86d29d1cf
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/aqua-step.json
@@ -0,0 +1,12 @@
+{
+ "name": "aqua-step",
+ "power": 80,
+ "pp": 10,
+ "priority": 0,
+ "type": "water",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Aqua Step inflicts damage and raises the user's Speed by one stage if the move is successful."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/armor-cannon.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/armor-cannon.json
new file mode 100644
index 0000000000..b1ca6934c6
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/armor-cannon.json
@@ -0,0 +1,12 @@
+{
+ "name": "armor-cannon",
+ "power": 120,
+ "pp": 5,
+ "priority": 0,
+ "type": "fire",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "special",
+ "move_category": "damage",
+ "effect_text_extend": "Armor Cannon deals damage and lowers the user's Defense and Special Defense stats by one stage each."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/axe-kick.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/axe-kick.json
new file mode 100644
index 0000000000..04818efa98
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/axe-kick.json
@@ -0,0 +1,12 @@
+{
+ "name": "axe-kick",
+ "power": 120,
+ "pp": 10,
+ "priority": 0,
+ "type": "fighting",
+ "accuracy": 90,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Axe Kick inflicts damage and has a 30% chance of confusing the target. If it misses, the user takes crash damage equal to half of its maximum HP. The user will also take crash damage if this move is used on a protected target, or the target is immune to this move."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/bitter-blade.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/bitter-blade.json
new file mode 100644
index 0000000000..cb0c74654a
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/bitter-blade.json
@@ -0,0 +1,12 @@
+{
+ "name": "bitter-blade",
+ "power": 90,
+ "pp": 10,
+ "priority": 0,
+ "type": "fire",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Bitter Blades inflicts damage, and it restores the user's HP by half of the damage dealt. If used by a Pokémon with Sharpness, its power is increased by 50%."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/blazing-torque.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/blazing-torque.json
new file mode 100644
index 0000000000..f85065a5f4
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/blazing-torque.json
@@ -0,0 +1,13 @@
+{
+ "name": "blazing-torque",
+ "power": 80,
+ "pp": 10,
+ "priority": 0,
+ "type": "fire",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Blazing Torque inflicts damage and has a 30% chance of burning the target.",
+ "effect_chance": 30
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/chilling-water.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/chilling-water.json
new file mode 100644
index 0000000000..78e1b8866e
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/chilling-water.json
@@ -0,0 +1,12 @@
+{
+ "name": "chilling-water",
+ "power": 50,
+ "pp": 20,
+ "priority": 0,
+ "type": "water",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "special",
+ "move_category": "damage",
+ "effect_text_extend": "Chilling Water inflicts damage and lowers the target's Attack by one stage."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/chilly-reception.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/chilly-reception.json
new file mode 100644
index 0000000000..13fc58e214
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/chilly-reception.json
@@ -0,0 +1,12 @@
+{
+ "name": "chilly-reception",
+ "power": 0,
+ "pp": 10,
+ "priority": 0,
+ "type": "ice",
+ "accuracy": 0,
+ "target": "all-pokemon",
+ "damage_class": "special",
+ "move_category": "damage",
+ "effect_text_extend": "Chilly Reception creates snow on the battlefield and switches the user out. Snow instigated by this move lasts five turns."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/collision-course.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/collision-course.json
new file mode 100644
index 0000000000..c60d4fd378
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/collision-course.json
@@ -0,0 +1,12 @@
+{
+ "name": "collision-course",
+ "power": 100,
+ "pp": 5,
+ "priority": 0,
+ "type": "fighting",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Collision Course inflicts damage. If the move is super effective on the target, its damage is increased by 30%."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/combat-torque.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/combat-torque.json
new file mode 100644
index 0000000000..df7d2bcdd8
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/combat-torque.json
@@ -0,0 +1,13 @@
+{
+ "name": "combat-torque",
+ "power": 100,
+ "pp": 10,
+ "priority": 0,
+ "type": "fighting",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Combat Torque inflicts damage and has a 30% chance of paralyzing the target.",
+ "effect_chance": 30
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/comeuppance.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/comeuppance.json
new file mode 100644
index 0000000000..1c667b44a4
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/comeuppance.json
@@ -0,0 +1,12 @@
+{
+ "name": "comeuppance",
+ "power": 0,
+ "pp": 10,
+ "priority": 0,
+ "type": "dark",
+ "accuracy": 100,
+ "target": "user",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Comeuppance returns 1.5 times the damage dealt by the foe's last attack. Unlike Counter or Mirror Coat, Comeuppance does not require specifically physical or special damage sources and Comeuppance does not have decreased priority; if the user acts before it is hit by an opponent's damaging move, Comeuppance will fail. The move also fails if the user's substitute is hit instead. In battles involving multiple Pokémon, Comeuppance will hit the last opponent that dealt damage to the user, even if that opponent is not adjacent to the user; Comeuppance cannot affect ally Pokémon."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/doodle.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/doodle.json
new file mode 100644
index 0000000000..ead1e69bbe
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/doodle.json
@@ -0,0 +1,13 @@
+{
+ "name": "doodle",
+ "power": 0,
+ "pp": 10,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "other",
+ "move_category": "unique",
+ "ailment": "none",
+ "effect_text_extend": "The user captures the very essence of the target in a sketch. This changes the Abilities of the user and its ally Pokémon to that of the target."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/double-shock.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/double-shock.json
new file mode 100644
index 0000000000..6ed22af4da
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/double-shock.json
@@ -0,0 +1,13 @@
+{
+ "name": "double-shock",
+ "power": 120,
+ "pp": 5,
+ "priority": 0,
+ "type": "electric",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user discharges all the electricity from its body to perform a high-damage attack. After using this move, the user will no longer be Electric type."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/electro-drift.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/electro-drift.json
new file mode 100644
index 0000000000..2aadbce219
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/electro-drift.json
@@ -0,0 +1,14 @@
+{
+ "name": "electro-drift",
+ "power": 100,
+ "pp": 5,
+ "priority": 0,
+ "type": "electric",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "special",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user races forward at ultrafast speeds, piercing its target with futuristic electricity. This move's power is boosted more than usual if it's a supereffective hit.",
+ "effect_chance": 50
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/fillet-away.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/fillet-away.json
new file mode 100644
index 0000000000..5a0b47197e
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/fillet-away.json
@@ -0,0 +1,15 @@
+{
+ "name": "fillet-away",
+ "power": 0,
+ "pp": 10,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 101,
+ "target": "user",
+ "damage_class": "status",
+ "move_category": "net-good-stats",
+ "stat_chance": 2,
+ "healing": -25,
+ "effect_text_extend": "The user sharply boosts its Attack, Sp. Atk, and Speed stats by using its own HP.",
+ "effect_chance": 10
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/flower-trick.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/flower-trick.json
new file mode 100644
index 0000000000..dbaa0ee101
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/flower-trick.json
@@ -0,0 +1,13 @@
+{
+ "name": "flower-trick",
+ "power": 70,
+ "pp": 10,
+ "priority": 0,
+ "type": "grass",
+ "accuracy": 101,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 100,
+ "effect_text_extend": "The user throws a rigged bouquet of flowers at the target. This attack never misses and always lands a critical hit."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/gigaton-hammer.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/gigaton-hammer.json
new file mode 100644
index 0000000000..d2296c139c
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/gigaton-hammer.json
@@ -0,0 +1,13 @@
+{
+ "name": "gigaton-hammer",
+ "power": 160,
+ "pp": 5,
+ "priority": 0,
+ "type": "steel",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user swings its whole body around to attack with its huge hammer. This move can't be used twice in a row."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/graive-rush.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/graive-rush.json
new file mode 100644
index 0000000000..6536c16bb0
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/graive-rush.json
@@ -0,0 +1,13 @@
+{
+ "name": "graive-rush",
+ "power": 120,
+ "pp": 5,
+ "priority": 0,
+ "type": "dragon",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user throws its entire body into a reckless charge. Attacks from opposing Pokémon during the next turn cannot miss and will inflict double damage."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/hyper-drill.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/hyper-drill.json
new file mode 100644
index 0000000000..844697fb54
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/hyper-drill.json
@@ -0,0 +1,13 @@
+{
+ "name": "hyper-drill",
+ "power": 100,
+ "pp": 5,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user spins the pointed part of its body at high speed to pierce the target. This attack can hit a target using a move such as Protect or Detect."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/ice-spinner.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/ice-spinner.json
new file mode 100644
index 0000000000..63a8071303
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/ice-spinner.json
@@ -0,0 +1,13 @@
+{
+ "name": "ice-spinner",
+ "power": 80,
+ "pp": 15,
+ "priority": 0,
+ "type": "ice",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user covers its feet in thin ice and twirls around, slamming into the target. This move's spinning motion also destroys the terrain."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/jet-punch.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/jet-punch.json
new file mode 100644
index 0000000000..ce7071eec4
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/jet-punch.json
@@ -0,0 +1,13 @@
+{
+ "name": "jet-punch",
+ "power": 60,
+ "pp": 15,
+ "priority": 0,
+ "type": "water",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user summons a torrent around its fist and punches at blinding speed. This move always goes first."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/kowtow-cleave.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/kowtow-cleave.json
new file mode 100644
index 0000000000..365b4d853f
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/kowtow-cleave.json
@@ -0,0 +1,13 @@
+{
+ "name": "kowtow-cleave",
+ "power": 85,
+ "pp": 10,
+ "priority": 0,
+ "type": "dark",
+ "accuracy": 101,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user slashes at the target after kowtowing to make the target let down its guard. This attack never misses."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/last-respects.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/last-respects.json
new file mode 100644
index 0000000000..904d78295a
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/last-respects.json
@@ -0,0 +1,13 @@
+{
+ "name": "last-respects",
+ "power": 50,
+ "pp": 10,
+ "priority": 0,
+ "type": "ghost",
+ "accuracy": 100,
+ "target": "allys",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user attacks to avenge its allies. The more defeated allies there are in the user's party, the greater the move's power."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/lumina-crash.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/lumina-crash.json
new file mode 100644
index 0000000000..efb549e3a0
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/lumina-crash.json
@@ -0,0 +1,13 @@
+{
+ "name": "lumina-crash",
+ "power": 80,
+ "pp": 10,
+ "priority": 0,
+ "type": "psychic",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "special",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user attacks by unleashing a peculiar light that even affects the mind. This also harshly lowers the target's Sp. Def stat."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/magical-torque.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/magical-torque.json
new file mode 100644
index 0000000000..7afe8c326f
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/magical-torque.json
@@ -0,0 +1,14 @@
+{
+ "name": "magical-torque",
+ "power": 100,
+ "pp": 10,
+ "priority": 0,
+ "type": "fairy",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "This move is only used by a Starmobile. It may confuse the opponent",
+ "effect_chance": 30
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/make-it-rain.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/make-it-rain.json
new file mode 100644
index 0000000000..e5afd35785
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/make-it-rain.json
@@ -0,0 +1,13 @@
+{
+ "name": "make-it-rain",
+ "power": 120,
+ "pp": 5,
+ "priority": 0,
+ "type": "steel",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "special",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user attacks by throwing out a mass of coins. This also lowers the user's Sp. Atk stat. Money is earned after the battle."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/mortal-spin.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/mortal-spin.json
new file mode 100644
index 0000000000..9d62113221
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/mortal-spin.json
@@ -0,0 +1,15 @@
+{
+ "name": "mortal-spin",
+ "power": 30,
+ "pp": 15,
+ "priority": 0,
+ "type": "poison",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "ailment": "poison",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user performs a spin attack that can also eliminate the effects of such moves as Bind, Wrap, and Leech Seed. This also poisons opposing Pokémon.",
+ "effect_chance": 100
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/noxious-torque.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/noxious-torque.json
new file mode 100644
index 0000000000..2f98ee337d
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/noxious-torque.json
@@ -0,0 +1,14 @@
+{
+ "name": "noxious-torque",
+ "power": 100,
+ "pp": 10,
+ "priority": 0,
+ "type": "poison",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "This move is only used by a Starmobile. It may Poison the opponent",
+ "effect_chance": 30
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/order-up.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/order-up.json
new file mode 100644
index 0000000000..7b6f244949
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/order-up.json
@@ -0,0 +1,13 @@
+{
+ "name": "order-up",
+ "power": 80,
+ "pp": 10,
+ "priority": 0,
+ "type": "dragon",
+ "accuracy": 100,
+ "target": "selected-pokemon",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "crit_rate": 4.17,
+ "effect_text_extend": "The user attacks with elegant poise. If the user has a Tatsugiri in its mouth, this move boosts one of the user's stats based on the Tatsugiri's form."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/population-bomb.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/population-bomb.json
new file mode 100644
index 0000000000..22ed992efd
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/population-bomb.json
@@ -0,0 +1,12 @@
+{
+ "name": "population-bomb",
+ "power": 20,
+ "pp": 10,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 90,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Population Bomb inflicts damage, hitting the target up to ten times per use."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/pounce.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/pounce.json
new file mode 100644
index 0000000000..853d85b201
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/pounce.json
@@ -0,0 +1,12 @@
+{
+ "name": "pounce",
+ "power": 50,
+ "pp": 20,
+ "priority": 0,
+ "type": "bug",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Pounce inflicts damage and lowers the target's Speed by one stage."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/rage-fist.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/rage-fist.json
new file mode 100644
index 0000000000..7c1b8cd304
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/rage-fist.json
@@ -0,0 +1,12 @@
+{
+ "name": "rage-fist",
+ "power": 50,
+ "pp": 10,
+ "priority": 0,
+ "type": "ghost",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Rage Fist inflicts damage. Its power increases by 50 each time the user was hit during a battle (including times the user hit itself in confusion), up to a maximum of 350 (after 6 hits), with each strike from a multi-strike move counting as one hit. Switching out or fainting does not reset the hit counter."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/raging-bull.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/raging-bull.json
new file mode 100644
index 0000000000..cca1e6fcd5
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/raging-bull.json
@@ -0,0 +1,12 @@
+{
+ "name": "raging-bull",
+ "power": 90,
+ "pp": 10,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Raging Bull removes Light Screen, Reflect, and Aurora Veil from the target's side of the field (even if it targets an ally), then inflicts damage. It fails if the target is immune to Raging Bull, if Raging Bull misses, or if the target is protected from Raging Bull."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/revival-blessing.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/revival-blessing.json
new file mode 100644
index 0000000000..ced738c447
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/revival-blessing.json
@@ -0,0 +1,12 @@
+{
+ "name": "revival-blessing",
+ "power": 0,
+ "pp": 1,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 0,
+ "target": "user",
+ "damage_class": "other",
+ "move_category": "damage",
+ "effect_text_extend": "Revival Blessing allows the player to select a fainted Pokémon in the party, the selected Pokémon will be revived, and half of its maximum HP will be restored. Revival Blessing will fail if there are no fainted Pokémon in the party."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/ruination.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/ruination.json
new file mode 100644
index 0000000000..c7e49592a7
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/ruination.json
@@ -0,0 +1,12 @@
+{
+ "name": "ruination",
+ "power": 0,
+ "pp": 10,
+ "priority": 0,
+ "type": "dark",
+ "accuracy": 90,
+ "target": "all-opponents",
+ "damage_class": "special",
+ "move_category": "damage",
+ "effect_text_extend": "Ruination deals damage equal to 50% of the opponent's remaining HP. It always deals at least 1 HP of damage."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/salt-cure.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/salt-cure.json
new file mode 100644
index 0000000000..b2674a5d48
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/salt-cure.json
@@ -0,0 +1,12 @@
+{
+ "name": "salt-cure",
+ "power": 40,
+ "pp": 15,
+ "priority": 0,
+ "type": "rock",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Salt Cure inflicts 1/8 of the target's maximum HP as damage per turn in addition to the damage dealt when it is used. If a Steel or Water type is affected by Salt Cure, the amount of damage per turn is doubled."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/shed-tail.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/shed-tail.json
new file mode 100644
index 0000000000..eb7b26c168
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/shed-tail.json
@@ -0,0 +1,12 @@
+{
+ "name": "shed-tail",
+ "power": 0,
+ "pp": 10,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "other",
+ "move_category": "damage",
+ "effect_text_extend": "Shed Tail creates a substitute by using half of the user's maximum HP (rounded up), then switches the user out. The Pokémon that switches in will then have the substitute."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/silk-trap.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/silk-trap.json
new file mode 100644
index 0000000000..c7751bc4a9
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/silk-trap.json
@@ -0,0 +1,12 @@
+{
+ "name": "silk-trap",
+ "power": 0,
+ "pp": 10,
+ "priority": 4,
+ "type": "bug",
+ "accuracy": 0,
+ "target": "user",
+ "damage_class": "other",
+ "move_category": "damage",
+ "effect_text_extend": "Silk Trap protects the user from any moves except status moves for that turn. Additionally, if Silk Trap blocks an attack that would make contact with the user, the attacker's Speed stat is lowered by one stage."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/snowscape.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/snowscape.json
new file mode 100644
index 0000000000..ee244a223b
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/snowscape.json
@@ -0,0 +1,12 @@
+{
+ "name": "snowscape",
+ "power": 0,
+ "pp": 10,
+ "priority": 0,
+ "type": "ice",
+ "accuracy": 0,
+ "target": "all-pokemon",
+ "damage_class": "other",
+ "move_category": "damage",
+ "effect_text_extend": "When Snowscape is used, a snowstorm will begin on the field. This effect will last for 5 turns. This clears any other type of weather."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/spicy-extract.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/spicy-extract.json
new file mode 100644
index 0000000000..6c0f96c727
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/spicy-extract.json
@@ -0,0 +1,12 @@
+{
+ "name": "spicy-extract",
+ "power": 0,
+ "pp": 15,
+ "priority": 0,
+ "type": "grass",
+ "accuracy": 0,
+ "target": "all-opponents",
+ "damage_class": "other",
+ "move_category": "damage",
+ "effect_text_extend": "Spicy Extract raises the target's Attack and lowers the target's Defense, each by two stages. It bypasses accuracy checks to always hit, unless the target is in the semi-invulnerable turn of a move such as Dig or Fly."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/spin-out.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/spin-out.json
new file mode 100644
index 0000000000..9483151ecd
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/spin-out.json
@@ -0,0 +1,12 @@
+{
+ "name": "spin-out",
+ "power": 100,
+ "pp": 5,
+ "priority": 0,
+ "type": "steel",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Spin Out inflicts damage and lowers the user's Speed by two stages."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/tera-blast.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/tera-blast.json
new file mode 100644
index 0000000000..b22f8bed71
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/tera-blast.json
@@ -0,0 +1,12 @@
+{
+ "name": "tera-blast",
+ "power": 80,
+ "pp": 10,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "special",
+ "move_category": "damage",
+ "effect_text_extend": "Tera Blast deals damage. If the user's Attack stat is higher than its Special Attack stat, Tera Blast becomes a physical move; otherwise, it remains a special move."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/tidy-up.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/tidy-up.json
new file mode 100644
index 0000000000..44efd0b685
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/tidy-up.json
@@ -0,0 +1,12 @@
+{
+ "name": "tidy-up",
+ "power": 0,
+ "pp": 10,
+ "priority": 0,
+ "type": "normal",
+ "accuracy": 0,
+ "target": "user",
+ "damage_class": "other",
+ "move_category": "damage",
+ "effect_text_extend": "Tidy Up raises the user's Attack stat and Speed stat by one stage each. It also clears away substitutes, Spikes, Toxic Spikes, Stealth Rock, and Sticky Web on both the user's and target's side of the field. The user's stats will still be raised even if there are no traps or substitutes to remove."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/torch-song.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/torch-song.json
new file mode 100644
index 0000000000..c55bbd9248
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/torch-song.json
@@ -0,0 +1,12 @@
+{
+ "name": "torch-song",
+ "power": 80,
+ "pp": 10,
+ "priority": 0,
+ "type": "fire",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "special",
+ "move_category": "damage",
+ "effect_text_extend": "Torch Song inflicts damage and raises the user's Special Attack by one stage. Pokémon with the Ability Soundproof or Flash Fire are immune to this move."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/trailblase.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/trailblase.json
new file mode 100644
index 0000000000..4b1c289d73
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/trailblase.json
@@ -0,0 +1,12 @@
+{
+ "name": "trailblase",
+ "power": 50,
+ "pp": 20,
+ "priority": 0,
+ "type": "grass",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Trailblaze inflicts damage and raises the user's Speed by one stage."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/triple-dive.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/triple-dive.json
new file mode 100644
index 0000000000..4bbc6c6b9b
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/triple-dive.json
@@ -0,0 +1,12 @@
+{
+ "name": "triple-dive",
+ "power": 30,
+ "pp": 10,
+ "priority": 0,
+ "type": "water",
+ "accuracy": 95,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Triple Dive inflicts damage, hitting the target three times per use."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/twin-beam.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/twin-beam.json
new file mode 100644
index 0000000000..0cd6ba6b0e
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/twin-beam.json
@@ -0,0 +1,12 @@
+{
+ "name": "twin-beam",
+ "power": 40,
+ "pp": 10,
+ "priority": 0,
+ "type": "psychic",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "special",
+ "move_category": "damage",
+ "effect_text_extend": "Twin Beam inflicts damage, hitting the target twice per use."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/wicked-torque.json b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/wicked-torque.json
new file mode 100644
index 0000000000..1f58fc1e5e
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/moves/entries/new/wicked-torque.json
@@ -0,0 +1,12 @@
+{
+ "name": "wicked-torque",
+ "power": 80,
+ "pp": 10,
+ "priority": 0,
+ "type": "dark",
+ "accuracy": 100,
+ "target": "all-opponents",
+ "damage_class": "physical",
+ "move_category": "damage",
+ "effect_text_extend": "Wicked Torque inflicts damage and has a 10% chance of putting the target to sleep."
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/bisharp.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/bisharp.json
index 616b6f6cce..5cbf471a96 100644
--- a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/bisharp.json
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/bisharp.json
@@ -202,5 +202,12 @@
"lash-out"
]
},
+ "evolutions": [
+ {
+ "name": "kingambit",
+ "evoMoves": "kowtow-cleave",
+ "item_preset": "pokecube_mobs:leader_chest"
+ }
+ ],
"loot_table": "pokecube:entities/rabbit_2"
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/burmy.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/burmy.json
index bfe202fde5..d84a637c7a 100644
--- a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/burmy.json
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/burmy.json
@@ -74,30 +74,42 @@
"model": {
"key": "burmy-plant",
"tex": "burmy-plant",
- "model": "burmy",
- "anim": "burmy",
- "types": "bug"
+ "model": "burmy-plant",
+ "anim": "burmy-plant"
},
"models": [
{
"key": "burmy-sandy",
"tex": "burmy-sandy",
- "model": "burmy",
- "anim": "burmy",
- "types": "bug"
+ "model": "burmy-sandy",
+ "anim": "burmy-sandy"
},
{
"key": "burmy-trash",
"tex": "burmy-trash",
- "model": "burmy",
- "anim": "burmy",
- "types": "bug"
+ "model": "burmy-trash",
+ "anim": "burmy-trash"
}
],
"evolutions": [
{
"name": "wormadam-plant",
"level": 20,
+ "form_from": "burmy-plant",
+ "sexe": "female",
+ "evoMoves": "quiver-dance"
+ },
+ {
+ "name": "wormadam-sandy",
+ "level": 20,
+ "form_from": "burmy-sandy",
+ "sexe": "female",
+ "evoMoves": "quiver-dance"
+ },
+ {
+ "name": "wormadam-trash",
+ "level": 20,
+ "form_from": "burmy-trash",
"sexe": "female",
"evoMoves": "quiver-dance"
},
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/crocalor.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/crocalor.json
new file mode 100644
index 0000000000..8a996d748d
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/crocalor.json
@@ -0,0 +1,157 @@
+{
+ "name": "crocalor",
+ "id": 910,
+ "stock": true,
+ "base_experience": 70,
+ "size": {
+ "height": 1
+ },
+ "mass": 30.7,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "slow",
+ "gender_rate": 62,
+ "stats": {
+ "hp": 81,
+ "attack": 55,
+ "defense": 78,
+ "special_attack": 90,
+ "special_defense": 58,
+ "speed": 49
+ },
+ "evs": {
+ "special_attack": 2
+ },
+ "types": [
+ "fire"
+ ],
+ "abilities": {
+ "normal": [
+ "blaze"
+ ],
+ "hidden": [
+ "unaware"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "tackle",
+ "leer",
+ "ember"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "lick"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "round"
+ ]
+ },
+ {
+ "L": 12,
+ "moves": [
+ "bite"
+ ]
+ },
+ {
+ "L": 15,
+ "moves": [
+ "yawn"
+ ]
+ },
+ {
+ "L": 17,
+ "moves": [
+ "incinerate"
+ ]
+ },
+ {
+ "L": 24,
+ "moves": [
+ "snarl"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "roar"
+ ]
+ },
+ {
+ "L": 32,
+ "moves": [
+ "flamethrower"
+ ]
+ },
+ {
+ "L": 38,
+ "moves": [
+ "hyper-voice"
+ ]
+ },
+ {
+ "L": 42,
+ "moves": [
+ "will-o-wisp"
+ ]
+ },
+ {
+ "L": 47,
+ "moves": [
+ "fire-blast"
+ ]
+ }
+ ],
+ "misc": [
+ "body-slam",
+ "take-down",
+ "flamethrower",
+ "fire-spin",
+ "dig",
+ "fire-blast",
+ "rest",
+ "substitute",
+ "protect",
+ "mud-slap",
+ "outrage",
+ "endure",
+ "sleep-talk",
+ "sunny-day",
+ "crunch",
+ "heat-wave",
+ "will-o-wisp",
+ "facade",
+ "helping-hand",
+ "hyper-voice",
+ "overheat",
+ "flare-blitz",
+ "seed-bomb",
+ "thunder-fang",
+ "fire-fang",
+ "zen-headbutt",
+ "flame-charge",
+ "fire-pledge",
+ "snarl",
+ "disarming-voice",
+ "stomping-tantrum",
+ "tera-blast"
+ ]
+ },
+ "evolutions": [
+ {
+ "name": "skeledirge",
+ "level": 36,
+ "evoMoves": "torch-song"
+ }
+ ],
+ "loot_table": "pokecube:entities/blaze_rabbit_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/farigiraf.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/farigiraf.json
new file mode 100644
index 0000000000..7c88e7a16a
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/farigiraf.json
@@ -0,0 +1,177 @@
+{
+ "name": "farigiraf",
+ "id": 928,
+ "stock": true,
+ "base_experience": 159,
+ "size": {
+ "height": 3.2,
+ "width": 0.6,
+ "length": 0.6
+ },
+ "mass": 160,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "medium-fast",
+ "gender_rate": 127,
+ "stats": {
+ "hp": 120,
+ "attack": 90,
+ "defense": 70,
+ "special_attack": 110,
+ "special_defense": 70,
+ "speed": 60
+ },
+ "evs": {
+ "hp": 3
+ },
+ "types": [
+ "normal",
+ "psychic"
+ ],
+ "abilities": {
+ "normal": [
+ "cud-chew",
+ "armor-tail"
+ ],
+ "hidden": [
+ "sap-sipper"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "tackle",
+ "growl",
+ "astonish",
+ "power-swap",
+ "guard-swap"
+ ]
+ },
+ {
+ "L": 5,
+ "moves": [
+ "confusion"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "assurance"
+ ]
+ },
+ {
+ "L": 14,
+ "moves": [
+ "stomp"
+ ]
+ },
+ {
+ "L": 19,
+ "moves": [
+ "psybeam"
+ ]
+ },
+ {
+ "L": 23,
+ "moves": [
+ "agility"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "double-hit"
+ ]
+ },
+ {
+ "L": 32,
+ "moves": [
+ "twin-beam"
+ ]
+ },
+ {
+ "L": 37,
+ "moves": [
+ "crunch"
+ ]
+ },
+ {
+ "L": 41,
+ "moves": [
+ "baton-pass"
+ ]
+ },
+ {
+ "L": 46,
+ "moves": [
+ "nasty-plot"
+ ]
+ },
+ {
+ "L": 50,
+ "moves": [
+ "psychic"
+ ]
+ }
+ ],
+ "misc": [
+ "body-slam",
+ "take-down",
+ "psybeam",
+ "hyper-beam",
+ "low-kick",
+ "thunderbolt",
+ "thunder-wave",
+ "thunder",
+ "earthquake",
+ "psychic",
+ "agility",
+ "night-shade",
+ "confuse-ray",
+ "light-screen",
+ "reflect",
+ "swift",
+ "amnesia",
+ "rest",
+ "substitute",
+ "thief",
+ "protect",
+ "endure",
+ "sleep-talk",
+ "baton-pass",
+ "rain-dance",
+ "sunny-day",
+ "crunch",
+ "shadow-ball",
+ "facade",
+ "helping-hand",
+ "trick",
+ "skill-swap",
+ "imprison",
+ "hyper-voice",
+ "calm-mind",
+ "energy-ball",
+ "giga-impact",
+ "nasty-plot",
+ "zen-headbutt",
+ "trick-room",
+ "iron-head",
+ "grass-knot",
+ "charge-beam",
+ "psyshock",
+ "foul-play",
+ "stored-power",
+ "bulldoze",
+ "dazzling-gleam",
+ "psychic-terrain",
+ "psychic-fangs",
+ "stomping-tantrum",
+ "tera-blast",
+ "trailblaze"
+ ]
+ },
+ "loot_table": "pokecube:entities/ender_cow_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/floragato.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/floragato.json
new file mode 100644
index 0000000000..45928bff6b
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/floragato.json
@@ -0,0 +1,162 @@
+{
+ "name": "floragato",
+ "id": 907,
+ "stock": true,
+ "base_experience": 62,
+ "size": {
+ "height": 0.9
+ },
+ "mass": 12.2,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "medium-slow",
+ "gender_rate": 62,
+ "stats": {
+ "hp": 61,
+ "attack": 80,
+ "defense": 63,
+ "special_attack": 60,
+ "special_defense": 63,
+ "speed": 83
+ },
+ "evs": {
+ "speed": 2
+ },
+ "types": [
+ "grass"
+ ],
+ "abilities": {
+ "normal": [
+ "overgrow"
+ ],
+ "hidden": [
+ "protean"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "scratch",
+ "tail-whip",
+ "leafage"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "bite"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "hone-claws"
+ ]
+ },
+ {
+ "L": 13,
+ "moves": [
+ "magical-leaf"
+ ]
+ },
+ {
+ "L": 15,
+ "moves": [
+ "quick-attack"
+ ]
+ },
+ {
+ "L": 20,
+ "moves": [
+ "seed-bomb"
+ ]
+ },
+ {
+ "L": 24,
+ "moves": [
+ "u-turn"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "worry-seed"
+ ]
+ },
+ {
+ "L": 33,
+ "moves": [
+ "slash"
+ ]
+ },
+ {
+ "L": 38,
+ "moves": [
+ "energy-ball"
+ ]
+ },
+ {
+ "L": 42,
+ "moves": [
+ "play-rough"
+ ]
+ },
+ {
+ "L": 46,
+ "moves": [
+ "leaf-storm"
+ ]
+ }
+ ],
+ "misc": [
+ "thunder-punch",
+ "take-down",
+ "low-kick",
+ "solar-beam",
+ "agility",
+ "swift",
+ "rest",
+ "substitute",
+ "protect",
+ "mud-slap",
+ "giga-drain",
+ "endure",
+ "charm",
+ "sleep-talk",
+ "facade",
+ "taunt",
+ "helping-hand",
+ "fake-tears",
+ "bullet-seed",
+ "aerial-ace",
+ "magical-leaf",
+ "u-turn",
+ "fling",
+ "seed-bomb",
+ "energy-ball",
+ "nasty-plot",
+ "shadow-claw",
+ "leaf-storm",
+ "grass-knot",
+ "low-sweep",
+ "acrobatics",
+ "grass-pledge",
+ "disarming-voice",
+ "grassy-terrain",
+ "play-rough",
+ "tera-blast",
+ "trailblaze"
+ ]
+ },
+ "evolutions": [
+ {
+ "name": "moewscarada",
+ "level": 36,
+ "evoMoves": "flower-trick"
+ }
+ ],
+ "loot_table": "pokecube:entities/money_cat_small"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/fuecoco.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/fuecoco.json
new file mode 100644
index 0000000000..3bea794cf5
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/fuecoco.json
@@ -0,0 +1,146 @@
+{
+ "name": "fuecoco",
+ "id": 909,
+ "stock": true,
+ "base_experience": 70,
+ "size": {
+ "height": 0.4
+ },
+ "mass": 9.8,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "slow",
+ "gender_rate": 62,
+ "stats": {
+ "hp": 67,
+ "attack": 45,
+ "defense": 59,
+ "special_attack": 63,
+ "special_defense": 43,
+ "speed": 36
+ },
+ "evs": {
+ "hp": 1
+ },
+ "types": [
+ "fire"
+ ],
+ "abilities": {
+ "normal": [
+ "blaze"
+ ],
+ "hidden": [
+ "unaware"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "tackle",
+ "leer",
+ "ember"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "round"
+ ]
+ },
+ {
+ "L": 12,
+ "moves": [
+ "bite"
+ ]
+ },
+ {
+ "L": 15,
+ "moves": [
+ "incinerate"
+ ]
+ },
+ {
+ "L": 17,
+ "moves": [
+ "yawn"
+ ]
+ },
+ {
+ "L": 21,
+ "moves": [
+ "snarl"
+ ]
+ },
+ {
+ "L": 25,
+ "moves": [
+ "roar"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "flamethrower"
+ ]
+ },
+ {
+ "L": 32,
+ "moves": [
+ "hyper-voice"
+ ]
+ },
+ {
+ "L": 36,
+ "moves": [
+ "fire-blast"
+ ]
+ }
+ ],
+ "misc": [
+ "body-slam",
+ "take-down",
+ "flamethrower",
+ "fire-spin",
+ "dig",
+ "fire-blast",
+ "rest",
+ "substitute",
+ "protect",
+ "mud-slap",
+ "outrage",
+ "endure",
+ "sleep-talk",
+ "encore",
+ "sunny-day",
+ "crunch",
+ "heat-wave",
+ "will-o-wisp",
+ "facade",
+ "helping-hand",
+ "hyper-voice",
+ "overheat",
+ "flare-blitz",
+ "seed-bomb",
+ "thunder-fang",
+ "fire-fang",
+ "zen-headbutt",
+ "flame-charge",
+ "fire-pledge",
+ "snarl",
+ "disarming-voice",
+ "stomping-tantrum",
+ "tera-blast"
+ ]
+ },
+ "evolutions": [
+ {
+ "name": "crocalor",
+ "level": 16,
+ "evoMoves": ""
+ }
+ ],
+ "loot_table": "pokecube:entities/blaze_rabbit_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/genesect.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/genesect.json
index a8007c9e40..d88b7653ec 100644
--- a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/genesect.json
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/genesect.json
@@ -221,6 +221,24 @@
"model": {
"key": "genesect-shock"
}
+ },
+ {
+ "item": "minecraft:lapis_lazuli",
+ "model": {
+ "key": "genesect-douse"
+ }
+ },
+ {
+ "item": "minecraft:blaze_rod",
+ "model": {
+ "key": "genesect-burn"
+ }
+ },
+ {
+ "item": "minecraft:iron_block",
+ "model": {
+ "key": "genesect-chill"
+ }
}
],
"model": {
@@ -234,29 +252,29 @@
{
"key": "genesect-douse",
"tex": "genesect",
- "model": "genesect",
- "anim": "genesect",
+ "model": "genesect-douse",
+ "anim": "genesect-douse",
"types": "bug,steel"
},
{
"key": "genesect-shock",
"tex": "genesect",
- "model": "genesect",
- "anim": "genesect",
+ "model": "genesect-shock",
+ "anim": "genesect-shock",
"types": "bug,steel"
},
{
"key": "genesect-burn",
"tex": "genesect",
- "model": "genesect",
- "anim": "genesect",
+ "model": "genesect-burn",
+ "anim": "genesect-burn",
"types": "bug,steel"
},
{
"key": "genesect-chill",
"tex": "genesect",
- "model": "genesect",
- "anim": "genesect",
+ "model": "genesect-chill",
+ "anim": "genesect-chill",
"types": "bug,steel"
}
]
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/girafarig.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/girafarig.json
index 31d4b061a2..537f6ad3dc 100644
--- a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/girafarig.json
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/girafarig.json
@@ -216,7 +216,8 @@
"dazzling-gleam",
"psychic-terrain",
"psychic-fangs",
- "stomping-tantrum"
+ "stomping-tantrum",
+ "twin-beam"
]
},
"male_model": {
@@ -231,5 +232,11 @@
"model": "girafarig_female",
"anim": "girafarig_female"
},
+ "evolutions": [
+ {
+ "name": "farigiraf",
+ "move": "twin-beam"
+ }
+ ],
"loot_table": "pokecube:entities/ender_cow_1"
}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/koraidon.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/koraidon.json
new file mode 100644
index 0000000000..33ecaa180e
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/koraidon.json
@@ -0,0 +1,189 @@
+{
+ "name": "koraidon",
+ "id": 998,
+ "stock": true,
+ "base_experience": 60,
+ "size": {
+ "height": 2.5
+ },
+ "mass": 303,
+ "is_default": true,
+ "capture_rate": 3,
+ "base_happiness": 0,
+ "growth_rate": "slow",
+ "gender_rate": 255,
+ "stats": {
+ "hp": 100,
+ "attack": 135,
+ "defense": 115,
+ "special_attack": 85,
+ "special_defense": 100,
+ "speed": 135
+ },
+ "evs": {
+ "attack": 3
+ },
+ "types": [
+ "fighting",
+ "dragon"
+ ],
+ "abilities": {
+ "normal": [
+ "orichalcum-pulse"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "sunny-day",
+ "breaking-swipe"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "rock-smash"
+ ]
+ },
+ {
+ "L": 14,
+ "moves": [
+ "ancient-power"
+ ]
+ },
+ {
+ "L": 21,
+ "moves": [
+ "drain-punch"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "brick-break"
+ ]
+ },
+ {
+ "L": 35,
+ "moves": [
+ "agility"
+ ]
+ },
+ {
+ "L": 42,
+ "moves": [
+ "dragon-claw"
+ ]
+ },
+ {
+ "L": 49,
+ "moves": [
+ "flamethrower"
+ ]
+ },
+ {
+ "L": 56,
+ "moves": [
+ "collision-course"
+ ]
+ },
+ {
+ "L": 63,
+ "moves": [
+ "screech"
+ ]
+ },
+ {
+ "L": 70,
+ "moves": [
+ "counter"
+ ]
+ },
+ {
+ "L": 77,
+ "moves": [
+ "outrage"
+ ]
+ },
+ {
+ "L": 84,
+ "moves": [
+ "close-combat"
+ ]
+ },
+ {
+ "L": 91,
+ "moves": [
+ "flare-blitz"
+ ]
+ },
+ {
+ "L": 98,
+ "moves": [
+ "giga-impact"
+ ]
+ }
+ ],
+ "misc": [
+ "swords-dance",
+ "body-slam",
+ "take-down",
+ "flamethrower",
+ "hyper-beam",
+ "low-kick",
+ "solar-beam",
+ "fire-spin",
+ "dig",
+ "agility",
+ "fire-blast",
+ "rest",
+ "substitute",
+ "reversal",
+ "protect",
+ "scary-face",
+ "mud-slap",
+ "outrage",
+ "endure",
+ "sleep-talk",
+ "sunny-day",
+ "crunch",
+ "heat-wave",
+ "facade",
+ "taunt",
+ "helping-hand",
+ "brick-break",
+ "overheat",
+ "dragon-claw",
+ "bulk-up",
+ "mud-shot",
+ "u-turn",
+ "close-combat",
+ "flare-blitz",
+ "dragon-pulse",
+ "drain-punch",
+ "focus-blast",
+ "giga-impact",
+ "shadow-claw",
+ "thunder-fang",
+ "ice-fang",
+ "fire-fang",
+ "zen-headbutt",
+ "draco-meteor",
+ "iron-head",
+ "heavy-slam",
+ "flame-charge",
+ "low-sweep",
+ "acrobatics",
+ "bulldoze",
+ "dragon-tail",
+ "wild-charge",
+ "snarl",
+ "stomping-tantrum",
+ "body-press",
+ "tera-blast"
+ ]
+ },
+ "loot_table": "pokecube:entities/cobble_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/meowscarada.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/meowscarada.json
new file mode 100644
index 0000000000..32bce0d959
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/meowscarada.json
@@ -0,0 +1,192 @@
+{
+ "name": "meowscarada",
+ "id": 908,
+ "stock": true,
+ "base_experience": 62,
+ "size": {
+ "height": 1.5
+ },
+ "mass": 31.2,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "medium-slow",
+ "gender_rate": 62,
+ "stats": {
+ "hp": 76,
+ "attack": 110,
+ "defense": 70,
+ "special_attack": 81,
+ "special_defense": 70,
+ "speed": 123
+ },
+ "evs": {
+ "speed": 3
+ },
+ "types": [
+ "grass",
+ "dark"
+ ],
+ "abilities": {
+ "normal": [
+ "overgrow"
+ ],
+ "hidden": [
+ "protean"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "scratch",
+ "tail-whip",
+ "leafage"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "bite"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "hone-claws"
+ ]
+ },
+ {
+ "L": 13,
+ "moves": [
+ "magical-leaf"
+ ]
+ },
+ {
+ "L": 15,
+ "moves": [
+ "quick-attack"
+ ]
+ },
+ {
+ "L": 20,
+ "moves": [
+ "seed-bomb"
+ ]
+ },
+ {
+ "L": 24,
+ "moves": [
+ "u-turn"
+ ]
+ },
+ {
+ "L": 29,
+ "moves": [
+ "worry-seed"
+ ]
+ },
+ {
+ "L": 33,
+ "moves": [
+ "slash"
+ ]
+ },
+ {
+ "L": 38,
+ "moves": [
+ "night-slash"
+ ]
+ },
+ {
+ "L": 42,
+ "moves": [
+ "energy-ball"
+ ]
+ },
+ {
+ "L": 47,
+ "moves": [
+ "play-rough"
+ ]
+ },
+ {
+ "L": 52,
+ "moves": [
+ "knock-off"
+ ]
+ },
+ {
+ "L": 58,
+ "moves": [
+ "grassy-terrain"
+ ]
+ },
+ {
+ "L": 64,
+ "moves": [
+ "leaf-storm"
+ ]
+ }
+ ],
+ "misc": [
+ "thunder-punch",
+ "take-down",
+ "hyper-beam",
+ "low-kick",
+ "double-team",
+ "solar-beam",
+ "agility",
+ "swift",
+ "rest",
+ "substitute",
+ "thief",
+ "protect",
+ "mud-slap",
+ "spikes",
+ "giga-drain",
+ "endure",
+ "charm",
+ "sleep-talk",
+ "shadow-ball",
+ "facade",
+ "taunt",
+ "helping-hand",
+ "trick",
+ "brick-break",
+ "skill-swap",
+ "fake-tears",
+ "bullet-seed",
+ "aerial-ace",
+ "frenzy-plant",
+ "magical-leaf",
+ "u-turn",
+ "fling",
+ "toxic-spikes",
+ "aura-sphere",
+ "dark-pulse",
+ "seed-bomb",
+ "power-gem",
+ "energy-ball",
+ "giga-impact",
+ "nasty-plot",
+ "shadow-claw",
+ "trick-room",
+ "leaf-storm",
+ "grass-knot",
+ "low-sweep",
+ "foul-play",
+ "acrobatics",
+ "grass-pledge",
+ "disarming-voice",
+ "grassy-terrain",
+ "play-rough",
+ "pollen-puff",
+ "tera-blast",
+ "trailblaze",
+ "chilling-water"
+ ]
+ },
+ "loot_table": "pokecube:entities/money_cat_small"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/miraidon.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/miraidon.json
new file mode 100644
index 0000000000..819eb81076
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/miraidon.json
@@ -0,0 +1,173 @@
+{
+ "name": "miraidon",
+ "id": 999,
+ "stock": true,
+ "base_experience": 60,
+ "size": {
+ "height": 3.5
+ },
+ "mass": 240,
+ "is_default": true,
+ "capture_rate": 3,
+ "base_happiness": 0,
+ "growth_rate": "slow",
+ "gender_rate": 127,
+ "stats": {
+ "hp": 100,
+ "attack": 85,
+ "defense": 100,
+ "special_attack": 135,
+ "special_defense": 115,
+ "speed": 135
+ },
+ "evs": {
+ "special_attack": 3
+ },
+ "types": [
+ "electric",
+ "dragon"
+ ],
+ "abilities": {
+ "normal": [
+ "hadron-engine"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "thunder-shock",
+ "dragon-breath",
+ "electric-terrain"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "shock-wave"
+ ]
+ },
+ {
+ "L": 14,
+ "moves": [
+ "charge"
+ ]
+ },
+ {
+ "L": 21,
+ "moves": [
+ "parabolic-charge"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "discharge"
+ ]
+ },
+ {
+ "L": 35,
+ "moves": [
+ "agility"
+ ]
+ },
+ {
+ "L": 42,
+ "moves": [
+ "dragon-pulse"
+ ]
+ },
+ {
+ "L": 56,
+ "moves": [
+ "electro-drift"
+ ]
+ },
+ {
+ "L": 63,
+ "moves": [
+ "metal-sound"
+ ]
+ },
+ {
+ "L": 70,
+ "moves": [
+ "mirror-coat"
+ ]
+ },
+ {
+ "L": 77,
+ "moves": [
+ "outrage"
+ ]
+ },
+ {
+ "L": 84,
+ "moves": [
+ "thunder"
+ ]
+ },
+ {
+ "L": 91,
+ "moves": [
+ "overheat"
+ ]
+ },
+ {
+ "L": 98,
+ "moves": [
+ "hyper-beam"
+ ]
+ }
+ ],
+ "misc": [
+ "swords-dance",
+ "body-slam",
+ "take-down",
+ "hyper-beam",
+ "solar-beam",
+ "thunderbolt",
+ "thunder-wave",
+ "thunder",
+ "agility",
+ "confuse-ray",
+ "light-screen",
+ "reflect",
+ "rest",
+ "substitute",
+ "protect",
+ "scary-face",
+ "outrage",
+ "endure",
+ "sleep-talk",
+ "crunch",
+ "facade",
+ "taunt",
+ "helping-hand",
+ "overheat",
+ "dragon-claw",
+ "calm-mind",
+ "u-turn",
+ "dragon-pulse",
+ "power-gem",
+ "giga-impact",
+ "zen-headbutt",
+ "flash-cannon",
+ "draco-meteor",
+ "charge-beam",
+ "heavy-slam",
+ "electro-ball",
+ "acrobatics",
+ "volt-switch",
+ "dragon-tail",
+ "wild-charge",
+ "snarl",
+ "eerie-impulse",
+ "electric-terrain",
+ "dazzling-gleam",
+ "tera-blast"
+ ]
+ },
+ "loot_table": "pokecube:entities/cobble_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaquaval.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaquaval.json
new file mode 100644
index 0000000000..9f777a9ae2
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaquaval.json
@@ -0,0 +1,176 @@
+{
+ "name": "quaquaval",
+ "id": 914,
+ "stock": true,
+ "base_experience": 64,
+ "size": {
+ "height": 1.8
+ },
+ "mass": 61.9,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "medium-slow",
+ "gender_rate": 30,
+ "stats": {
+ "hp": 85,
+ "attack": 120,
+ "defense": 80,
+ "special_attack": 85,
+ "special_defense": 75,
+ "speed": 85
+ },
+ "evs": {
+ "attack": 3
+ },
+ "types": [
+ "water",
+ "fighting"
+ ],
+ "abilities": {
+ "normal": [
+ "torrent"
+ ],
+ "hidden": [
+ "moxie"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "pound",
+ "growl",
+ "water-gun",
+ "double-hit"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "work-up"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "wing-attack"
+ ]
+ },
+ {
+ "L": 13,
+ "moves": [
+ "aqua-jet"
+ ]
+ },
+ {
+ "L": 17,
+ "moves": [
+ "low-sweep",
+ "water-pulse"
+ ]
+ },
+ {
+ "L": 21,
+ "moves": [
+ "aqua-cutter"
+ ]
+ },
+ {
+ "L": 27,
+ "moves": [
+ "air-slash"
+ ]
+ },
+ {
+ "L": 32,
+ "moves": [
+ "focus-energy"
+ ]
+ },
+ {
+ "L": 38,
+ "moves": [
+ "mega-kick"
+ ]
+ },
+ {
+ "L": 43,
+ "moves": [
+ "acrobatics"
+ ]
+ },
+ {
+ "L": 47,
+ "moves": [
+ "liquidation"
+ ]
+ },
+ {
+ "L": 52,
+ "moves": [
+ "feather-dance"
+ ]
+ },
+ {
+ "L": 58,
+ "moves": [
+ "close-combat"
+ ]
+ },
+ {
+ "L": 64,
+ "moves": [
+ "wave-crash"
+ ]
+ }
+ ],
+ "misc": [
+ "swords-dance",
+ "take-down",
+ "hydro-pump",
+ "surf",
+ "hyper-beam",
+ "agility",
+ "swift",
+ "rest",
+ "substitute",
+ "reversal",
+ "protect",
+ "icy-wind",
+ "endure",
+ "sleep-talk",
+ "baton-pass",
+ "encore",
+ "rain-dance",
+ "facade",
+ "taunt",
+ "helping-hand",
+ "brick-break",
+ "hydro-cannon",
+ "air-cutter",
+ "aerial-ace",
+ "bulk-up",
+ "water-pulse",
+ "u-turn",
+ "close-combat",
+ "low-kick",
+ "fling",
+ "air-slash",
+ "brave-bird",
+ "giga-impact",
+ "low-sweep",
+ "acrobatics",
+ "water-pledge",
+ "hurricane",
+ "disarming-voice",
+ "misty-terrain",
+ "liquidation",
+ "tera-blast",
+ "ice-spinner",
+ "chilling-water"
+ ]
+ },
+ "loot_table": "pokecube:entities/chicken_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaxly.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaxly.json
new file mode 100644
index 0000000000..193bc7db20
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaxly.json
@@ -0,0 +1,136 @@
+{
+ "name": "quaxly",
+ "id": 912,
+ "stock": true,
+ "base_experience": 64,
+ "size": {
+ "height": 0.5
+ },
+ "mass": 6.1,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "medium-slow",
+ "gender_rate": 30,
+ "stats": {
+ "hp": 55,
+ "attack": 65,
+ "defense": 45,
+ "special_attack": 50,
+ "special_defense": 45,
+ "speed": 50
+ },
+ "evs": {
+ "attack": 1
+ },
+ "types": [
+ "water"
+ ],
+ "abilities": {
+ "normal": [
+ "torrent"
+ ],
+ "hidden": [
+ "moxie"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "pound",
+ "growl",
+ "water-gun"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "work-up"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "wing-attack"
+ ]
+ },
+ {
+ "L": 13,
+ "moves": [
+ "aqua-jet"
+ ]
+ },
+ {
+ "L": 17,
+ "moves": [
+ "double-hit"
+ ]
+ },
+ {
+ "L": 21,
+ "moves": [
+ "aqua-cutter"
+ ]
+ },
+ {
+ "L": 24,
+ "moves": [
+ "air-slash"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "focus-energy"
+ ]
+ },
+ {
+ "L": 31,
+ "moves": [
+ "acrobatics"
+ ]
+ },
+ {
+ "L": 35,
+ "moves": [
+ "liquidation"
+ ]
+ }
+ ],
+ "misc": [
+ "take-down",
+ "hydro-pump",
+ "surf",
+ "low-kick",
+ "swift",
+ "rest",
+ "protect",
+ "endure",
+ "baton-pass",
+ "encore",
+ "rain-dance",
+ "facade",
+ "helping-hand",
+ "air-cutter",
+ "aerial-ace",
+ "air-slash",
+ "brave-bird",
+ "acrobatics",
+ "water-pledge",
+ "disarming-voice",
+ "misty-terrain",
+ "liquidation",
+ "tera-blast",
+ "chilling-water"
+ ]
+ },
+ "evolutions": [
+ {
+ "name": "quaxwell",
+ "level": 16
+ }
+ ],
+ "loot_table": "pokecube:entities/chicken_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaxwell.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaxwell.json
new file mode 100644
index 0000000000..3d60f9b1f6
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/quaxwell.json
@@ -0,0 +1,152 @@
+{
+ "name": "quaxwell",
+ "id": 913,
+ "stock": true,
+ "base_experience": 64,
+ "size": {
+ "height": 1.2
+ },
+ "mass": 21.5,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "medium-slow",
+ "gender_rate": 30,
+ "stats": {
+ "hp": 70,
+ "attack": 85,
+ "defense": 65,
+ "special_attack": 65,
+ "special_defense": 60,
+ "speed": 65
+ },
+ "evs": {
+ "attack": 2
+ },
+ "types": [
+ "water"
+ ],
+ "abilities": {
+ "normal": [
+ "torrent"
+ ],
+ "hidden": [
+ "moxie"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "pound",
+ "growl",
+ "water-gun",
+ "double-hit"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "work-up"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "wing-attack"
+ ]
+ },
+ {
+ "L": 13,
+ "moves": [
+ "aqua-jet"
+ ]
+ },
+ {
+ "L": 17,
+ "moves": [
+ "water-pulse"
+ ]
+ },
+ {
+ "L": 19,
+ "moves": [
+ "low-sweep"
+ ]
+ },
+ {
+ "L": 23,
+ "moves": [
+ "aqua-cutter"
+ ]
+ },
+ {
+ "L": 27,
+ "moves": [
+ "air-slash"
+ ]
+ },
+ {
+ "L": 32,
+ "moves": [
+ "focus-energy"
+ ]
+ },
+ {
+ "L": 38,
+ "moves": [
+ "acrobatics"
+ ]
+ },
+ {
+ "L": 43,
+ "moves": [
+ "liquidation"
+ ]
+ },
+ {
+ "L": 48,
+ "moves": [
+ "feather-dance"
+ ]
+ }
+ ],
+ "misc": [
+ "take-down",
+ "hydro-pump",
+ "surf",
+ "low-kick",
+ "swift",
+ "rest",
+ "protect",
+ "endure",
+ "baton-pass",
+ "encore",
+ "rain-dance",
+ "facade",
+ "helping-hand",
+ "air-cutter",
+ "aerial-ace",
+ "water-pulse",
+ "air-slash",
+ "brave-bird",
+ "low-sweep",
+ "acrobatics",
+ "water-pledge",
+ "disarming-voice",
+ "misty-terrain",
+ "liquidation",
+ "tera-blast",
+ "chilling-water"
+ ]
+ },
+ "evolutions": [
+ {
+ "name": "quaquaval",
+ "level": 36,
+ "evoMoves": "aqua-step"
+ }
+ ],
+ "loot_table": "pokecube:entities/chicken_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/skeledirge.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/skeledirge.json
new file mode 100644
index 0000000000..7705d4fe12
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/skeledirge.json
@@ -0,0 +1,177 @@
+{
+ "name": "skeledirge",
+ "id": 911,
+ "stock": true,
+ "base_experience": 70,
+ "size": {
+ "height": 1.6
+ },
+ "mass": 326.5,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "slow",
+ "gender_rate": 62,
+ "stats": {
+ "hp": 104,
+ "attack": 75,
+ "defense": 100,
+ "special_attack": 110,
+ "special_defense": 76,
+ "speed": 66
+ },
+ "evs": {
+ "special_attack": 3
+ },
+ "types": [
+ "fire",
+ "ghost"
+ ],
+ "abilities": {
+ "normal": [
+ "blaze"
+ ],
+ "hidden": [
+ "unaware"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "tackle",
+ "leer",
+ "ember"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "lick"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "round"
+ ]
+ },
+ {
+ "L": 12,
+ "moves": [
+ "scary-face"
+ ]
+ },
+ {
+ "L": 15,
+ "moves": [
+ "bite"
+ ]
+ },
+ {
+ "L": 17,
+ "moves": [
+ "incinerate"
+ ]
+ },
+ {
+ "L": 24,
+ "moves": [
+ "snarl"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "roar"
+ ]
+ },
+ {
+ "L": 32,
+ "moves": [
+ "flamethrower"
+ ]
+ },
+ {
+ "L": 38,
+ "moves": [
+ "shadow-ball"
+ ]
+ },
+ {
+ "L": 42,
+ "moves": [
+ "hyper-voice"
+ ]
+ },
+ {
+ "L": 47,
+ "moves": [
+ "will-o-wisp",
+ "hex"
+ ]
+ },
+ {
+ "L": 58,
+ "moves": [
+ "fire-blast"
+ ]
+ },
+ {
+ "L": 64,
+ "moves": [
+ "overheat"
+ ]
+ }
+ ],
+ "misc": [
+ "body-slam",
+ "take-down",
+ "flamethrower",
+ "hyper-beam",
+ "solar-beam",
+ "fire-spin",
+ "earthquake",
+ "dig",
+ "night-shade",
+ "fire-blast",
+ "rest",
+ "substitute",
+ "protect",
+ "scary-face",
+ "mud-slap",
+ "outrage",
+ "endure",
+ "sleep-talk",
+ "encore",
+ "sunny-day",
+ "crunch",
+ "shadow-ball",
+ "heat-wave",
+ "will-o-wisp",
+ "facade",
+ "helping-hand",
+ "imprison",
+ "hyper-voice",
+ "blast-burn",
+ "overheat",
+ "flare-blitz",
+ "seed-bomb",
+ "earth-power",
+ "giga-impact",
+ "shadow-claw",
+ "thunder-fang",
+ "fire-fang",
+ "zen-headbutt",
+ "flame-charge",
+ "hex",
+ "fire-pledge",
+ "snarl",
+ "disarming-voice",
+ "stomping-tantrum",
+ "tera-blast"
+ ]
+ },
+ "loot_table": "pokecube:entities/blaze_rabbit_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/sprigatito.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/sprigatito.json
new file mode 100644
index 0000000000..f5d37bdb08
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/sprigatito.json
@@ -0,0 +1,151 @@
+{
+ "name": "sprigatito",
+ "id": 906,
+ "stock": true,
+ "base_experience": 62,
+ "size": {
+ "height": 0.4
+ },
+ "mass": 4.1,
+ "is_default": true,
+ "capture_rate": 45,
+ "base_happiness": 50,
+ "growth_rate": "medium-slow",
+ "gender_rate": 62,
+ "stats": {
+ "hp": 40,
+ "attack": 61,
+ "defense": 54,
+ "special_attack": 45,
+ "special_defense": 45,
+ "speed": 65
+ },
+ "evs": {
+ "speed": 1
+ },
+ "types": [
+ "grass"
+ ],
+ "abilities": {
+ "normal": [
+ "overgrow"
+ ],
+ "hidden": [
+ "protean"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "scratch",
+ "tail-whip",
+ "leafage"
+ ]
+ },
+ {
+ "L": 7,
+ "moves": [
+ "bite"
+ ]
+ },
+ {
+ "L": 10,
+ "moves": [
+ "hone-claws"
+ ]
+ },
+ {
+ "L": 13,
+ "moves": [
+ "magical-leaf"
+ ]
+ },
+ {
+ "L": 15,
+ "moves": [
+ "quick-attack"
+ ]
+ },
+ {
+ "L": 17,
+ "moves": [
+ "seed-bomb"
+ ]
+ },
+ {
+ "L": 21,
+ "moves": [
+ "u-turn"
+ ]
+ },
+ {
+ "L": 25,
+ "moves": [
+ "worry-seed"
+ ]
+ },
+ {
+ "L": 28,
+ "moves": [
+ "slash"
+ ]
+ },
+ {
+ "L": 32,
+ "moves": [
+ "energy-ball"
+ ]
+ },
+ {
+ "L": 36,
+ "moves": [
+ "play-rough"
+ ]
+ }
+ ],
+ "misc": [
+ "take-down",
+ "solar-beam",
+ "agility",
+ "swift",
+ "rest",
+ "substitute",
+ "protect",
+ "mud-slap",
+ "giga-drain",
+ "endure",
+ "charm",
+ "sleep-talk",
+ "facade",
+ "taunt",
+ "helping-hand",
+ "fake-tears",
+ "bullet-seed",
+ "magical-leaf",
+ "u-turn",
+ "seed-bomb",
+ "energy-ball",
+ "nasty-plot",
+ "shadow-claw",
+ "leaf-storm",
+ "grass-knot",
+ "acrobatics",
+ "grass-pledge",
+ "disarming-voice",
+ "grassy-terrain",
+ "play-rough",
+ "tera-blast",
+ "trailblaze"
+ ]
+ },
+ "evolutions": [
+ {
+ "name": "floragato",
+ "level": 16,
+ "evoMoves": ""
+ }
+ ],
+ "loot_table": "pokecube:entities/money_cat_small"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/tarountula.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/tarountula.json
new file mode 100644
index 0000000000..cb5efd71d2
--- /dev/null
+++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/tarountula.json
@@ -0,0 +1,149 @@
+{
+ "name": "tarountula",
+ "id": 918,
+ "stock": true,
+ "base_experience": 50,
+ "size": {
+ "height": 0.3
+ },
+ "mass": 4.0,
+ "is_default": true,
+ "capture_rate": 255,
+ "base_happiness": 70,
+ "growth_rate": "erratic",
+ "gender_rate": 127,
+ "stats": {
+ "hp": 35,
+ "attack": 41,
+ "defense": 45,
+ "special_attack": 29,
+ "special_defense": 40,
+ "speed": 20
+ },
+ "evs": {
+ "defense": 1
+ },
+ "types": [
+ "bug"
+ ],
+ "abilities": {
+ "normal": [
+ "insomnia"
+ ],
+ "hidden": [
+ "stakeout"
+ ]
+ },
+ "moves": {
+ "level_up": [
+ {
+ "L": 1,
+ "moves": [
+ "tackle",
+ "string-shot"
+ ]
+ },
+ {
+ "L": 5,
+ "moves": [
+ "struggle-bug"
+ ]
+ },
+ {
+ "L": 8,
+ "moves": [
+ "assurance"
+ ]
+ },
+ {
+ "L": 11,
+ "moves": [
+ "feint"
+ ]
+ },
+ {
+ "L": 14,
+ "moves": [
+ "bug-bite"
+ ]
+ },
+ {
+ "L": 18,
+ "moves": [
+ "block"
+ ]
+ },
+ {
+ "L": 22,
+ "moves": [
+ "counter"
+ ]
+ },
+ {
+ "L": 25,
+ "moves": [
+ "headbutt"
+ ]
+ },
+ {
+ "L": 29,
+ "moves": [
+ "sticky-web"
+ ]
+ },
+ {
+ "L": 33,
+ "moves": [
+ "gastro-acid"
+ ]
+ },
+ {
+ "L": 36,
+ "moves": [
+ "circle-throw"
+ ]
+ },
+ {
+ "L": 40,
+ "moves": [
+ "throat-chop"
+ ]
+ },
+ {
+ "L": 44,
+ "moves": [
+ "skitter-smack"
+ ]
+ }
+ ],
+ "misc": [
+ "body-slam",
+ "take-down",
+ "leech-life",
+ "rest",
+ "substitute",
+ "thief",
+ "protect",
+ "spikes",
+ "giga-drain",
+ "endure",
+ "false-swipe",
+ "sleep-talk",
+ "rain-dance",
+ "sunny-day",
+ "facade",
+ "bullet-seed",
+ "toxic-spikes",
+ "poison-jab",
+ "x-scissor",
+ "bug-buzz",
+ "shadow-claw",
+ "grass-knot",
+ "struggle-bug",
+ "tera-blast",
+ "pounce",
+ "trailblaze"
+ ]
+ },
+ "loot_table": "minecraft:entities/spider"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-plant.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-plant.x3d
new file mode 100644
index 0000000000..e6dc1906d9
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-plant.x3d
@@ -0,0 +1,856 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-plant.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-plant.xml
new file mode 100644
index 0000000000..7a7e045045
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-plant.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-sandy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-sandy.x3d
new file mode 100644
index 0000000000..6b392ef4cc
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-sandy.x3d
@@ -0,0 +1,451 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-sandy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-sandy.xml
new file mode 100644
index 0000000000..ca538d62c7
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-sandy.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-trash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-trash.x3d
new file mode 100644
index 0000000000..2bed3d26f5
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-trash.x3d
@@ -0,0 +1,505 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-trash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-trash.xml
new file mode 100644
index 0000000000..f0d742017d
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy-trash.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.x3d
deleted file mode 100644
index ed36b787f8..0000000000
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.x3d
+++ /dev/null
@@ -1,377 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.xml
deleted file mode 100644
index f2136d0eed..0000000000
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crocalor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crocalor.x3d
new file mode 100644
index 0000000000..401dcea4d9
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crocalor.x3d
@@ -0,0 +1,1349 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crocalor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crocalor.xml
new file mode 100644
index 0000000000..0bf4d77d9e
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crocalor.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.x3d
index 1d37c3d31a..2ff3d4a91b 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.x3d
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.x3d
@@ -1,8 +1,9 @@
-
+
+
-
-
+
+
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.xml
index 80a770ca4c..6fb58da2eb 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.xml
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.xml
@@ -2,26 +2,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farigiraf.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farigiraf.x3d
new file mode 100644
index 0000000000..bd0dc3759d
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farigiraf.x3d
@@ -0,0 +1,2537 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farigiraf.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farigiraf.xml
new file mode 100644
index 0000000000..c788763c07
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farigiraf.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floragato.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floragato.x3d
new file mode 100644
index 0000000000..fa593f0ff3
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floragato.x3d
@@ -0,0 +1,2274 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floragato.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floragato.xml
new file mode 100644
index 0000000000..6502410970
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floragato.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fuecoco.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fuecoco.x3d
new file mode 100644
index 0000000000..c60cd46ea6
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fuecoco.x3d
@@ -0,0 +1,890 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fuecoco.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fuecoco.xml
new file mode 100644
index 0000000000..0a87f2d0b9
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fuecoco.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-burn.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-burn.x3d
new file mode 100644
index 0000000000..6b341b11fb
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-burn.x3d
@@ -0,0 +1,1659 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-burn.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-burn.xml
new file mode 100644
index 0000000000..0c66366a19
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-burn.xml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-chill.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-chill.x3d
new file mode 100644
index 0000000000..6b341b11fb
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-chill.x3d
@@ -0,0 +1,1659 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-chill.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-chill.xml
new file mode 100644
index 0000000000..6f5cdb2c7c
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-chill.xml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-douse.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-douse.x3d
new file mode 100644
index 0000000000..6b341b11fb
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-douse.x3d
@@ -0,0 +1,1659 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-douse.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-douse.xml
new file mode 100644
index 0000000000..38dc247441
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-douse.xml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-shock.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-shock.x3d
new file mode 100644
index 0000000000..6b341b11fb
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-shock.x3d
@@ -0,0 +1,1659 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-shock.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-shock.xml
new file mode 100644
index 0000000000..342265a700
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect-shock.xml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.x3d
index 0c98b713ff..6b341b11fb 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.x3d
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.x3d
@@ -3,7 +3,7 @@
-
+
-
-
-
+
-
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
+
+
+
@@ -506,842 +513,1145 @@
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.xml
index f2d030a142..e544f60782 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.xml
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.xml
@@ -1,15 +1,166 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koraidon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koraidon.x3d
new file mode 100644
index 0000000000..f5cf3e69d9
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koraidon.x3d
@@ -0,0 +1,5351 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koraidon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koraidon.xml
new file mode 100644
index 0000000000..974e6410b5
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koraidon.xml
@@ -0,0 +1,447 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowscarada.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowscarada.x3d
new file mode 100644
index 0000000000..2118de6639
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowscarada.x3d
@@ -0,0 +1,3832 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowscarada.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowscarada.xml
new file mode 100644
index 0000000000..f88887e803
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowscarada.xml
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miraidon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miraidon.x3d
new file mode 100644
index 0000000000..64820c9903
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miraidon.x3d
@@ -0,0 +1,3208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miraidon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miraidon.xml
new file mode 100644
index 0000000000..2df1b56a9a
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miraidon.xml
@@ -0,0 +1,237 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaquaval.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaquaval.x3d
new file mode 100644
index 0000000000..6a87941e61
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaquaval.x3d
@@ -0,0 +1,2908 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaquaval.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaquaval.xml
new file mode 100644
index 0000000000..e91f051ac5
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaquaval.xml
@@ -0,0 +1,440 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxly.x3d
new file mode 100644
index 0000000000..d78d4a2a74
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxly.x3d
@@ -0,0 +1,964 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxly.xml
new file mode 100644
index 0000000000..74afa77eb8
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxly.xml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxwell.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxwell.x3d
new file mode 100644
index 0000000000..3a0e76d8ff
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxwell.x3d
@@ -0,0 +1,2098 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxwell.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxwell.xml
new file mode 100644
index 0000000000..85f42d0107
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quaxwell.xml
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skeledirge.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skeledirge.x3d
new file mode 100644
index 0000000000..085a78c043
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skeledirge.x3d
@@ -0,0 +1,2847 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skeledirge.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skeledirge.xml
new file mode 100644
index 0000000000..aae4939087
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skeledirge.xml
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sprigatito.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sprigatito.x3d
new file mode 100644
index 0000000000..789c789e4e
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sprigatito.x3d
@@ -0,0 +1,2172 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sprigatito.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sprigatito.xml
new file mode 100644
index 0000000000..3259da983d
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sprigatito.xml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tarountula.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tarountula.x3d
new file mode 100644
index 0000000000..3f465ae039
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tarountula.x3d
@@ -0,0 +1,1140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tarountula.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tarountula.xml
new file mode 100644
index 0000000000..c9fa347f07
--- /dev/null
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tarountula.xml
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaluna.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaluna.x3d
index 110e4fa9fa..7d124f25aa 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaluna.x3d
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaluna.x3d
@@ -3,7 +3,7 @@
-
+
-
-
-
+
+
+
@@ -88,11 +88,11 @@
-
-
-
+
+
+
@@ -140,42 +140,15 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -294,11 +267,11 @@
-
-
-
+
+
+
@@ -321,11 +294,11 @@
-
-
-
+
+
+
@@ -347,11 +320,11 @@
-
-
-
+
+
+
@@ -375,11 +348,11 @@
-
-
-
+
+
+
@@ -402,11 +375,11 @@
-
-
-
+
+
+
@@ -537,11 +510,11 @@
-
-
-
+
+
+
@@ -591,11 +564,11 @@
-
-
-
+
+
+
@@ -618,11 +591,11 @@
-
-
-
+
+
+
@@ -645,11 +618,11 @@
-
-
-
+
+
+
@@ -671,11 +644,11 @@
-
-
-
+
+
+
@@ -697,11 +670,11 @@
-
-
-
+
+
+
@@ -723,11 +696,11 @@
-
-
-
+
+
+
@@ -807,11 +780,11 @@
-
-
-
+
+
+
@@ -833,11 +806,11 @@
-
-
-
+
+
+
@@ -859,11 +832,11 @@
-
-
-
+
+
+
@@ -885,11 +858,11 @@
-
-
-
+
+
+
@@ -917,11 +890,11 @@
-
-
-
+
+
+
@@ -943,11 +916,11 @@
-
-
-
+
+
+
@@ -969,11 +942,11 @@
-
-
-
+
+
+
@@ -995,11 +968,11 @@
-
-
-
+
+
+
@@ -1024,11 +997,11 @@
-
-
-
+
+
+
@@ -1078,11 +1051,11 @@
-
-
-
+
+
+
@@ -1104,11 +1077,11 @@
-
-
-
+
+
+
@@ -1131,11 +1104,11 @@
-
-
-
+
+
+
@@ -1158,11 +1131,11 @@
-
-
-
+
+
+
@@ -1185,11 +1158,11 @@
-
-
-
+
+
+
@@ -1212,11 +1185,11 @@
-
-
-
+
+
+
@@ -1240,11 +1213,11 @@
-
-
-
+
+
+
@@ -1267,11 +1240,11 @@
-
-
-
+
+
+
@@ -1321,11 +1294,11 @@
-
-
-
+
+
+
@@ -1347,11 +1320,11 @@
-
-
-
+
+
+
@@ -1374,11 +1347,11 @@
-
-
-
+
+
+
@@ -1401,11 +1374,11 @@
-
-
-
+
+
+
@@ -1428,11 +1401,11 @@
-
-
-
+
+
+
@@ -1455,11 +1428,11 @@
-
-
-
+
+
+
@@ -1484,11 +1457,11 @@
-
-
-
+
+
+
@@ -1562,11 +1535,11 @@
-
-
-
+
+
+
@@ -1616,11 +1589,11 @@
-
-
-
+
+
+
@@ -1643,11 +1616,11 @@
-
-
-
+
+
+
@@ -1670,11 +1643,11 @@
-
-
-
+
+
+
@@ -1697,11 +1670,11 @@
-
-
-
+
+
+
@@ -1724,11 +1697,11 @@
-
-
-
+
+
+
@@ -1915,11 +1888,11 @@
-
-
-
+
+
+
@@ -1941,11 +1914,11 @@
-
-
-
+
+
+
@@ -1967,11 +1940,11 @@
-
-
-
+
+
+
@@ -1993,11 +1966,11 @@
-
-
-
+
+
+
@@ -2104,7 +2077,7 @@
index="0 1 2 0 2 3 4 5 6 4 6 7 5 8 9 5 9 10 11 0 12 11 12 13 14 0 11 14 11 15 16 17 18 16 18 19 "
>
-
+
@@ -2132,11 +2105,11 @@
-
-
-
+
+
+
@@ -2158,11 +2131,11 @@
-
-
-
+
+
+
@@ -2184,11 +2157,11 @@
-
-
-
+
+
+
@@ -2210,11 +2183,11 @@
-
-
-
+
+
+
@@ -2236,11 +2209,11 @@
-
-
-
+
+
+
@@ -2262,11 +2235,11 @@
-
-
-
+
+
+
@@ -2291,11 +2264,11 @@
-
-
-
+
+
+
@@ -2317,11 +2290,11 @@
-
-
-
+
+
+
@@ -2343,11 +2316,11 @@
-
-
-
+
+
+
@@ -2375,11 +2348,11 @@
-
-
-
+
+
+
@@ -2453,11 +2426,11 @@
-
-
-
+
+
+
@@ -2507,11 +2480,11 @@
-
-
-
+
+
+
@@ -2534,11 +2507,11 @@
-
-
-
+
+
+
@@ -2561,11 +2534,11 @@
-
-
-
+
+
+
@@ -2588,11 +2561,11 @@
-
-
-
+
+
+
@@ -2615,11 +2588,11 @@
-
-
-
+
+
+
@@ -2807,11 +2780,11 @@
-
-
-
+
+
+
@@ -2834,11 +2807,11 @@
-
-
-
+
+
+
@@ -2886,11 +2859,11 @@
-
-
-
+
+
+
@@ -2940,11 +2913,11 @@
-
-
-
+
+
+
@@ -2967,11 +2940,11 @@
-
-
-
+
+
+
@@ -2994,11 +2967,11 @@
-
-
-
+
+
+
@@ -3104,11 +3077,11 @@
-
-
-
+
+
+
@@ -3131,11 +3104,11 @@
-
-
-
+
+
+
@@ -3183,11 +3156,11 @@
-
-
-
+
+
+
@@ -3237,11 +3210,11 @@
-
-
-
+
+
+
@@ -3264,11 +3237,11 @@
-
-
-
+
+
+
@@ -3291,11 +3264,11 @@
-
-
-
+
+
+
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.x3d
index c00fc22fbf..0337f93e50 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.x3d
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.x3d
@@ -2,8 +2,8 @@
-
-
+
+
-
-
-
+
-
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.xml
index 01af750ca8..422f140537 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.xml
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.xml
@@ -1,8 +1,142 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.x3d
index 53a8a0fb5e..6d4eb1b293 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.x3d
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.x3d
@@ -3,7 +3,7 @@
-
+
-
-
-
+
-
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.xml
index f78e5bedf8..a283436f66 100644
--- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.xml
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.xml
@@ -1,11 +1,206 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 0.5
-
-
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega.png
index c0b8607ce2..fd8291284c 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega_s.png
index 23d73a5a1d..c66d867630 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega_s.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggronmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggronmegaeye_s.png
index 249085de11..1894645fad 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggronmegaeye_s.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggronmegaeye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye.png
deleted file mode 100644
index 9862012dce..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye_s.png
deleted file mode 100644
index ffc8d79b7e..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-plant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-plant.png
deleted file mode 100644
index f42158c7f6..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-plant.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-plant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-plant_s.png
deleted file mode 100644
index de0f273fc0..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-plant_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-sandy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-sandy.png
deleted file mode 100644
index 91dcadc122..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-sandy.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-sandy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-sandy_s.png
deleted file mode 100644
index 188c60c1e8..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-sandy_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-trash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-trash.png
deleted file mode 100644
index f9398ec680..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-trash.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-trash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-trash_s.png
deleted file mode 100644
index 15db5b67f2..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy-trash_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy.png
deleted file mode 100644
index 85ed59eb91..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_eye.png
new file mode 100644
index 0000000000..49bd7857d5
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_eye_s.png
new file mode 100644
index 0000000000..689729337b
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_plant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_plant.png
new file mode 100644
index 0000000000..30147cf967
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_plant.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_plant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_plant_s.png
new file mode 100644
index 0000000000..17007f4e0e
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_plant_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_s.png
deleted file mode 100644
index 8ecccc9359..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_sandy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_sandy.png
new file mode 100644
index 0000000000..0e2cce98e2
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_sandy.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_sandy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_sandy_s.png
new file mode 100644
index 0000000000..bc3133544e
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_sandy_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_trash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_trash.png
new file mode 100644
index 0000000000..e8d4720417
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_trash.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_trash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_trash_s.png
new file mode 100644
index 0000000000..8644a193a8
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_trash_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor.png
new file mode 100644
index 0000000000..1737f19a1f
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_eye.png
new file mode 100644
index 0000000000..ec4fe65005
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_eye_s.png
new file mode 100644
index 0000000000..cd72ee9b0b
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_s.png
new file mode 100644
index 0000000000..4fc41ef86a
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crocalor_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-eye.png
new file mode 100644
index 0000000000..e98b1e4e16
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-eye_s.png
new file mode 100644
index 0000000000..1e42f931bc
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka.png
index 93d6e8c5d7..06cbd7ecfe 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka_s.png
index 8da38dc6aa..960dddbe94 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka_s.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyebase.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyebase.png
new file mode 100644
index 0000000000..f83940d823
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyebase.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyebase_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyebase_s.png
new file mode 100644
index 0000000000..28f4aff631
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyebase_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyeextra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyeextra.png
new file mode 100644
index 0000000000..16dba4b4b3
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyeextra.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyeextra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyeextra_s.png
new file mode 100644
index 0000000000..d4b67e5338
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf-eyeextra_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf.png
new file mode 100644
index 0000000000..28d2804d78
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf_s.png
new file mode 100644
index 0000000000..96b1f095d9
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farigiraf_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato.png
new file mode 100644
index 0000000000..c98f1ad2ee
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_eye.png
new file mode 100644
index 0000000000..d676171764
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_eye_s.png
new file mode 100644
index 0000000000..d676171764
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_mark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_mark.png
new file mode 100644
index 0000000000..f0d95d04da
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_mark.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_mark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_mark_s.png
new file mode 100644
index 0000000000..8cc3e8f27a
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_mark_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_s.png
new file mode 100644
index 0000000000..99b1a94af9
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floragato_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco.png
new file mode 100644
index 0000000000..e9c584c896
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_eye.png
new file mode 100644
index 0000000000..b2672157fc
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_eye_s.png
new file mode 100644
index 0000000000..2ff3d540c0
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_s.png
new file mode 100644
index 0000000000..5de77eb17f
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fuecoco_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect.png
index 719d0c8e76..81e6cb8e72 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_burn.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_burn.png
new file mode 100644
index 0000000000..52f3de2b27
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_burn.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_burn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_burn_s.png
new file mode 100644
index 0000000000..52f3de2b27
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_burn_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_chill.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_chill.png
new file mode 100644
index 0000000000..0d48ced4d7
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_chill.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_chill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_chill_s.png
new file mode 100644
index 0000000000..0d48ced4d7
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_chill_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_douse.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_douse.png
new file mode 100644
index 0000000000..2594e03c1b
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_douse.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_douse_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_douse_s.png
new file mode 100644
index 0000000000..2594e03c1b
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_douse_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_eye.png
new file mode 100644
index 0000000000..cc28ecda3d
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_eye_s.png
new file mode 100644
index 0000000000..7c485bc493
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_null.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_null.png
new file mode 100644
index 0000000000..dcc3508005
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_null.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_null_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_null_s.png
new file mode 100644
index 0000000000..dcc3508005
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_null_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_s.png
index 2d7f5be087..f848d14a4c 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_s.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_shock.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_shock.png
new file mode 100644
index 0000000000..e6f50e091e
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_shock.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_shock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_shock_s.png
new file mode 100644
index 0000000000..e6f50e091e
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_shock_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon.png
new file mode 100644
index 0000000000..ae771a55aa
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_eye.png
new file mode 100644
index 0000000000..9b49e57286
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_eye_s.png
new file mode 100644
index 0000000000..9cbbaae74b
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_s.png
new file mode 100644
index 0000000000..0e5af38cf2
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koraidon_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada.png
new file mode 100644
index 0000000000..e1767564dc
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_eye.png
new file mode 100644
index 0000000000..cee821e99c
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_eye_s.png
new file mode 100644
index 0000000000..b2bd3cb7d8
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_mouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_mouth.png
new file mode 100644
index 0000000000..26843d056a
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_mouth.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_mouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_mouth_s.png
new file mode 100644
index 0000000000..898d41f71e
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_mouth_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_s.png
new file mode 100644
index 0000000000..aa1e47f3d3
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowscarada_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon.png
new file mode 100644
index 0000000000..0228180146
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_eye.png
new file mode 100644
index 0000000000..bf4e0252de
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_eye_s.png
new file mode 100644
index 0000000000..bf4e0252de
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_s.png
new file mode 100644
index 0000000000..d87626e92e
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miraidon_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval.png
new file mode 100644
index 0000000000..ebdc22f23d
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_eye.png
new file mode 100644
index 0000000000..058617e448
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_eye_s.png
new file mode 100644
index 0000000000..cb27659a85
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_s.png
new file mode 100644
index 0000000000..2805ab100a
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaquaval_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly.png
new file mode 100644
index 0000000000..3784fbfa92
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_eye.png
new file mode 100644
index 0000000000..3ba694e602
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_eye_s.png
new file mode 100644
index 0000000000..2bd4d78ec0
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_s.png
new file mode 100644
index 0000000000..e117342734
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxly_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell.png
new file mode 100644
index 0000000000..de80d5bf37
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_eye.png
new file mode 100644
index 0000000000..58a73a90e1
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_eye_s.png
new file mode 100644
index 0000000000..74bb054931
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_s.png
new file mode 100644
index 0000000000..fdbbeb8e91
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quaxwell_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge.png
new file mode 100644
index 0000000000..376740978a
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_eye.png
new file mode 100644
index 0000000000..87f235e813
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_eye_s.png
new file mode 100644
index 0000000000..6cc5d11ad8
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_s.png
new file mode 100644
index 0000000000..32ebe8c4a6
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skeledirge_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito.png
new file mode 100644
index 0000000000..b65c1190cf
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_eye.png
new file mode 100644
index 0000000000..6c56498853
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_eye_s.png
new file mode 100644
index 0000000000..843f6aa8d3
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_mouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_mouth.png
new file mode 100644
index 0000000000..5577a17436
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_mouth.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_mouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_mouth_s.png
new file mode 100644
index 0000000000..64faa4f837
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_mouth_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_s.png
new file mode 100644
index 0000000000..3bdc1bdef7
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sprigatito_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula.png
new file mode 100644
index 0000000000..ab123acccb
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_eye.png
new file mode 100644
index 0000000000..37b65e743c
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_eye_s.png
new file mode 100644
index 0000000000..37b65e743c
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_s.png
new file mode 100644
index 0000000000..0304c0ab4e
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tarountula_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini.png
index 9dbd0c6519..f9c0357ef0 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_eye.png
new file mode 100644
index 0000000000..411e6b5a32
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_eye_s.png
new file mode 100644
index 0000000000..3b7861dc32
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_mouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_mouth.png
new file mode 100644
index 0000000000..05b7e107b1
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_mouth.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_mouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_mouth_s.png
new file mode 100644
index 0000000000..76a510dafa
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_mouth_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_s.png
index 0d0d8a3deb..74fabfbb0d 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_s.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash.png
index f4a5ba39a2..6ee8977c0d 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_eye.png
new file mode 100644
index 0000000000..ba2632516a
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_eye.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_eye_s.png
new file mode 100644
index 0000000000..1965f13285
Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_eye_s.png differ
diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_s.png
index 0e1e96808e..8dc18df54e 100644
Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_s.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_s.png differ
diff --git a/src/main/resources/data/pokecube/loot_tables/entities/bread.json b/src/main/resources/data/pokecube/loot_tables/entities/bread.json
new file mode 100644
index 0000000000..d63e904f38
--- /dev/null
+++ b/src/main/resources/data/pokecube/loot_tables/entities/bread.json
@@ -0,0 +1,31 @@
+{
+ "type": "minecraft:entity",
+ "pools": [
+ {
+ "name": "pool_0",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:bread",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 3
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/pokecube/loot_tables/entities/dye_1.json b/src/main/resources/data/pokecube/loot_tables/entities/dye_1.json
new file mode 100644
index 0000000000..a0f911bdd5
--- /dev/null
+++ b/src/main/resources/data/pokecube/loot_tables/entities/dye_1.json
@@ -0,0 +1,135 @@
+{
+ "type": "minecraft:entity",
+ "pools": [
+ {
+ "name": "pool_0",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:black_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_1",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:blue_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_2",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:yellow_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_3",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:white_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_4",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:red_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/pokecube/loot_tables/entities/dye_2.json b/src/main/resources/data/pokecube/loot_tables/entities/dye_2.json
new file mode 100644
index 0000000000..acd08048ce
--- /dev/null
+++ b/src/main/resources/data/pokecube/loot_tables/entities/dye_2.json
@@ -0,0 +1,146 @@
+{
+ "type": "minecraft:entity",
+ "pools": [
+ {
+ "name": "pool_0",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:orange_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_1",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:purple_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_2",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:lime_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_3",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:brown_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_4",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:cyan_dye",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_5",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "loot_table",
+ "name": "pokecube:entities/dye_1",
+ "weight": 1
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/pokecube/loot_tables/entities/sand_desert.json b/src/main/resources/data/pokecube/loot_tables/entities/sand_desert.json
new file mode 100644
index 0000000000..7d70c71ee3
--- /dev/null
+++ b/src/main/resources/data/pokecube/loot_tables/entities/sand_desert.json
@@ -0,0 +1,57 @@
+{
+ "type": "minecraft:entity",
+ "pools": [
+ {
+ "name": "pool_0",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:dead_bush",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "pool_1",
+ "rolls": 1,
+ "entries": [
+ {
+ "type": "item",
+ "name": "minecraft:stick",
+ "functions": [
+ {
+ "function": "set_count",
+ "count": {
+ "min": 1,
+ "max": 2
+ }
+ },
+ {
+ "function": "looting_enchant",
+ "count": {
+ "min": 0,
+ "max": 1
+ }
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/pokecube_legends/database/pokemobs/spawns/ultraspace.json b/src/main/resources/data/pokecube_legends/database/pokemobs/spawns/ultraspace.json
index 39c67aa7a4..174a445fd8 100644
--- a/src/main/resources/data/pokecube_legends/database/pokemobs/spawns/ultraspace.json
+++ b/src/main/resources/data/pokecube_legends/database/pokemobs/spawns/ultraspace.json
@@ -32,7 +32,6 @@
{ "key": "poipole", "min": 1, "max": 3, "rate": 0.15 },
- { "key": "lunala", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "eternatus", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "thundurus-therian", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "xerneas", "min": 1, "max": 1, "rate": 0.002 }
@@ -372,6 +371,15 @@
{ "key": "vileplume", "min": 1, "max": 3, "rate": 0.5 },
{ "key": "weepinbell", "min": 1, "max": 3, "rate": 0.5 },
{ "key": "wormadam-plant", "min": 1, "max": 3, "rate": 0.5 },
+ { "key": "bulbasaur", "min": 1, "max": 2, "rate": 0.05 },
+ { "key": "chikorita", "min": 1, "max": 2, "rate": 0.05 },
+ { "key": "treecko", "min": 1, "max": 2, "rate": 0.05 },
+ { "key": "turtwig", "min": 1, "max": 2, "rate": 0.05 },
+ { "key": "snivy", "min": 1, "max": 2, "rate": 0.05 },
+ { "key": "chespin", "min": 1, "max": 2, "rate": 0.05 },
+ { "key": "rowlet", "min": 1, "max": 2, "rate": 0.05 },
+ { "key": "grookey", "min": 1, "max": 2, "rate": 0.05 },
+ { "key": "sprigatito", "min": 1, "max": 2, "rate": 0.05 },
{ "key": "bellossom", "min": 1, "max": 3, "rate": 0.25 },
{ "key": "exeggutor-alola", "min": 1, "max": 3, "rate": 0.25 },
@@ -577,14 +585,11 @@
{ "key": "nihilego", "min": 1, "max": 5, "rate": 0.5 },
{ "key": "poipole", "min": 1, "max": 5, "rate": 0.5 },
- { "key": "cosmog", "min": 1, "max": 1, "rate": 0.15 },
-
- { "key": "cosmoem", "min": 1, "max": 1, "rate": 0.05 },
+ { "key": "cosmog", "min": 1, "max": 1, "rate": 0.05 },
{ "key": "unown", "min": 1, "max": 5, "rate": 0.01 },
{ "key": "lugia", "min": 1, "max": 1, "rate": 0.002 },
- { "key": "lunala", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "kyurem", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "landorus-therian", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "dialga", "min": 1, "max": 1, "rate": 0.002 },
@@ -595,7 +600,6 @@
{ "key": "necrozma", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "rayquaza", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "reshiram", "min": 1, "max": 1, "rate": 0.002 },
- { "key": "solgaleo", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "thundurus-therian", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "tornadus-therian", "min": 1, "max": 1, "rate": 0.002 },
{ "key": "zekrom", "min": 1, "max": 1, "rate": 0.002 },
diff --git a/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/flowers.json b/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/flowers.json
index 2570d9585b..13c2c949f8 100644
--- a/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/flowers.json
+++ b/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/flowers.json
@@ -9,6 +9,7 @@
{"key": "oricorio-pau","min": 5,"max": 10,"rate": 0.7},
{"key": "oricorio-pom-pom","min": 5,"max": 10,"rate": 0.7},
{"key": "oricorio-sensu","min": 5,"max": 10,"rate": 0.7},
+ {"key": "sprigatito","min": 1,"max": 2,"rate": 0.01},
{"key": "deerling","min": 2,"max": 4,"rate": 0.11, "variant": "deerling_sp"},
diff --git a/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/forests.json b/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/forests.json
index f32f5e4c42..bae1e72be9 100644
--- a/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/forests.json
+++ b/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/forests.json
@@ -49,6 +49,7 @@
{"key": "lillipup","min": 2,"max": 4,"rate": 0.1},
{"key": "nincada","min": 2,"max": 4,"rate": 0.1},
{"key": "rattata-alola","min": 3,"max": 6,"rate": 0.1},
+ {"key": "tarountula","min": 2,"max": 4,"rate": 0.1},
{"key": "komala","min": 2,"max": 4,"rate": 0.1},
@@ -77,6 +78,7 @@
{"key": "rowlet","min": 1,"max": 2,"rate": 0.01},
{"key": "litten","min": 1,"max": 2,"rate": 0.01},
{"key": "grookey","min": 1,"max": 2,"rate": 0.01},
+ {"key": "sprigatito","min": 1,"max": 2,"rate": 0.01},
{"key": "raikou","min": 1,"max": 1,"rate": 0.01},
diff --git a/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/mountains.json b/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/mountains.json
index f7fa096ac0..57f964399a 100644
--- a/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/mountains.json
+++ b/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/mountains.json
@@ -83,6 +83,7 @@
{"key": "torkoal","min": 2,"max": 4,"rate": 0.3},
{"key": "skorupi","min": 2,"max": 4,"rate": 0.3},
{"key": "numel","min": 2,"max": 4,"rate": 0.3},
+ {"key": "fuecoco","min": 1,"max": 2,"rate": 0.01},
{"key": "salandit","min": 4,"max": 8,"rate": 0.1}
]
diff --git a/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/oceans_beaches.json b/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/oceans_beaches.json
index 6cf46c11c6..c4fe2be1df 100644
--- a/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/oceans_beaches.json
+++ b/src/main/resources/data/pokecube_mobs/database/pokemobs/spawns/oceans_beaches.json
@@ -91,6 +91,7 @@
{"key": "piplup","min": 1,"max": 2,"rate": 0.01},
{"key": "popplio","min": 1,"max": 2,"rate": 0.01},
{"key": "sobble","min": 1,"max": 2,"rate": 0.01},
+ {"key": "quaxly","min": 1,"max": 2,"rate": 0.01},
{"key": "latios","min": 2,"max": 2,"rate": 0.005},
{"key": "latias","min": 2,"max": 2,"rate": 0.005}
diff --git a/src/main/resources/data/pokecube_mobs/tags/items/leader_chest.json b/src/main/resources/data/pokecube_mobs/tags/items/leader_chest.json
new file mode 100644
index 0000000000..195840d568
--- /dev/null
+++ b/src/main/resources/data/pokecube_mobs/tags/items/leader_chest.json
@@ -0,0 +1,6 @@
+{
+ "replace": false,
+ "values": [
+ "minecraft:diamond_chestplate"
+ ]
+}
\ No newline at end of file