diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-15 16:52:41 +0200 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-15 16:52:41 +0200 |
| commit | 06415dc21d71e8ac363dae5c56c5317971f7aede (patch) | |
| tree | 7ddbe2cc709a5a39c3fe8b8a80d7ac77f336a220 /resources/assets/jewelrycraft/textures | |
| parent | 9342967bd8a6a9451591325c7c5deb5416819adc (diff) | |
| parent | 943f1a493b27c630e95730b385e6524643d98564 (diff) | |
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod
As well as added the smelter and working on the molder
Diffstat (limited to 'resources/assets/jewelrycraft/textures')
| -rw-r--r-- | resources/assets/jewelrycraft/textures/blocks/oreShadow.png | bin | 0 -> 1882 bytes | |||
| -rw-r--r-- | resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta | 5 | ||||
| -rw-r--r-- | resources/assets/jewelrycraft/textures/blocks/smelter.png | bin | 0 -> 537 bytes | |||
| -rw-r--r-- | resources/assets/jewelrycraft/textures/items/ingotShadow.png | bin | 0 -> 552 bytes | |||
| -rw-r--r-- | resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta | 5 | ||||
| -rw-r--r-- | resources/assets/jewelrycraft/textures/items/thiefGloves.png | bin | 0 -> 290 bytes | |||
| -rw-r--r-- | resources/assets/jewelrycraft/textures/tileentities/Molder.png | bin | 0 -> 1020 bytes | |||
| -rw-r--r-- | resources/assets/jewelrycraft/textures/tileentities/Smelter.png | bin | 0 -> 886 bytes |
8 files changed, 10 insertions, 0 deletions
diff --git a/resources/assets/jewelrycraft/textures/blocks/oreShadow.png b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png Binary files differnew file mode 100644 index 0000000..31ee2a6 --- /dev/null +++ b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png diff --git a/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta new file mode 100644 index 0000000..bf4c01e --- /dev/null +++ b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +}
\ No newline at end of file diff --git a/resources/assets/jewelrycraft/textures/blocks/smelter.png b/resources/assets/jewelrycraft/textures/blocks/smelter.png Binary files differnew file mode 100644 index 0000000..4da0c0a --- /dev/null +++ b/resources/assets/jewelrycraft/textures/blocks/smelter.png diff --git a/resources/assets/jewelrycraft/textures/items/ingotShadow.png b/resources/assets/jewelrycraft/textures/items/ingotShadow.png Binary files differnew file mode 100644 index 0000000..1522faf --- /dev/null +++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png diff --git a/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta new file mode 100644 index 0000000..09994da --- /dev/null +++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 4 + } +}
\ No newline at end of file diff --git a/resources/assets/jewelrycraft/textures/items/thiefGloves.png b/resources/assets/jewelrycraft/textures/items/thiefGloves.png Binary files differnew file mode 100644 index 0000000..b56e925 --- /dev/null +++ b/resources/assets/jewelrycraft/textures/items/thiefGloves.png diff --git a/resources/assets/jewelrycraft/textures/tileentities/Molder.png b/resources/assets/jewelrycraft/textures/tileentities/Molder.png Binary files differnew file mode 100644 index 0000000..c5acc88 --- /dev/null +++ b/resources/assets/jewelrycraft/textures/tileentities/Molder.png diff --git a/resources/assets/jewelrycraft/textures/tileentities/Smelter.png b/resources/assets/jewelrycraft/textures/tileentities/Smelter.png Binary files differnew file mode 100644 index 0000000..6ec3595 --- /dev/null +++ b/resources/assets/jewelrycraft/textures/tileentities/Smelter.png |
