Merge pull request #1 from GTNewHorizons/experimental

5/24

42 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.png
index d314d50ee3..fb56f12c85 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIRESTONE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIRESTONE.png
new file mode 100644
index 0000000000..bfb78ae3d1
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIRESTONE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.png
index 7e4c63cee1..97f48411b1 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png
new file mode 100644
index 0000000000..a4828d2439
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png
new file mode 100644
index 0000000000..42a2d3dbe3
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png
new file mode 100644
index 0000000000..f2359665cd
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png
new file mode 100644
index 0000000000..1db84e04c8
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TSREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TSREIN.png
index d0ea9e6113..5a93336b04 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TSREIN.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TSREIN.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png
new file mode 100644
index 0000000000..06396d51e8
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png
new file mode 100644
index 0000000000..f97c631271
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png