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, 9 insertions, 0 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
index 894d834f2..9cffc4ed8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
@@ -1,5 +1,6 @@
 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.ConfigEditorBoolean;
@@ -11,6 +12,7 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Freeze", desc = "Show the cooldown for how long Ashfang blocks your abilities.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean brrrrItsSoColdCooldownCooldown = false;
 
     @Expose
@@ -19,6 +21,7 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Reset Time", desc = "Show the cooldown until Ashfang pulls his underlings back.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean nextResetCooldown = false;
 
     @Expose
@@ -27,6 +30,7 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Gravity Orbs", desc = "Shows the Gravity Orbs more clearly.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean gravityOrbs = false;
 
     @Expose
@@ -37,6 +41,7 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Blazing Souls", desc = "Shows the Blazing Souls more clearly.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean blazingSouls = false;
 
     @Expose
@@ -47,20 +52,24 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Highlight Blazes", desc = "Highlight the different blazes in their respective colors.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean highlightBlazes = false;
 
     @Expose
     @ConfigOption(name = "Hide Particles", desc = "Hide particles around the Ashfang boss.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideParticles = false;
 
     @Expose
     @ConfigOption(name = "Hide Names", desc = "Hide the names of full health blazes around Ashfang (only useful when highlight blazes is enabled)")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideNames = false;
 
     @Expose
     @ConfigOption(name = "Hide Damage", desc = "Hide damage splashes around Ashfang.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideDamageSplash = false;
 }