diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-11 13:33:43 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-11 13:33:43 +1000 |
| commit | a57202442fec5f72268e622b53fb7dc626f7bdc9 (patch) | |
| tree | 773c288afdf0794a5a9c968a7544b24a8f43c94a /src/Java | |
| parent | 78866b8e89f4060f5a03e8a66888b8899d3c2c83 (diff) | |
| download | GT5-Unofficial-a57202442fec5f72268e622b53fb7dc626f7bdc9.tar.gz GT5-Unofficial-a57202442fec5f72268e622b53fb7dc626f7bdc9.tar.bz2 GT5-Unofficial-a57202442fec5f72268e622b53fb7dc626f7bdc9.zip | |
+ Preemptively added a config option ahead of merging #160.
> This will allow me to ignore PR changes to CORE.java and GTplusplus.java.
Diffstat (limited to 'src/Java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/config/ConfigHandler.java | 1 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java index 96bd801ad4..b2f3caec7d 100644 --- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java @@ -42,6 +42,7 @@ public class ConfigHandler { "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks."); enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead."); + boilerSteamPerSecond = config.getInt("boilerSteamPerSecond", "machines", 750, 0, 10000, "Sets the steam per second value in LV,MV,HV boilers (respectively 1x,2x,3x this number for the tiers)"); //Circuits enableCustomCircuits = config.getBoolean("enableCustomCircuits", "gregtech", true, diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java index 830f986d0b..b3897e48c1 100644 --- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java @@ -46,7 +46,7 @@ public class LoginEventHandler { //Submit Analytics try { - CORE.mAnalytics.SubmitNewUserSession(); + CORE.mAnalytics.submitInitData(); } catch (Throwable t){ Utils.LOG_INFO("Failed to submit analytics data."); diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 0fbcd95774..8fa77c80d8 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -166,6 +166,7 @@ public class CORE { public static boolean enableThaumcraftShardUnification = false;
public static boolean disableIC2Recipes = false;
public static boolean enableAlternativeDivisionSigilRecipe = false;
+ public static int boilerSteamPerSecond = 750;
//Feature Related
public static boolean enableCustomCapes = false;
|