diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-24 11:54:30 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-24 11:54:30 +1000 |
| commit | ecf908e98ccee72a713091e8ab547e35a41d7436 (patch) | |
| tree | f0dade1481aa02fd0ac4fcf8a672cc7a761a0547 /src/Java/gtPlusPlus/core/lib/CORE.java | |
| parent | b9fe3352840abe0846834cefd578895ec6f5e520 (diff) | |
| parent | fa5de3584ce7bc97ce6f32b31f6062b5b6e89e75 (diff) | |
| download | GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.gz GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.bz2 GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.zip | |
> Why does Git make me do these? arghhh...
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
# Conflicts:
# src/Java/gtPlusPlus/core/material/ALLOY.java
# src/Java/gtPlusPlus/core/material/ELEMENT.java
# src/Java/gtPlusPlus/core/material/Material.java
# src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
Diffstat (limited to 'src/Java/gtPlusPlus/core/lib/CORE.java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 78b7cf4326..5de70b467a 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -1,17 +1,10 @@ package gtPlusPlus.core.lib; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.UUID; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.array.Pair; @@ -46,8 +39,6 @@ public class CORE { public static boolean DEVENV = false; public static boolean DEBUG = false; - @SideOnly(Side.CLIENT) - public static boolean mFancyGraphics = false; //Only can be set in Dev, no config or setting elsewhere. public static final boolean LOAD_ALL_CONTENT = false;; @@ -55,13 +46,14 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.6.101-prerelease"; + public static final String VERSION = "1.6.110-prerelease"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); //Tweakables public static int DARKBIOME_ID = 238; + public static int DARKWORLD_ID = 227; //GT Vars; public static final int GREG_FIRST_ID = 760; |