Merge branch 'GTNewHorizons:master' into master

41 files changed, 0 insertions, 213 deletions

diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png
deleted file mode 100644
index b51346219b..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta
deleted file mode 100644
index aa41c3d5c8..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "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/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png
deleted file mode 100644
index 3fb18d9c00..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta
deleted file mode 100644
index 4fadce8aff..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "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/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png
deleted file mode 100644
index 003d1597a6..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta
deleted file mode 100644
index 4f0718ac96..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "animation": {}
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png
deleted file mode 100644
index 512df7ce04..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta
deleted file mode 100644
index b8533e5109..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{ 
-   "animation":{
-      "frametime":4
-   }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png
deleted file mode 100644
index ef08c75bc8..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta
deleted file mode 100644
index 0645f48c62..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 2
-  }
-}
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png
deleted file mode 100644
index 61d77a51d3..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta
deleted file mode 100644
index 70cc4d313c..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 6
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png
deleted file mode 100644
index f79564ea36..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta
deleted file mode 100644
index 7e77c64858..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 2
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png
deleted file mode 100644
index a752755254..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta
deleted file mode 100644
index 0df7234a79..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{ 
-   "animation":{
-      "frametime":2
-   }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png
deleted file mode 100644
index 251206d195..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta
deleted file mode 100644
index eb608948b6..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 16
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png
deleted file mode 100644
index 6e44e97212..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png
deleted file mode 100644
index 512df7ce04..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png
deleted file mode 100644
index 7c5ffd0c77..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta
deleted file mode 100644
index b8533e5109..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{ 
-   "animation":{
-      "frametime":4
-   }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png
deleted file mode 100644
index f0265d8ad2..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta
deleted file mode 100644
index 87c542d295..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{ 
-   "animation":{
-      "frametime":1
-   }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png
deleted file mode 100644
index 00355135df..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta
deleted file mode 100644
index aa41c3d5c8..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "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/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png
deleted file mode 100644
index 2ff3fb6e7b..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta
deleted file mode 100644
index 3fc1338d74..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 12
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png
deleted file mode 100644
index 902015b8e1..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta
deleted file mode 100644
index 7e77c64858..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 2
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png
deleted file mode 100644
index fee5f03cd5..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta
deleted file mode 100644
index eb608948b6..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 16
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png
deleted file mode 100644
index 73fa814eb5..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta
deleted file mode 100644
index 70cc4d313c..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 6
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png
deleted file mode 100644
index 63e9189c45..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png
deleted file mode 100644
index 05d4c69e1a..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta
deleted file mode 100644
index f6730e30a9..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 4
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png
deleted file mode 100644
index 90cbef3417..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta
deleted file mode 100644
index f6730e30a9..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 4
-  }
-}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png
deleted file mode 100644
index 90cbef3417..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta
deleted file mode 100644
index 5169aabdc2..0000000000
--- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 8
-  }
-}
\ No newline at end of file