diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-25 04:43:40 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-25 04:43:40 +0000 |
| commit | f25534d89a96449f6d7a1adda952c35d234672f5 (patch) | |
| tree | ad0dff32f74ce7e0f54233291963abc6db8c68c3 /src/Java/gtPlusPlus/preloader/asm | |
| parent | b41d734f18e0ec5a6d38fda93be8143fdcaf4c24 (diff) | |
| parent | c7c62d38eec9034c09a09dbdec02dcb492ec55e7 (diff) | |
| download | GT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.tar.gz GT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.tar.bz2 GT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.zip | |
Merge branch 'master' into imgbot
# Conflicts:
# src/resources/assets/miscutils/textures/items/itemBufferCore.png
Diffstat (limited to 'src/Java/gtPlusPlus/preloader/asm')
| -rw-r--r-- | src/Java/gtPlusPlus/preloader/asm/AsmConfig.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java index d68ba3c2a6..aa1e382278 100644 --- a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java +++ b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java @@ -76,7 +76,11 @@ public class AsmConfig { prop = config.get("general", "enableGcFuelChanges", true); prop.comment = "Enable/Disable changes to Galacticraft Rocket Fuels."; prop.setLanguageKey("gtpp.enableGcFuelChanges").setRequiresMcRestart(true); - enableGcFuelChanges = prop.getBoolean(true); + + //Disabled because Broken + //enableGcFuelChanges = prop.getBoolean(true); + enableGcFuelChanges = false; + propOrder.add(prop.getName()); |