Skip to content

Commit

Permalink
ani texture update
Browse files Browse the repository at this point in the history
remake ranbow & gray animation
texture
adjust pistol "energry" model
  • Loading branch information
bill96012 committed Jul 16, 2018
1 parent a0ccafa commit 540643c
Show file tree
Hide file tree
Showing 29 changed files with 337 additions and 2,764 deletions.
1,505 changes: 167 additions & 1,338 deletions assets/minecraft/models/item/model/pistol_gra.json

Large diffs are not rendered by default.

1,526 changes: 168 additions & 1,358 deletions assets/minecraft/models/item/model/pistol_ran.json

Large diffs are not rendered by default.

Binary file removed assets/minecraft/textures/custom/black.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/black.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/blue.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/blue.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/cyan.png
Binary file not shown.
Binary file modified assets/minecraft/textures/custom/gray.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/minecraft/textures/custom/gray.png.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 2
"frametime": 10
}
}
Binary file removed assets/minecraft/textures/custom/gray_1.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/gray_1.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/green.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/green.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/light_gray.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/light_gray.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/light_gray_1.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/light_gray_1.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/orange.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/orange.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/purple.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/purple.png.mcmeta

This file was deleted.

Binary file added assets/minecraft/textures/custom/ranbow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 2
"frametime": 10
}
}
Binary file removed assets/minecraft/textures/custom/red.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/red.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/white.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/white.png.mcmeta

This file was deleted.

Binary file removed assets/minecraft/textures/custom/yellow.png
Binary file not shown.
6 changes: 0 additions & 6 deletions assets/minecraft/textures/custom/yellow.png.mcmeta

This file was deleted.

0 comments on commit 540643c

Please sign in to comment.