From c0669bb2a46b898141643be6b8f621c964c32c8b Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 28 May 2018 16:58:39 +1000 Subject: + Added support for IC2C. (Support means that the game will load if this mod exists.. maybe? Should fix #287, I guess.) + Added tooltips to turbines if the animated textures are on, if user holds shift full tooltip will be shown. - Removed some Thaumcraft logging. % More changes to fix NEI handler for Multiblocks. % Moved Tooltip handling for a few things from the EIO handler to a generic handler. $ Fixed %'s not showing (third time lucky) on NEI pages. --- .../xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 41651ad479..b4aa2080f9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -88,7 +88,7 @@ public class GregtechFluidHandler { private static ItemStack generateIC2FluidCell(final String fluidNameWithCaps){ Logger.INFO("Adding a Cell for "+fluidNameWithCaps); - if (LoadedMods.IndustrialCraft2){ + if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic){ return Utils.createInternalNameAndFluidCell(fluidNameWithCaps); } return null; @@ -96,7 +96,7 @@ public class GregtechFluidHandler { private static ItemStack generateIC2FluidCellNoOreDict(final String fluidNameWithCaps){ Logger.INFO("Adding a Cell for "+fluidNameWithCaps); - if (LoadedMods.IndustrialCraft2){ + if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic){ return Utils.createInternalNameAndFluidCellNoOreDict(fluidNameWithCaps); } return null; -- cgit