update bs+sa+material

8 files changed, 212 insertions, 215 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index fdf2ffd155..45733e0f72 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,16 +2,16 @@
 
 dependencies {
     shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.49:dev")
-    api('com.github.GTNewHorizons:Yamcl:0.5.84:dev')
-    api('com.github.GTNewHorizons:ModularUI:1.0.67:dev')
-    implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.27:dev')
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.65-pre:dev")
+    api('com.github.GTNewHorizons:Yamcl:0.5.86:dev')
+    api('com.github.GTNewHorizons:ModularUI:1.1.2:dev')
+    implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.29:dev')
 
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive = false}
 
     compileOnly('com.github.GTNewHorizons:OpenModularTurrets:2.2.11-247:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.9-GTNH:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:GTplusplus:1.8.35:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.1-GTNH:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:GTplusplus:1.8.38-pre:dev') {transitive=false}
 
     compileOnly('curse.maven:cofh-lib-220333:2388748') {transitive=false}
     compileOnly('curse.maven:computercraft-67504:2269339') {transitive=false}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa7..ccebba7710 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc10b601f7..bdc9a83b1e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65..79a61d421c 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
index 9cfa1718a6..45bfab496f 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
@@ -295,7 +295,7 @@ public class Assembler implements Runnable {
                 GT_Values.RA.addAssemblerRecipe(
                         new ItemStack[] { getItemContainer("Hatch_Dynamo_UMV").get(1),
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2),
-                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2) },
+                                GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2) },
                         Materials.Silver.getMolten(9216),
                         CustomItemList.eM_dynamoMulti4_UMV.get(1),
                         100,
@@ -307,7 +307,7 @@ public class Assembler implements Runnable {
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2),
                                 GT_OreDictUnificator.get(
                                         OrePrefixes.plate,
-                                        Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                        MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                         1),
                                 GT_OreDictUnificator.get("plateShirabon", 1L) },
                         Materials.Silver.getMolten(9216),
@@ -411,7 +411,7 @@ public class Assembler implements Runnable {
                         new ItemStack[] { getItemContainer("Transformer_UXV_UMV").get(1),
                                 CustomItemList.eM_dynamoMulti4_UMV.get(1),
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2),
-                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4) },
+                                GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 4) },
                         Materials.Electrum.getMolten(9216),
                         CustomItemList.eM_dynamoMulti16_UMV.get(1),
                         200,
@@ -424,7 +424,7 @@ public class Assembler implements Runnable {
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.BlackPlutonium, 2),
                                 GT_OreDictUnificator.get(
                                         OrePrefixes.plate,
-                                        Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                        MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                         2),
                                 GT_OreDictUnificator.get("plateShirabon", 2L) },
                         Materials.Electrum.getMolten(9216),
@@ -531,7 +531,7 @@ public class Assembler implements Runnable {
                         new ItemStack[] { getItemContainer("WetTransformer_UXV_UMV").get(1),
                                 CustomItemList.eM_dynamoMulti16_UMV.get(1),
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2),
-                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6) },
+                                GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6) },
                         Materials.Tungsten.getMolten(9216),
                         CustomItemList.eM_dynamoMulti64_UMV.get(1),
                         400,
@@ -544,7 +544,7 @@ public class Assembler implements Runnable {
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.BlackPlutonium, 2),
                                 GT_OreDictUnificator.get(
                                         OrePrefixes.plate,
-                                        Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                        MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                         3),
                                 GT_OreDictUnificator.get("plateShirabon", 3L) },
                         Materials.Tungsten.getMolten(9216),
@@ -649,7 +649,7 @@ public class Assembler implements Runnable {
                 GT_Values.RA.addAssemblerRecipe(
                         new ItemStack[] { getItemContainer("Hatch_Energy_UMV").get(1),
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2),
-                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2) },
+                                GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2) },
                         Materials.Silver.getMolten(9216),
                         CustomItemList.eM_energyMulti4_UMV.get(1),
                         100,
@@ -661,7 +661,7 @@ public class Assembler implements Runnable {
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2),
                                 GT_OreDictUnificator.get(
                                         OrePrefixes.plate,
-                                        Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                        MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                         1),
                                 GT_OreDictUnificator.get("plateShirabon", 1L) },
                         Materials.Silver.getMolten(9216),
@@ -768,7 +768,7 @@ public class Assembler implements Runnable {
                         new ItemStack[] { getItemContainer("Transformer_UXV_UMV").get(1),
                                 CustomItemList.eM_energyMulti4_UMV.get(1),
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2),
-                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4) },
+                                GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 4) },
                         Materials.Electrum.getMolten(9216),
                         CustomItemList.eM_energyMulti16_UMV.get(1),
                         200,
@@ -781,7 +781,7 @@ public class Assembler implements Runnable {
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.BlackPlutonium, 2),
                                 GT_OreDictUnificator.get(
                                         OrePrefixes.plate,
-                                        Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                        MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                         2),
                                 GT_OreDictUnificator.get("plateShirabon", 2L) },
                         Materials.Electrum.getMolten(9216),
@@ -891,7 +891,7 @@ public class Assembler implements Runnable {
                         new ItemStack[] { getItemContainer("WetTransformer_UXV_UMV").get(1),
                                 CustomItemList.eM_energyMulti16_UMV.get(1),
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2),
-                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6) },
+                                GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6) },
                         Materials.Tungsten.getMolten(9216),
                         CustomItemList.eM_energyMulti64_UMV.get(1),
                         400,
@@ -904,7 +904,7 @@ public class Assembler implements Runnable {
                                 GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.BlackPlutonium, 2),
                                 GT_OreDictUnificator.get(
                                         OrePrefixes.plate,
-                                        Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                        MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                         3),
                                 GT_OreDictUnificator.get("plateShirabon", 3L) },
                         Materials.Tungsten.getMolten(9216),
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
index e5e1f54780..477f816a8f 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
@@ -27,6 +27,7 @@ import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.enums.Mods.TinkersGregworks;
 import static gregtech.api.util.GT_ModHandler.getModItem;
 
+import gregtech.api.enums.*;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -38,12 +39,6 @@ import vexatos.tgregworks.util.TGregUtils;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 import com.github.technus.tectech.thing.CustomItemList;
 
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.MaterialsBotania;
-import gregtech.api.enums.MaterialsKevlar;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TierEU;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.material.ALLOY;
@@ -138,8 +133,8 @@ public class ResearchStationAssemblyLine implements Runnable {
                     128_000_000,
                     1,
                     new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L },
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8),
-                            GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 8),
+                            GT_OreDictUnificator.get(OrePrefixes.wireGt02, MaterialsUEVplus.SpaceTime, 8),
+                            GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 8),
                             getModItem(EternalSingularity.ID, "eternal_singularity", 1L),
                             getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0),
                             getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0),
@@ -692,7 +687,7 @@ public class ResearchStationAssemblyLine implements Runnable {
                         ItemList.Circuit_Parts_ResistorXSMD.get(64L), ItemList.Circuit_Chip_QPIC.get(64L),
                         GT_OreDictUnificator.get("foilShirabon", 64),
                         GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64),
-                        GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 8),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 8),
                         GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 16) },
                 new FluidStack[] { new FluidStack(solderUEV, 3744), Materials.UUMatter.getFluid(24000L),
                         Materials.Osmium.getMolten(2304L) },
@@ -710,17 +705,17 @@ public class ResearchStationAssemblyLine implements Runnable {
                 new Object[] { CustomItemList.eM_energyTunnel7_UV.get(32),
                         new Object[] { OrePrefixes.circuit.get(Materials.Piko), 32L },
                         ItemList.Electric_Pump_UIV.get(16),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 64),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 64),
 
-                        GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 16),
-                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 64),
-                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 64),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 16),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 64),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 64),
                         ItemList.EnergisedTesseract.get(32),
 
                         ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L),
                         ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), },
-                new FluidStack[] { Materials.ExcitedDTCC.getFluid(2_048_000), Materials.ExcitedDTPC.getFluid(2_048_000),
-                        Materials.ExcitedDTRC.getFluid(2_048_000), Materials.ExcitedDTEC.getFluid(2_048_000), },
+                new FluidStack[] { MaterialsUEVplus.ExcitedDTCC.getFluid(2_048_000), MaterialsUEVplus.ExcitedDTPC.getFluid(2_048_000),
+                        MaterialsUEVplus.ExcitedDTRC.getFluid(2_048_000), MaterialsUEVplus.ExcitedDTEC.getFluid(2_048_000), },
                 ItemList.Machine_Multi_TranscendentPlasmaMixer.get(1),
                 36_000,
                 32_000_000);
@@ -733,7 +728,7 @@ public class ResearchStationAssemblyLine implements Runnable {
             // Stargate shield foil
             TT_recipeAdder.addResearchableAssemblylineRecipe(
                     GT_OreDictUnificator
-                            .get(OrePrefixes.plate, Materials.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
+                            .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1L),
                     (int) TierEU.RECIPE_MAX,
                     32768,
                     (int) TierEU.RECIPE_UXV,
@@ -742,20 +737,20 @@ public class ResearchStationAssemblyLine implements Runnable {
                             CustomItemList.StabilisationFieldGeneratorTier8.get(64),
                             GT_OreDictUnificator.get("blockShirabon", 64L),
                             GT_OreDictUnificator.get("blockShirabon", 64L),
-                            GT_OreDictUnificator.get(OrePrefixes.block, Materials.SpaceTime, 64L),
+                            GT_OreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.SpaceTime, 64L),
                             GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L),
-                            GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 8L),
-                            GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Universium, 8L),
+                            GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 8L),
+                            GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Universium, 8L),
                             GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L),
                             GT_OreDictUnificator.get("plateDenseShirabon", 8L), ItemList.Sensor_UXV.get(16L),
                             ItemList.Emitter_UXV.get(16L),
                             getModItem(EternalSingularity.ID, "eternal_singularity", 16L),
-                            Materials.Universium.getNanite(16), Materials.BlackDwarfMatter.getNanite(16),
-                            Materials.WhiteDwarfMatter.getNanite(16) },
+                            MaterialsUEVplus.Universium.getNanite(16), MaterialsUEVplus.BlackDwarfMatter.getNanite(16),
+                            MaterialsUEVplus.WhiteDwarfMatter.getNanite(16) },
                     new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
-                            Materials.SpaceTime.getMolten(4 * 36864L),
+                            MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
                             Materials.SuperconductorUMVBase.getMolten(4 * 36864L),
-                            Materials.ExcitedDTEC.getFluid(4 * 36864L) },
+                            MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
                     getItemContainer("StargateShieldingFoil").get(1L),
                     baseStargateTime,
                     (int) TierEU.RECIPE_UMV);
@@ -767,15 +762,15 @@ public class ResearchStationAssemblyLine implements Runnable {
                     32_768,
                     (int) TierEU.RECIPE_UXV,
                     64,
-                    new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.block, Materials.TranscendentMetal, 64L),
+                    new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.TranscendentMetal, 64L),
                             GT_OreDictUnificator.get("blockShirabon", 64),
                             CustomItemList.EOH_Reinforced_Spatial_Casing.get(64),
                             CustomItemList.EOH_Reinforced_Spatial_Casing.get(64),
 
-                            GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L),
+                            GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 16L),
                             GT_OreDictUnificator.get(
                                     OrePrefixes.frameGt,
-                                    Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                    MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                     16L),
                             GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L),
                             GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L),
@@ -784,7 +779,7 @@ public class ResearchStationAssemblyLine implements Runnable {
                             GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Sapphire, 16L),
                             GT_OreDictUnificator.get(
                                     OrePrefixes.plateDense,
-                                    Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                    MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                     8L),
                             GT_OreDictUnificator.get("plateDenseShirabon", 8),
 
@@ -792,25 +787,25 @@ public class ResearchStationAssemblyLine implements Runnable {
                             ItemList.Field_Generator_UXV.get(16L),
                             getItemContainer("QuantumCircuit").get(1L).splitStack(32) },
                     new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
-                            Materials.SpaceTime.getMolten(4 * 36864L),
-                            Materials.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(36864L),
-                            Materials.ExcitedDTEC.getFluid(4 * 36864L) },
+                            MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L),
+                            MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(36864L),
+                            MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
                     getItemContainer("StargateChevron").get(1L),
                     baseStargateTime,
                     (int) TierEU.RECIPE_UMV);
 
             // Stargate Frame Part
             TT_recipeAdder.addResearchableAssemblylineRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L),
+                    GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L),
                     (int) TierEU.RECIPE_MAX,
                     32_768,
                     500_000_000,
                     64,
                     new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
-                            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 64L),
+                            GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 64L),
                             GT_OreDictUnificator.get(
                                     OrePrefixes.stickLong,
-                                    Materials.MagnetohydrodynamicallyConstrainedStarMatter,
+                                    MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter,
                                     64L),
                             GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 64L),
 
@@ -825,12 +820,12 @@ public class ResearchStationAssemblyLine implements Runnable {
                             getModItem(GTPlusPlus.ID, "itemRodLongAstralTitanium", 64L),
 
                             GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUMVBase, 64L),
-                            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Universium, 64L),
+                            GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Universium, 64L),
                             getModItem(GTPlusPlus.ID, "itemRodLongAbyssalAlloy", 64L),
-                            GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 64L), },
+                            GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 64L), },
                     new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L),
-                            Materials.SpaceTime.getMolten(4 * 36864L), Materials.Universium.getMolten(4 * 36864L),
-                            Materials.ExcitedDTEC.getFluid(4 * 36864L) },
+                            MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), MaterialsUEVplus.Universium.getMolten(4 * 36864L),
+                            MaterialsUEVplus.ExcitedDTEC.getFluid(4 * 36864L) },
                     getItemContainer("StargateFramePart").get(1L),
                     baseStargateTime,
                     (int) TierEU.RECIPE_UMV);
@@ -995,7 +990,7 @@ public class ResearchStationAssemblyLine implements Runnable {
                             ItemList.Circuit_Parts_DiodeXSMD.get(32L), ItemList.Circuit_Parts_CapacitorXSMD.get(32L),
                             ItemList.Circuit_Parts_ResistorXSMD.get(32L),
                             ItemList.Circuit_Parts_TransistorXSMD.get(32L),
-                            new Object[] { OrePrefixes.wireGt01.get(Materials.SpaceTime), 12L } },
+                            new Object[] { OrePrefixes.wireGt01.get(MaterialsUEVplus.SpaceTime), 12L } },
                     new FluidStack[] { new FluidStack(solderUEV, 1440) },
                     ItemList.Energy_Cluster.get(1),
                     50 * 20,
@@ -1042,10 +1037,10 @@ public class ResearchStationAssemblyLine implements Runnable {
                             ItemList.Circuit_Parts_DiodeXSMD.get(64L), ItemList.Circuit_Parts_CapacitorXSMD.get(64L),
                             ItemList.Circuit_Parts_ResistorXSMD.get(64L),
                             ItemList.Circuit_Parts_TransistorXSMD.get(64L),
-                            new Object[] { OrePrefixes.bolt.get(Materials.MagnetohydrodynamicallyConstrainedStarMatter),
+                            new Object[] { OrePrefixes.bolt.get(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter),
                                     4L } },
-                    new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.WhiteDwarfMatter.getMolten(576),
-                            Materials.BlackDwarfMatter.getMolten(576) },
+                    new FluidStack[] { new FluidStack(solderUEV, 2880), MaterialsUEVplus.WhiteDwarfMatter.getMolten(576),
+                            MaterialsUEVplus.BlackDwarfMatter.getMolten(576) },
                     ItemList.ZPM2.get(1),
                     50 * 20,
                     (int) TierEU.RECIPE_UEV);
@@ -1355,9 +1350,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                         64,
                         new Object[] { getModItem(DraconicEvolution.ID, "awakenedCore", 8, 0),
                                 GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L),
-                                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L),
+                                GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 1L),
                                 new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, },
-                        new FluidStack[] { Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), },
+                        new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), },
                         getModItem(ElectroMagicTools.ID, "EMTItems", 1, 19),
                         36000,
                         32_000_000);
@@ -1848,9 +1843,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                 research_eu_per_tick,
                 research_amperage,
                 new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 16L),
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 16L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 32L),
+                        GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 16L),
+                        GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.TranscendentMetal, 32L),
                         GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
                         GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
                         GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
@@ -1877,10 +1872,10 @@ public class ResearchStationAssemblyLine implements Runnable {
                 research_amperage,
                 new Object[] { ItemList.Electric_Motor_UIV.get(1L),
                         GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.DraconiumAwakened, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 4L),
-                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 16L),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 4L),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 16L),
                         new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L },
-                        GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TranscendentMetal, 4L),
+                        GT_OreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.TranscendentMetal, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L) },
                 new FluidStack[] { fluid_0, fluid_1, fluid_2 },
                 ItemList.Electric_Pump_UIV.get(1),
@@ -1898,9 +1893,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                 research_eu_per_tick,
                 research_amperage,
                 new Object[] { ItemList.Electric_Motor_UIV.get(2L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 64L),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 2L),
+                        GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.TranscendentMetal, 64L),
                         GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L),
                         new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L },
                         new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L } },
@@ -1919,9 +1914,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                 comp_per_second,
                 research_eu_per_tick,
                 research_amperage,
-                new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.gear, Materials.TranscendentMetal, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 6L),
+                new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.TranscendentMetal, 2L),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 6L),
                         ItemList.Electric_Motor_UIV.get(2L), ItemList.Electric_Piston_UIV.get(1L),
                         new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L },
                         new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L },
@@ -1943,12 +1938,12 @@ public class ResearchStationAssemblyLine implements Runnable {
                 research_eu_per_tick,
                 research_amperage,
                 new ItemStack[] { ItemList.Electric_Motor_UIV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TranscendentMetal, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.round, Materials.TranscendentMetal, 64L),
-                        GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.gear, Materials.TranscendentMetal, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 4L),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 6L),
+                        GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.TranscendentMetal, 64L),
+                        GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.TranscendentMetal, 2L),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 4L) },
                 new FluidStack[] { fluid_0, fluid_1, fluid_2 },
                 ItemList.Electric_Piston_UIV.get(1),
@@ -1965,9 +1960,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                 comp_per_second,
                 research_eu_per_tick,
                 research_amperage,
-                new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
+                new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L),
                         ItemList.Electric_Motor_UIV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 16L),
+                        GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 16L),
                         ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L },
                         getModItem(GTPlusPlus.ID, "itemFoilArceusAlloy2B", 64, 0),
                         getModItem(GTPlusPlus.ID, "itemFoilLafiumCompound", 64, 0),
@@ -1989,9 +1984,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                 comp_per_second,
                 research_eu_per_tick,
                 research_amperage,
-                new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
+                new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L),
                         ItemList.Electric_Motor_UIV.get(1),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 8L),
                         ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L },
                         getModItem(GTPlusPlus.ID, "itemFoilArceusAlloy2B", 64, 0),
                         getModItem(GTPlusPlus.ID, "itemFoilLafiumCompound", 64, 0),
@@ -2013,8 +2008,8 @@ public class ResearchStationAssemblyLine implements Runnable {
                 comp_per_second,
                 research_eu_per_tick,
                 research_amperage,
-                new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L),
+                new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 6L),
                         ItemList.Gravistar.get(16L), ItemList.Emitter_UIV.get(4L),
                         new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4 },
                         GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L),
@@ -2071,9 +2066,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                 research_eu_per_tick,
                 research_amperage,
                 new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 32L),
-                        GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 16L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 32L),
+                        GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 16L),
+                        GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.SpaceTime, 32L),
                         getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0),
                         getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0),
                         getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0),
@@ -2100,10 +2095,10 @@ public class ResearchStationAssemblyLine implements Runnable {
                 research_amperage,
                 new Object[] { ItemList.Electric_Motor_UMV.get(1L),
                         GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Infinity, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 4L),
-                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 16L),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 4L),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 16L),
                         new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L },
-                        GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.SpaceTime, 4L),
+                        GT_OreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.SpaceTime, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L) },
                 new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 },
                 ItemList.Electric_Pump_UMV.get(1),
@@ -2121,9 +2116,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                 research_eu_per_tick,
                 research_amperage,
                 new Object[] { ItemList.Electric_Motor_UMV.get(2L),
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 64L),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2L),
+                        GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.SpaceTime, 64L),
                         GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L),
                         new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L },
                         new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L } },
@@ -2142,9 +2137,9 @@ public class ResearchStationAssemblyLine implements Runnable {
                 comp_per_second,
                 research_eu_per_tick,
                 research_amperage,
-                new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.gear, Materials.SpaceTime, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 6L),
+                new Object[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 8L),
+                        GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.SpaceTime, 2L),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 6L),