aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2019-11-27 18:45:42 +0100
committerGitHub <noreply@github.com>2019-11-27 18:45:42 +0100
commit2bd200b34fe310e1c9c408aa63826b00ddb11635 (patch)
tree54574a0aad63ed183d1b8fe04917769872a5da2e /src
parent82d717147838c4ebbc70e16e9df220739c57208b (diff)
parent4311ea108d502e522ad326608d8a33b3fb47b9a1 (diff)
downloadGT5-Unofficial-2bd200b34fe310e1c9c408aa63826b00ddb11635.tar.gz
GT5-Unofficial-2bd200b34fe310e1c9c408aa63826b00ddb11635.tar.bz2
GT5-Unofficial-2bd200b34fe310e1c9c408aa63826b00ddb11635.zip
Merge pull request #215 from GTNewHorizons/bugfix/fluid_textures
Fluid Texture Fix
Diffstat (limited to 'src')
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.pngbin2809 -> 1695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.pngbin0 -> 3567 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.pngbin0 -> 3275 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.pngbin103 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta5
32 files changed, 80 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png
index 113af76626..58c1d841b3 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png
index e5045f627d..6679d79b1e 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png
index e5045f627d..6679d79b1e 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png
index e5045f627d..6679d79b1e 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png
index 395e438872..66110ea4b8 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png
index 2ead95048c..66110ea4b8 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png
index 0300ee2b72..9e71a23276 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png
index afff0ed587..2dfe46e980 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png
new file mode 100644
index 0000000000..eba51f9556
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png
new file mode 100644
index 0000000000..22eb9e5220
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png
index 5f8e539e8a..052e6249bd 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png
index 55cde5b4d8..548573da0a 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png
index e7323cb129..425fc3ef91 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png
index 9886fa1442..5bd434c49a 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png
index 2bd83db3c4..dbf6df92c3 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png
index 495cdb1bba..cea29054db 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":2
+ }
+} \ No newline at end of file