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 committed Apr 4, 2020
2 parents 46c25c6 + 8004b8a commit 614295f
Show file tree
Hide file tree
Showing 8 changed files with 208 additions and 478 deletions.
264 changes: 51 additions & 213 deletions src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cottonee.x3d

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model name="">
<phase headAxis="1" headCap="-50,50" name="global" scale=".15"/>
<model>
<phase name="global" scale="0.5"/>
</model>
</ModelAnimator>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model>
<phase name="global" scale=".25"/>
<metadata head="head" headCap="-60,60"/>
<phase name="global" scale=".5"/>
<metadata head="head" headCap="-60,60" headAxis="2"/>
<phase armAngle="50" duration="10" leftArm="Left_arm" leftLeg="Left_leg" legAngle="45" name="biWalk" rightArm="Right_arm" rightLeg="Right_leg"/>
</model>
</ModelAnimator>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 614295f

Please sign in to comment.