Skip to content

Commit

Permalink
Merge branch '1.14' into 1.15
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thutmose
Thutmose committed Jun 2, 2020
2 parents 0b634de + b52cd41 commit 2eca9d2
Show file tree
Hide file tree
Showing 1,097 changed files with 37,685 additions and 13,836 deletions.
1,712 changes: 1,366 additions & 346 deletions src/main/resources/assets/pokecube_mobs/gen_1/entity/models/abra.x3d
View file

Large diffs are not rendered by default.

155 changes: 150 additions & 5 deletions src/main/resources/assets/pokecube_mobs/gen_1/entity/models/abra.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,158 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model name="">
<phase headAxis="1" headCap="-50,50" name="global" scale="0.6"/>
<metadata head="head" headAxis="1" headAxis2="2" headCap="-60,60" headCap1="-10,60" headDir="1"/>
<phase type="idle">
<phase name="global" scale="0.26"/>
<metadata head="head" headAxis="2" headAxis2="0" headCap="-80,80" headCap1="-50,50" headDir="-1"/>
<phase axis="0" name="snakeIdle" parts="tail:tail1:tail2:tail3:tail4:tail5"/>
<phase axis="1" name="snakeWalk" parts="tail:tail1:tail2:tail3:tail4:tail5"/>
<phase type="sitting">
<part name="body">
<component length="10" name="1" posOffset="0,8,0" rotOffset="-20,0,0" startKey="0"/>
</part>
<part name="body1">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="leg1">
<component length="10" name="1" rotOffset="-50,70,30" startKey="0"/>
</part>
<part name="leg2">
<component length="10" name="1" rotOffset="-50,-70,-30" startKey="0"/>
</part>
<part name="leg1_1">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="leg2_1">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="arm1">
<component length="10" name="1" rotChange="0,0,2" rotOffset="0,-40,-60" startKey="0"/>
<component length="10" name="2" rotChange="0,0,-2" startKey="10"/>
</part>
<part name="arm1_1">
<component length="10" name="1" rotOffset="30,-20,-30" startKey="0"/>
</part>
<part name="hand1">
<component length="10" name="1" rotOffset="30,0,0" startKey="0"/>
</part>
<part name="arm2">
<component length="10" name="1" rotChange="0,0,-2" rotOffset="0,40,60" startKey="0"/>
<component length="10" name="2" rotChange="0,0,2" startKey="10"/>
</part>
<part name="arm2_1">
<component length="10" name="1" rotOffset="30,20,30" startKey="0"/>
</part>
<part name="hand2">
<component length="10" name="1" rotOffset="30,0,0" startKey="0"/>
</part>
<part name="tail">
<component length="10" name="1" rotChange="0,0,10" rotOffset="0,0,10" startKey="0"/>
<component length="10" name="2" rotChange="0,0,-10" startKey="10"/>
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="tail1">
<component length="10" name="1" rotOffset="30,0,0" startKey="0"/>
</part>
<part name="tail2">
<component length="10" name="1" rotOffset="10,0,0" startKey="0"/>
</part>
<part name="tail3">
<component length="10" name="1" rotOffset="10,0,0" startKey="0"/>
</part>
<part name="tail4">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
</phase>
<phase type="idle">
<part name="leg1">
<component length="10" name="1" rotOffset="0,3,0" startKey="0"/>
</part>
<part name="leg2">
<component length="10" name="1" rotOffset="0,-3,0" startKey="0"/>
</part>
<part name="arm1">
<component length="10" name="1" rotChange="0,0,2" rotOffset="0,0,-60" startKey="0"/>
<component length="10" name="2" rotChange="0,0,-2" startKey="10"/>
</part>
<part name="arm1_1">
<component length="10" name="1" rotOffset="0,-30,0" startKey="0"/>
</part>
<part name="arm2">
<component length="10" name="1" rotChange="0,0,-2" rotOffset="0,0,60" startKey="0"/>
<component length="10" name="2" rotChange="0,0,2" startKey="10"/>
</part>
<part name="arm2_1">
<component length="10" name="1" rotOffset="0,30,0" startKey="0"/>
</part>
</phase>
<phase type="walking-1">
<part name="body">
<component length="10" name="1" rotOffset="-20,0,0" startKey="0"/>
</part>
<part name="body1">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="leg1">
<component length="10" name="1" rotOffset="-50,70,30" startKey="0"/>
</part>
<part name="leg2">
<component length="10" name="1" rotOffset="-50,-70,-30" startKey="0"/>
</part>
<part name="leg1_1">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="leg2_1">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="arm1">
<component length="10" name="1" rotChange="0,0,2" rotOffset="0,-40,-60" startKey="0"/>
<component length="10" name="2" rotChange="0,0,-2" startKey="10"/>
</part>
<part name="arm1_1">
<component length="10" name="1" rotOffset="30,-20,-30" startKey="0"/>
</part>
<part name="hand1">
<component length="10" name="1" rotOffset="30,0,0" startKey="0"/>
</part>
<part name="arm2">
<component length="10" name="1" rotChange="0,0,-2" rotOffset="0,40,60" startKey="0"/>
<component length="10" name="2" rotChange="0,0,2" startKey="10"/>
</part>
<part name="arm2_1">
<component length="10" name="1" rotOffset="30,20,30" startKey="0"/>
</part>
<part name="hand2">
<component length="10" name="1" rotOffset="30,0,0" startKey="0"/>
</part>
</phase>
<phase type="walking-2">
<part name="leg1">
<component length="10" name="1" rotOffset="40,0,0" startKey="0"/>
</part>
<part name="leg2">
<component length="10" name="1" rotOffset="40,0,0" startKey="0"/>
</part>
<part name="leg1_1">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="leg2_1">
<component length="10" name="1" rotOffset="20,0,0" startKey="0"/>
</part>
<part name="arm1">
<component length="10" name="1" rotChange="0,20,0" rotOffset="0,-40,-60" startKey="0"/>
<component length="10" name="2" rotChange="0,-40,0" startKey="5"/>
<component length="10" name="3" rotChange="0,20,0" startKey="10"/>
</part>
<part name="arm1_1">
<component length="10" name="1" rotOffset="30,-20,-30" startKey="0"/>
</part>
<part name="arm2">
<component length="10" name="1" rotChange="0,20,0" rotOffset="0,40,60" startKey="0"/>
<component length="10" name="2" rotChange="0,-40,0" startKey="5"/>
<component length="10" name="3" rotChange="0,20,0" startKey="10"/>
</part>
<part name="arm2_1">
<component length="10" name="1" rotOffset="30,20,30" startKey="0"/>
</part>
</phase>
<subanim name="walking-1" base="walking"/>
<subanim name="walking-2" base="walking"/>
</model>
</ModelAnimator>
2 changes: 1 addition & 1 deletion src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam.x3d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,7 @@
>
<Coordinate point="-0.096471 -0.774620 -0.244236 -0.581346 -0.774620 -0.244236 -0.581346 -0.795227 -0.293537 -0.096471 -0.795227 -0.293537 0.581346 -0.774620 -0.244236 0.096471 -0.774620 -0.244236 0.096471 -0.795227 -0.293537 0.581346 -0.795227 -0.293537 0.581346 -0.538901 0.319738 0.096471 -0.538901 0.319738 0.096471 -0.774620 -0.244236 0.581346 -0.774620 -0.244236 -0.096471 -0.538901 0.319738 -0.581346 -0.538901 0.319738 -0.581346 -0.774620 -0.244236 -0.096471 -0.774620 -0.244236 " />
<Normal vector="0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 0.000000 -0.925077 -0.379711 0.000000 -0.925077 -0.379711 0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 0.000000 -0.925077 -0.379711 0.000000 -0.925077 -0.379711 0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 0.000000 -0.922636 0.385632 " />
<TextureCoordinate point="0.1161 0.9212 0.0289 0.9212 0.0289 0.7849 0.1161 0.7849 0.0289 0.9212 0.1161 0.9212 0.1161 0.7849 0.0289 0.7849 0.5279 0.9956 0.9565 0.9956 0.9565 0.7476 0.5279 0.7476 0.9565 0.9956 0.5279 0.9956 0.5279 0.7476 0.9565 0.7476 " />
<TextureCoordinate point="0.1161 0.9212 0.0289 0.9212 0.0289 0.7849 0.1161 0.7849 0.0289 0.9212 0.1161 0.9212 0.1161 0.7849 0.0289 0.7849 0.0917 0.9955 0.9552 0.9955 0.9552 0.5055 0.0917 0.5055 0.9552 0.9955 0.0917 0.9955 0.0917 0.5055 0.9552 0.5055 " />
</IndexedTriangleSet>
</Shape>
</Group>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<phase armAngle="20" duration="10" leftArm="" leftLeg="leg1:leg1_1" legAngle="15" name="biWalk" rightArm="" rightLeg="leg2:leg2_1"/>
<worn angles="0,180,90" id="__EYE__" offset="0.38,0,-0.1" parent="head" scale="1"/>
<customTex default="alakazam">
<part name="Head" tex="alakazamhead"/>
<animation diffs="0,0.35" part="Head" trigger="random:0.005:20"/>
<part name="Head" tex="alakazammegaeye"/>
<animation diffs="0,0.5" part="Head" trigger="random:0.005:20"/>
</customTex>
<phase type="idle">
<part name="cint">
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_mega.x3d
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<X3D>
<head>
<meta name="filename" content="alakazammega.x3d" />
<meta name="filename" content="alakazam_mega.x3d" />
<meta name="generator" content="Blender 2.79 (sub 0)" />
</head>
<Scene>
Expand Down Expand Up @@ -1297,11 +1297,11 @@
</Appearance>
<IndexedTriangleSet solid="true"
normalPerVertex="true"
index="0 1 2 0 2 3 4 5 6 4 6 7 "
index="0 1 2 0 2 3 4 0 3 4 3 5 "
>
<Coordinate point="0.000000 -0.641987 -0.436835 0.514164 -0.641987 -0.436835 0.514164 -0.608211 0.097050 0.000000 -0.608211 0.097050 -0.514164 -0.641987 -0.436835 0.000000 -0.641987 -0.436835 0.000000 -0.608211 0.097050 -0.514164 -0.608211 0.097050 " />
<Normal vector="0.000000 -0.750328 -0.661031 0.577349 -0.612629 -0.539720 0.707083 -0.705679 0.044618 0.000000 -0.997986 0.063112 -0.577349 -0.612629 -0.539720 0.000000 -0.750328 -0.661031 0.000000 -0.997986 0.063112 -0.707083 -0.705679 0.044618 " />
<TextureCoordinate point="0.9923 0.6820 0.5209 0.6820 0.5209 0.9965 0.9923 0.9965 0.5209 0.6820 0.9923 0.6820 0.9923 0.9965 0.5209 0.9965 " />
<Coordinate point="0.000000 -0.641987 -0.436835 0.514164 -0.641987 -0.436835 0.514164 -0.608211 0.097050 0.000000 -0.608211 0.097050 -0.514164 -0.641987 -0.436835 -0.514164 -0.608211 0.097050 " />
<Normal vector="0.000000 -0.750328 -0.661031 0.577349 -0.612629 -0.539720 0.707083 -0.705679 0.044618 0.000000 -0.997986 0.063112 -0.577349 -0.612629 -0.539720 -0.707083 -0.705679 0.044618 " />
<TextureCoordinate point="1.0000 0.5000 0.0625 0.5000 0.0625 0.9844 1.0000 0.9844 0.0625 0.5000 0.0625 0.9844 " />
</IndexedTriangleSet>
</Shape>
</Group>
Expand Down
5 changes: 2 additions & 3 deletions src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_mega.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<metadata head="head" headAxis="2" headAxis2="0" headCap="-60,60" headDir="-1"/>
<worn angles="-90,0,0" id="__EYE__" offset="0,-0.04,0.4" parent="head" scale="2,1.5,1"/>
<customTex default="alakazammega">
<part name="Head" tex="alakazammegahead"/>
<animation diffs="0,0.67" part="Head" trigger="random:0.005:20"/>
<animation diffs="0,0.87" part="Head" trigger="sleeping"/>
<part name="Head" tex="alakazammegaeye"/>
<animation diffs="0,0.5" part="Head" trigger="random:0.005:20"/>
</customTex>
<phase type="sitting">
<part name="arm1">
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arbok.x3d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
>
<Coordinate point="-0.015929 -0.204652 0.009500 0.037189 0.202472 -0.012704 0.046724 0.266112 1.180368 -0.022140 -0.141011 1.202572 -0.828372 0.332152 -0.012704 -1.046486 0.364830 -0.012704 -1.036952 0.428470 1.180368 -0.818837 0.395792 1.180368 -1.046486 0.364830 -0.012704 -1.107482 -0.042293 0.009500 -1.097948 0.021347 1.202572 -1.036952 0.428470 1.180368 -0.889368 -0.074972 0.009500 -0.015929 -0.204652 0.009500 -0.022140 -0.141011 1.202572 -0.879833 -0.011331 1.202572 -0.828372 0.332152 -0.012704 -0.889368 -0.074972 0.009500 -1.107482 -0.042293 0.009500 -1.046486 0.364830 -0.012704 -0.818837 0.395792 1.180368 -0.879833 -0.011331 1.202572 -0.022140 -0.141011 1.202572 0.046724 0.266112 1.180368 -1.036952 0.428470 1.180368 -1.097948 0.021347 1.202572 0.037189 0.202472 -0.012704 -0.015929 -0.204652 0.009500 -1.107482 -0.042293 0.009500 -0.889368 -0.074972 0.009500 -0.879833 -0.011331 1.202572 -1.097948 0.021347 1.202572 " />
<Normal vector="0.486221 -0.686758 -0.540239 0.650533 0.452834 -0.609699 0.662160 0.516098 0.543260 0.484909 -0.624134 0.612568 0.098972 0.660604 -0.744163 -0.490158 0.624928 -0.607593 -0.480941 0.686422 0.545396 0.110263 0.735923 0.667989 -0.490158 0.624928 -0.607593 -0.661000 -0.515336 -0.545396 -0.651784 -0.453841 0.607593 -0.480941 0.686422 0.545396 -0.110233 -0.735923 -0.667989 0.486221 -0.686758 -0.540239 0.484909 -0.624134 0.612568 -0.098941 -0.660634 0.744133 0.098972 0.660604 -0.744163 -0.110233 -0.735923 -0.667989 -0.661000 -0.515336 -0.545396 -0.490158 0.624928 -0.607593 0.110263 0.735923 0.667989 -0.098941 -0.660634 0.744133 0.484909 -0.624134 0.612568 0.662160 0.516098 0.543260 -0.480941 0.686422 0.545396 -0.651784 -0.453841 0.607593 0.650533 0.452834 -0.609699 0.486221 -0.686758 -0.540239 -0.661000 -0.515336 -0.545396 -0.110233 -0.735923 -0.667989 -0.098941 -0.660634 0.744133 -0.651784 -0.453841 0.607593 " />
<TextureCoordinate point="0.0365 0.8818 0.0365 0.9490 0.1037 0.9490 0.1037 0.8818 0.0365 0.9154 0.0365 0.9490 0.1037 0.9490 0.1037 0.9154 0.0365 0.8818 0.0365 0.9490 0.1037 0.9490 0.1037 0.8818 0.3335 0.0575 0.9977 0.0575 0.9977 0.9929 0.3335 0.9929 0.0701 0.8818 0.0701 0.9490 0.1037 0.9490 0.1037 0.8818 0.0701 0.8818 0.0701 0.9490 0.1037 0.9490 0.1037 0.8818 0.0365 0.8818 0.0365 0.9490 0.0365 0.8818 0.0365 0.9490 0.0387 0.8810 0.1040 0.8810 0.1040 0.9561 0.0387 0.9561 " />
<TextureCoordinate point="0.0365 0.8818 0.0365 0.9490 0.1037 0.9490 0.1037 0.8818 0.0365 0.9154 0.0365 0.9490 0.1037 0.9490 0.1037 0.9154 0.0365 0.8818 0.0365 0.9490 0.1037 0.9490 0.1037 0.8818 0.3125 0.0625 1.0000 0.0625 1.0000 1.0000 0.3125 1.0000 0.0701 0.8818 0.0701 0.9490 0.1037 0.9490 0.1037 0.8818 0.0701 0.8818 0.0701 0.9490 0.1037 0.9490 0.1037 0.8818 0.0365 0.8818 0.0365 0.9490 0.0365 0.8818 0.0365 0.9490 0.0387 0.8810 0.1040 0.8810 0.1040 0.9561 0.0387 0.9561 " />
</IndexedTriangleSet>
</Shape>
</Group>
Expand Down Expand Up @@ -574,7 +574,7 @@
>
<Coordinate point="0.021883 -0.204652 0.009500 0.014299 -0.141011 1.202572 -0.046724 0.266112 1.180368 -0.037189 0.202472 -0.012704 0.828372 0.332152 -0.012704 0.818837 0.395792 1.180368 1.036952 0.428470 1.180368 1.046486 0.364830 -0.012704 1.046486 0.364830 -0.012704 1.036952 0.428470 1.180368 1.097948 0.021347 1.202572 1.107482 -0.042293 0.009500 0.014299 -0.141011 1.202572 0.021883 -0.204652 0.009500 0.889368 -0.074972 0.009500 0.879833 -0.011331 1.202572 0.828372 0.332152 -0.012704 1.046486 0.364830 -0.012704 1.107482 -0.042293 0.009500 0.889368 -0.074972 0.009500 0.818837 0.395792 1.180368 -0.046724 0.266112 1.180368 0.014299 -0.141011 1.202572 0.879833 -0.011331 1.202572 1.036952 0.428470 1.180368 1.097948 0.021347 1.202572 0.021883 -0.204652 0.009500 -0.037189 0.202472 -0.012704 1.107482 -0.042293 0.009500 1.097948 0.021347 1.202572 0.879833 -0.011331 1.202572 0.889368 -0.074972 0.009500 " />
<Normal vector="-0.482437 -0.685934 -0.544694 -0.490341 -0.624287 0.608081 -0.660512 0.516129 0.545213 -0.650990 0.454390 -0.608020 -0.098972 0.660604 -0.744163 -0.110233 0.735923 0.667989 0.480941 0.686422 0.545396 0.490158 0.624928 -0.607593 0.490158 0.624928 -0.607593 0.480941 0.686422 0.545396 0.651784 -0.453841 0.607593 0.661000 -0.515336 -0.545396 -0.490341 -0.624287 0.608081 -0.482437 -0.685934 -0.544694 0.110202 -0.735954 -0.667959 0.098910 -0.660634 0.744133 -0.098972 0.660604 -0.744163 0.490158 0.624928 -0.607593 0.661000 -0.515336 -0.545396 0.110202 -0.735954 -0.667959 -0.110233 0.735923 0.667989 -0.660512 0.516129 0.545213 -0.490341 -0.624287 0.608081 0.098910 -0.660634 0.744133 0.480941 0.686422 0.545396 0.651784 -0.453841 0.607593 -0.482437 -0.685934 -0.544694 -0.650990 0.454390 -0.608020 0.661000 -0.515336 -0.545396 0.651784 -0.453841 0.607593 0.098910 -0.660634 0.744133 0.110202 -0.735954 -0.667959 " />
<TextureCoordinate point="0.0365 0.8818 0.1037 0.8818 0.1037 0.9490 0.0365 0.9490 0.0365 0.9154 0.1037 0.9154 0.1037 0.9490 0.0365 0.9490 0.0365 0.8818 0.1037 0.8818 0.1037 0.9490 0.0365 0.9490 0.9977 0.9929 0.9977 0.0575 0.3335 0.0575 0.3335 0.9929 0.0701 0.8818 0.1037 0.8818 0.1037 0.9490 0.0701 0.9490 0.0701 0.8818 0.1037 0.8818 0.1037 0.9490 0.0701 0.9490 0.0365 0.8818 0.0365 0.9490 0.0365 0.9490 0.0365 0.8818 0.0387 0.8810 0.0387 0.9561 0.1040 0.9561 0.1040 0.8810 " />
<TextureCoordinate point="0.0365 0.8818 0.1037 0.8818 0.1037 0.9490 0.0365 0.9490 0.0365 0.9154 0.1037 0.9154 0.1037 0.9490 0.0365 0.9490 0.0365 0.8818 0.1037 0.8818 0.1037 0.9490 0.0365 0.9490 1.0000 1.0000 1.0000 0.0625 0.3125 0.0625 0.3125 1.0000 0.0701 0.8818 0.1037 0.8818 0.1037 0.9490 0.0701 0.9490 0.0701 0.8818 0.1037 0.8818 0.1037 0.9490 0.0701 0.9490 0.0365 0.8818 0.0365 0.9490 0.0365 0.9490 0.0365 0.8818 0.0387 0.8810 0.0387 0.9561 0.1040 0.9561 0.1040 0.8810 " />
</IndexedTriangleSet>
</Shape>
</Group>
Expand Down
Loading

0 comments on commit 2eca9d2

Please sign in to comment.