diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-02-10 22:51:09 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-02-10 22:51:09 +0100 |
| commit | c1fd3d5800a6d7ff1d73fd2c4d5ce1000d2ea42e (patch) | |
| tree | 3f102ce43ee775af6abd9708df8b21dd1cf16d21 /src/main/resources | |
| parent | 04b5d32fe0400492314a68406757f354037d095d (diff) | |
| parent | d718cac331526a1d13a4df12fba42ef01028bd90 (diff) | |
| download | GT5-Unofficial-c1fd3d5800a6d7ff1d73fd2c4d5ce1000d2ea42e.tar.gz GT5-Unofficial-c1fd3d5800a6d7ff1d73fd2c4d5ce1000d2ea42e.tar.bz2 GT5-Unofficial-c1fd3d5800a6d7ff1d73fd2c4d5ce1000d2ea42e.zip | |
Merge remote-tracking branch 'origin/Teteros/Recipes'
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png | bin | 0 -> 21917 bytes | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta) | 0 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png) | bin | 7457 -> 7457 bytes | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta | 5 |
4 files changed, 5 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png Binary files differnew file mode 100644 index 0000000000..8cb44c0505 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta index 0df7234a79..0df7234a79 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png Binary files differindex 208a1792ea..208a1792ea 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file |
