diff options
| author | Technus <daniel112092@gmail.com> | 2017-01-14 12:54:44 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-01-14 12:54:44 +0100 |
| commit | 3c3654cb3ccecc7fc5934e6a64b9549d6ca03196 (patch) | |
| tree | ab4807e7311407e60d9cd64727523b966fac2087 /src/main/resources | |
| parent | 24bc352a2d6a7df7cbb3300c09d018c3195a086a (diff) | |
| parent | ba7ab1faca5ca2b54136f3fba89a1ee20b794399 (diff) | |
| download | GT5-Unofficial-3c3654cb3ccecc7fc5934e6a64b9549d6ca03196.tar.gz GT5-Unofficial-3c3654cb3ccecc7fc5934e6a64b9549d6ca03196.tar.bz2 GT5-Unofficial-3c3654cb3ccecc7fc5934e6a64b9549d6ca03196.zip | |
Merge branch 'experimental' into eM
# Conflicts:
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png | bin | 133 -> 36130 bytes | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png Binary files differindex 8bcaab412f..15fbd772f0 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta new file mode 100644 index 0000000000..83e994c588 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} |
