mirror of
https://github.com/GTNewHorizons/ThaumicTinkerer.git
synced 2026-10-26 14:33:48 +00:00
Merge branch 'master' into algent/focus-SU
This commit is contained in:
2 files changed
+2
-2
No files matched your search
@@ -111,7 +111,7 @@ public class TileAnimationTablet extends TileEntity implements IInventory, IMova
|
||||
if (worldObj.isRemote) {
|
||||
prevSwingProgress = swingProgress;
|
||||
prevTicksElapsed = ticksElapsed;
|
||||
int iterations = LoadedMods.gtLoaded ? MTEWorldAccelerator.getAccelerationForTEUnsafe(this) + 1 : 1;
|
||||
int iterations = LoadedMods.gt5uNHLoaded ? MTEWorldAccelerator.getAccelerationForTEUnsafe(this) + 1 : 1;
|
||||
ticksElapsed += iterations;
|
||||
ItemStack stack = heldItem;
|
||||
if (stack != null) {
|
||||
|
||||
@@ -16,7 +16,7 @@ public class LoadedMods {
|
||||
public static final boolean enderIOLoaded = Loader.isModLoaded("EnderIO");
|
||||
public static final boolean enderStorageLoaded = Loader.isModLoaded("EnderStorage");
|
||||
public static final boolean forgeMultipartLoaded = Loader.isModLoaded("ForgeMultipart");
|
||||
public static final boolean gtLoaded = Loader.isModLoaded("gregtech");
|
||||
public static final boolean gt5uNHLoaded = Loader.isModLoaded("gregtech_nh");
|
||||
public static final boolean ic2Loaded = Loader.isModLoaded("IC2");
|
||||
public static final boolean openComputersLoaded = Loader.isModLoaded("OpenComputers");
|
||||
public static final boolean thaumicBootsLoaded = Loader.isModLoaded("thaumicboots");
|
||||
|
||||
Reference in new issue
Block a user