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, 6 insertions, 1 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java
index 20e8aaa45..c7ebef451 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.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.ConfigAccordionId;
@@ -10,9 +11,10 @@ import io.github.moulberry.moulconfig.annotations.ConfigOption;
 public class SummoningsConfig {
 
     @Expose
-    @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped summoning souls laying on the ground. " +
+    @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped Summoning Souls laying on the ground. " +
             "§cNot working in dungeons if Skytils' 'Hide Non-Starred Mobs Nametags' feature is enabled!")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean summoningSoulDisplay = false;
 
     @Expose
@@ -24,6 +26,7 @@ public class SummoningsConfig {
     @ConfigOption(name = "Summoning Mob Display", desc = "Show the health of your spawned summons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean summoningMobDisplay = false;
 
     @Expose
@@ -33,11 +36,13 @@ public class SummoningsConfig {
     @ConfigOption(name = "Summoning Mob Nametag", desc = "Hide the nametag of your spawned summons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean summoningMobHideNametag = false;
 
     @Expose
     @ConfigOption(name = "Summoning Mob Color", desc = "Marks own summons green.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean summoningMobColored = false;
 }