aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-05-28 16:58:39 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-05-28 16:58:39 +1000
commitc0669bb2a46b898141643be6b8f621c964c32c8b (patch)
tree0163a8ea62a85eb006eea43bd5d4d248202685b5 /src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid
parent3915e405a70be4d9523ace59a9194a3757cb5a37 (diff)
downloadGT5-Unofficial-c0669bb2a46b898141643be6b8f621c964c32c8b.tar.gz
GT5-Unofficial-c0669bb2a46b898141643be6b8f621c964c32c8b.tar.bz2
GT5-Unofficial-c0669bb2a46b898141643be6b8f621c964c32c8b.zip
+ 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.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java4
1 files changed, 2 insertions, 2 deletions
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;