aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-07-26 21:11:53 +0200
committerGitHub <noreply@github.com>2021-07-26 21:11:53 +0200
commitdef1bbd2822e09802cf02ed21c1cf1cfdd1abc6a (patch)
tree12118f955532056e8cc9cc07cab42c406974fef9 /src
parent17402e6c3de5657f625bbb3430bd88ac687319f0 (diff)
parent88474a18b40c51444ec5889e6d11f80549c1eef9 (diff)
downloadGT5-Unofficial-def1bbd2822e09802cf02ed21c1cf1cfdd1abc6a.tar.gz
GT5-Unofficial-def1bbd2822e09802cf02ed21c1cf1cfdd1abc6a.tar.bz2
GT5-Unofficial-def1bbd2822e09802cf02ed21c1cf1cfdd1abc6a.zip
Merge pull request #7 from Sphyix/master
Moved hazmat protection to gt5u, updated gradle
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/technus/tectech/loader/MainLoader.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index d473da6b07..8a03bd67b8 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -121,7 +121,7 @@ public final class MainLoader {
}
public static void postLoad() {
- ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 6);
+ ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 5);
progressBarPostLoad.step("Dreamcraft Compatibility");
if(Loader.isModLoaded(Reference.DREAMCRAFT)){
@@ -149,9 +149,10 @@ public final class MainLoader {
new RecipeLoader().run();
TecTech.LOGGER.info("Recipe Init Done");
- progressBarPostLoad.step("Register Extra Hazmat Suits");
- registerExtraHazmats();
- TecTech.LOGGER.info("Hazmat additions done");
+ //Hazmat moved to GT5U
+ //progressBarPostLoad.step("Register Extra Hazmat Suits");
+ //registerExtraHazmats();
+ //TecTech.LOGGER.info("Hazmat additions done");
if (!configTecTech.DISABLE_BLOCK_HARDNESS_NERF) {
progressBarPostLoad.step("Nerf blocks blast resistance");
@@ -169,7 +170,7 @@ public final class MainLoader {
ProgressManager.pop(progressBarPostLoad);
}
- private static void registerExtraHazmats() {
+ private static void registerExtraHazmats() { //Hazmat moved to GT5U
ItemStack EMT_iqC=GT_ModHandler.getModItem("EMT","itemArmorQuantumChestplate",1,W);
ItemStack GRAVI_gC=GT_ModHandler.getModItem("GraviSuite","graviChestPlate",1,W);
ItemStack GRAVI_anC=GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, W);