Merge in GTplusplus with history

git-subtree-dir: gtpp
git-subtree-mainline: 227856cdae4dae22fca53f2dc027cac476123bd0
git-subtree-split: 75915e9e1fce7a8ee500add139b42e806e9497b5

26 files changed, 253 insertions, 0 deletions

diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png
new file mode 100644
index 0000000000..b51346219b
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta
new file mode 100644
index 0000000000..aa41c3d5c8
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta
@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png
new file mode 100644
index 0000000000..3fb18d9c00
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta
new file mode 100644
index 0000000000..4fadce8aff
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta
@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 4,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png
new file mode 100644
index 0000000000..003d1597a6
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta
new file mode 100644
index 0000000000..4f0718ac96
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png
new file mode 100644
index 0000000000..512df7ce04
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta
new file mode 100644
index 0000000000..b8533e5109
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta
@@ -0,0 +1,5 @@
+{ 
+   "animation":{
+      "frametime":4
+   }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta
new file mode 100644
index 0000000000..0645f48c62
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta
new file mode 100644
index 0000000000..70cc4d313c
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 6
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta
new file mode 100644
index 0000000000..7e77c64858
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png
new file mode 100644
index 0000000000..a752755254
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta
new file mode 100644
index 0000000000..0df7234a79
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta
@@ -0,0 +1,5 @@
+{ 
+   "animation":{
+      "frametime":2
+   }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta
new file mode 100644
index 0000000000..eb608948b6
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 16
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png
new file mode 100644
index 0000000000..ee40545a46
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta
new file mode 100644
index 0000000000..7ceb363941
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta
@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png
new file mode 100644
index 0000000000..f0265d8ad2
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta
new file mode 100644
index 0000000000..87c542d295
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta
@@ -0,0 +1,5 @@
+{ 
+   "animation":{
+      "frametime":1
+   }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta
new file mode 100644
index 0000000000..aa41c3d5c8
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta
@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta
new file mode 100644
index 0000000000..3fc1338d74
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 12
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta
new file mode 100644
index 0000000000..7e77c64858
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta
new file mode 100644
index 0000000000..eb608948b6
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 16
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta
new file mode 100644
index 0000000000..70cc4d313c
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 6
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta
new file mode 100644
index 0000000000..f6730e30a9
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta
new file mode 100644
index 0000000000..f6730e30a9
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 4
+  }
+}
\ No newline at end of file
diff --git a/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta
new file mode 100644
index 0000000000..5169aabdc2
--- /dev/null
+++ b/gtpp/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 8
+  }
+}
\ No newline at end of file