diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.x3d index 1125dca5cc..142b631b90 100644 --- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.x3d +++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.x3d @@ -1,8 +1,9 @@ - + + - + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + - + - - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - + + + + + + + + + + + - - - - + + + - - - + + + + + + + + + + + - - - - + + + - - - + + + + + + + + + + + - + - - - + + + - - - + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1146,2417 +658,2737 @@ - - - + - + - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + - + - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + - - - - + + + - - - + + + + + + + + + + + - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - + + + - - - + - + - - - - + + + - - - - - - - - - - - - - - - - - - - + - + - - - - + + + - - - + - + - - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - + - + - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + - - - + + + - - - + - + - - - + + + + + + + + + + + + + + + + + + + - - - + - - - - + + + + + + + + + + + + + + + + + + + - - - + - + + + + + + + + + + + + + + + + + - - - - + + + - + - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + + + + + + + + + + + - + - - - + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + - + - - - - + + + - - + + + + + + + + + + + + + + + + + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - + - - - - + + + - - - + - + - - - - + + + - - - + - + - - - - + + + - - - - - - - - - - + + + - - - + - + - - - - + + + - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.xml index 7c6d746753..621c3dff92 100644 --- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.xml +++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.xml @@ -2,153 +2,909 @@ - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - - + + + - - + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - - + + - - + - + - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.x3d index a7156d62b3..52feea7877 100644 --- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.x3d +++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.x3d @@ -1,8 +1,9 @@ - + + - - + + - - - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - - - + + + - - - + + + + + + + + + + + - + - - - + + + - + + + + + + + + + + + + + + + + - - + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - + + - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + - - - - - - - - - - - - - - - - - - - + - + - - - + + + - - - + + - - + + + @@ -702,438 +1027,796 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - - - + + + - - - + - + - - - + + + - - - + - - - + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - - - + + + - - - + - + - - - + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + - - - + - + - - - + + + diff --git a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.xml index b74004443b..bee93a862b 100644 --- a/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.xml +++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.xml @@ -1,64 +1,108 @@ - - + + + + + + + - - + + - + - + - - + + + + + + + + + + + + + - + + + - + - + + + - + + + + - - + + - - + + + + + + + + + + + - - - + + + + + + - - - + + + - - + + - - - + + + + + + + + + + + - - + + - - + + @@ -66,29 +110,41 @@ - - + + + + + - - - + + + - - + + - - - + + + + + + + + + + + - - + + - - + + diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole-wing.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole-wing.png new file mode 100644 index 0000000000..0def615881 Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole-wing.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole-wing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole-wing_s.png new file mode 100644 index 0000000000..0def615881 Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole-wing_s.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole.png index 361b240fae..06ede8e38f 100644 Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole_s.png index 86c4050399..2c65e75fde 100644 Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole_s.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole_s.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing.png deleted file mode 100644 index 5d2bd99d22..0000000000 Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing.png and /dev/null differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing_s.png deleted file mode 100644 index 5d2bd99d22..0000000000 Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing_s.png and /dev/null differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-eye.png new file mode 100644 index 0000000000..5f37cbedf0 Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-eye.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-eye_s.png new file mode 100644 index 0000000000..5f37cbedf0 Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-eye_s.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-mark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-mark.png new file mode 100644 index 0000000000..f569f83f8b Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-mark.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-mark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-mark_s.png new file mode 100644 index 0000000000..fec4453a20 Binary files /dev/null and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini-mark_s.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini.png index e6a12bc9b1..5dc0a3c75e 100644 Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini.png differ diff --git a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini_s.png index 86a5fb4b21..e14dd84c17 100644 Binary files a/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini_s.png and b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini_s.png differ