Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java
index 17abf034a..b5cb15fb5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java
@@ -1,23 +1,20 @@
 package at.hannibal2.skyhanni.config.features;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.ConfigAccordionId;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import io.github.moulberry.moulconfig.annotations.*;
 
 public class MinionsConfig {
 
     @Expose
     @ConfigOption(name = "Name Display", desc = "Show the minion name and tier over the minion.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean nameDisplay = true;
 
     @Expose
-    @ConfigOption(name = "Only Tier", desc = "Show only the tier number over the minion. (Useful for bingo)")
+    @ConfigOption(name = "Only Tier", desc = "Show only the tier number over the minion. (Useful for Bingo)")
     @ConfigEditorBoolean
     public boolean nameOnlyTier = false;
 
@@ -29,6 +26,7 @@ public class MinionsConfig {
     @ConfigOption(name = "Last Minion Display", desc = "Marks the location of the last clicked minion, even through walls.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean lastClickedMinionDisplay = false;
 
     @Expose
@@ -61,6 +59,7 @@ public class MinionsConfig {
     @ConfigOption(name = "Emptied Time Display", desc = "Show the time when the hopper in the minion was last emptied.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
+    @FeatureToggle
     public boolean emptiedTimeDisplay = false;
 
     @Expose
@@ -87,5 +86,6 @@ public class MinionsConfig {
     @Expose
     @ConfigOption(name = "Hide Mob Nametag", desc = "Hiding the nametag of mobs close to minions.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideMobsNametagNearby = false;
 }