diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-01-18 12:07:01 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-01-18 12:07:01 +0100 |
| commit | 28aba4f9b054f671af1c697d75153ecc0fb1a03b (patch) | |
| tree | 32dd9dc4bbb7103f2da26693e20c8320b8787c3b /src/main/resources | |
| parent | 2c65fddb561a7050db240c61d20cfcb94acb5b7a (diff) | |
| parent | aba425deec424f15a4deadfc0a195c7e8a789246 (diff) | |
| download | GT5-Unofficial-28aba4f9b054f671af1c697d75153ecc0fb1a03b.tar.gz GT5-Unofficial-28aba4f9b054f671af1c697d75153ecc0fb1a03b.tar.bz2 GT5-Unofficial-28aba4f9b054f671af1c697d75153ecc0fb1a03b.zip | |
Merge branch 'Chest-and-Tank-2' into experimental
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png | bin | 0 -> 3400 bytes | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png.mcmeta | 5 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png | bin | 662 -> 4267 bytes | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png | bin | 0 -> 3400 bytes | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png.mcmeta | 5 |
5 files changed, 10 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png Binary files differnew file mode 100644 index 0000000000..9f3de110d1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png.mcmeta new file mode 100644 index 0000000000..5e86a7cd5f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png Binary files differindex 0f183c0313..4473aab984 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png Binary files differnew file mode 100644 index 0000000000..9f3de110d1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png.mcmeta new file mode 100644 index 0000000000..5e86a7cd5f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +}
\ No newline at end of file |
