Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into St00f

# Conflicts:
#	.gitignore
#	dependencies.gradle
#	src/main/java/gtPlusPlus/core/config/ConfigHandler.java
#	src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
#	src/main/resources/assets/miscutils/lang/en_US.lang

1 files changed, 31 insertions, 0 deletions

diff --git a/src/main/java/Ic2ExpReactorPlanner/components/CoolantCell.java b/src/main/java/Ic2ExpReactorPlanner/components/CoolantCell.java
new file mode 100644
index 0000000000..f152b49985
--- /dev/null
+++ b/src/main/java/Ic2ExpReactorPlanner/components/CoolantCell.java
@@ -0,0 +1,31 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package Ic2ExpReactorPlanner.components;
+
+import gregtech.api.objects.GT_ItemStack;
+
+/**
+ * Represents a coolant cell in a reactor.
+ * @author Brian McCloud
+ */
+public class CoolantCell extends ReactorItem {
+    
+    public CoolantCell(final int id, final String baseName, GT_ItemStack aItem, final double maxDamage, final double maxHeat, final String sourceMod) {
+        super(id, baseName, aItem, maxDamage, maxHeat, sourceMod);
+    }
+    
+    public CoolantCell(final CoolantCell other) {
+        super(other);
+    }
+    
+    @Override
+    public double adjustCurrentHeat(final double heat) {
+        currentCellCooling += heat;
+        bestCellCooling = Math.max(currentCellCooling, bestCellCooling);
+        return super.adjustCurrentHeat(heat);
+    }
+    
+}