Merge remote-tracking branch 'origin/experimental' into unify-build-script

# Conflicts:
#	.gitignore
#	build.gradle
#	build.properties

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconCheckButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconCheckButton.java
index 010ac78654..e7b6b9971d 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconCheckButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconCheckButton.java
@@ -3,13 +3,22 @@ package gregtech.api.gui.widgets;
 import gregtech.api.interfaces.IGuiScreen;
 
 public class GT_GuiIconCheckButton extends GT_GuiIconButton {
-    private GT_GuiIcon checkedIcon, normalIcon;
+    private final GT_GuiIcon checkedIcon;
+    private final GT_GuiIcon normalIcon;
+    private final String checkedTooltip;
+    private final String normalTooltip;
     private boolean checked = false;
 
     public GT_GuiIconCheckButton(IGuiScreen gui, int id, int x, int y, GT_GuiIcon checkedIcon, GT_GuiIcon normalIcon) {
+        this(gui, id, x, y, checkedIcon, normalIcon, null, null);
+    }
+
+    public GT_GuiIconCheckButton(IGuiScreen gui, int id, int x, int y, GT_GuiIcon checkedIcon, GT_GuiIcon normalIcon, String checkedTooltip, String normalTooltip) {
         super(gui, id, x, y, normalIcon);
         this.checkedIcon = checkedIcon;
         this.normalIcon = normalIcon;
+        this.checkedTooltip = checkedTooltip;
+        this.normalTooltip = normalTooltip;
     }
 
     @Override
@@ -27,6 +36,7 @@ public class GT_GuiIconCheckButton extends GT_GuiIconButton {
 
     public void setChecked(boolean checked) {
         super.setIcon(checked ? checkedIcon : normalIcon);
+        super.setTooltipText(checked ? checkedTooltip : normalTooltip);
         this.checked = checked;
     }
 }