Merge branch 'master' of https://github.com/draknyte1/GTplusplus

80 files changed, 84 insertions, 39 deletions

diff --git a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png b/src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png
new file mode 100644
index 0000000000..8e7cfbfa9f
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png
diff --git a/src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png b/src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png
new file mode 100644
index 0000000000..9495864a0f
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 915ab6cc7f..9c1db189c3 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -7,35 +7,15 @@ itemGroup.MiscUtilOtherTab=[GT++] Items II
 
 item.itemPLACEHOLDER_Circuit.name=Quark Manipulator (UV)
 
+item.itemPlateEnrichedSoularium.name=Enriched Soularium Plate
 
+item.itemHeliumBlob.name=Mysterious Hydrogen Substance
 
-
-
-
-item.itemPlateSoularium.name=Soularium Plate
-item.itemPlateRedstoneAlloy.name=Redstone Alloy Plate
-item.itemPlateElectricalSteel.name=Electrical Steel Plate
-item.itemPlatePulsatingIron.name=Pulsating Iron Plate
-item.itemPlateEnergeticAlloy.name=Energetic Alloy Plate
-item.itemPlateVibrantAlloy.name=Vibrant Alloy Plate
-item.itemPlateConductiveIron.name=Conductive Iron Plate
-item.itemPlateDarkSteel.name=Dark Steel Plate
-item.itemPlateBlutonium.name=Blutonium Plate
-item.itemPlateCyanite.name=Cyanite Plate
-item.itemPlateLudicrite.name=Ludicrite Plate
-item.itemPlateVoidMetal.name=Void Metal Plate
-item.itemPlateBedrockium.name=Bedrockium Plate
-item.itemPlateCompressedIron.name=Compressed Iron Plate
-item.itemPlateEnrichedSoularium.name=Enriched Soularium Plate
-item.itemPlateDimensionShard.name=Dimensional Plate
-item.itemIngotBloodSteel.name=Blood Steel Ingot
-item.itemPlateBloodSteel.name=Blood Steel Plate
-item.itemIngotStaballoy.name=Staballoy Ingot
-item.itemPlateStaballoy.name=Staballoy Plate
-item.itemHeliumBlob.name=Blob of solid Helium
 item.itemPlateBatteryAlloy.name=Plate of Battery Alloy
 item.itemIngotBatteryAlloy.name=Ingot of Battery Alloy
+
 item.itemStickyRubber.name=Gumlet of Sticky Rubber
+
 item.itemFuelRod_Empty.name=Empty Fuel Rod
 item.itemFuelRod_Thorium.name=Thorium Fuel Rod
 item.itemFuelRod_Uranium.name=Uranium Fuel Rod
@@ -125,22 +105,11 @@ item.itemTungstenSteelShaft.name=TungstenSteel Shaft
 item.itemVibrantShaft.name=Vibrant Alloy Shaft
 item.itemIridiumShaft.name=Iridium Shaft
 
-
 item.itemMagnaliumRotorBlade.name=Magnalium Rotor Blade
 item.itemUltimetRotorBlade.name=Ultimet Blade
 item.itemMagnaliumShaft.name=Magnalium Shaft
 item.itemUltimetShaft.name=Ultimet Shaft
 
-
-
-item.itemDustStaballoy.name=Staballoy Dust
-item.itemDustSmallStaballoy.name=Small pile of Staballoy Dust
-item.itemDustTinyStaballoy.name=Tiny pile of Staballoy Dust
-item.itemDustBloodSteel.name=BloodSteel Dust
-item.itemDustSmallBloodSteel.name=Small pile of BloodSteel Dust
-item.itemDustTinyBloodSteel.name=Tiny pile of BloodSteel Dust
-
-item.itemHotIngotStaballoy.name=Hot Staballoy Ingot
 item.itemHotIngotRaisinBread.name= Hot Loaf of Raisin Bread
 item.AAA_Broken.name=[Non-existent Item] Report This Recipe On Github, Please.
 item.itemIngotRaisinBread.name=§5ImQ009's §fRaisin Bread
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png
new file mode 100644
index 0000000000..c4ea9ed594
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png
new file mode 100644
index 0000000000..7724e07436
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png
new file mode 100644
index 0000000000..337c1337b0
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png
new file mode 100644
index 0000000000..5c633c843a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png
new file mode 100644
index 0000000000..9ff63c86b9
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png
new file mode 100644
index 0000000000..d642f0401f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png
new file mode 100644
index 0000000000..3402226b64
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png
new file mode 100644
index 0000000000..615fa9885e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png
new file mode 100644
index 0000000000..dbd0d6242e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png
new file mode 100644
index 0000000000..04e8ad5898
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png
new file mode 100644
index 0000000000..f2f82b6838
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png
new file mode 100644
index 0000000000..87226e7554
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png
new file mode 100644
index 0000000000..f091397be6
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png
new file mode 100644
index 0000000000..d391da4eaf
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta
new file mode 100644
index 0000000000..60af678259
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":4
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png
new file mode 100644
index 0000000000..6582a6306a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta
new file mode 100644
index 0000000000..60af678259
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":4
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png
new file mode 100644
index 0000000000..6609ca0044
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta
new file mode 100644
index 0000000000..60af678259
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":4
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png
new file mode 100644
index 0000000000..d5f23d447f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png
new file mode 100644
index 0000000000..5a4f23d3ea
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png
new file mode 100644
index 0000000000..d40c95f3aa
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png
new file mode 100644
index 0000000000..a8a857b5b8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png
new file mode 100644
index 0000000000..fc9c6e5d8a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png
new file mode 100644
index 0000000000..695451fafc
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta
new file mode 100644
index 0000000000..19b79a1e22
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+      "frametime":1,
+      "frames":[{"index":0,"time":100},{"index":1,"time":3},{"index":2,"time":2},{"index":3,"time":3},0,1,2,3]
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png
new file mode 100644
index 0000000000..7157b7541d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta
new file mode 100644
index 0000000000..60af678259
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":4
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png
new file mode 100644
index 0000000000..7157b7541d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta
new file mode 100644
index 0000000000..97596ba817
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta
@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":2
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png
new file mode 100644
index 0000000000..7157b7541d
--- /