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, 15 insertions, 8 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java
index e083fbcbe..733b3a5a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.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.Accordion;
@@ -16,16 +17,17 @@ public class BingoConfig {
 
     public static class BingoCard {
         @Expose
-        @ConfigOption(name = "Enable", desc = "Displays the bingo card.")
+        @ConfigOption(name = "Enable", desc = "Displays the Bingo Card.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
         @Expose
-        @ConfigOption(name = "Quick Toggle", desc = "Quickly toggle the bingo card or the step helper by sneaking with SkyBlock menu in hand.")
+        @ConfigOption(name = "Quick Toggle", desc = "Quickly toggle the Bingo Card or the step helper by sneaking with SkyBlock Menu in hand.")
         @ConfigEditorBoolean
         public boolean quickToggle = true;
 
         @Expose
-        @ConfigOption(name = "Bingo Steps", desc = "Show help with the next step in bingo instead of the bingo card. " +
+        @ConfigOption(name = "Bingo Steps", desc = "Show help with the next step in Bingo instead of the Bingo Card. " +
                 "§cThis feature is in early development. Expect bugs and missing goals.")
         @ConfigEditorBoolean
         public boolean stepHelper = false;
@@ -38,10 +40,12 @@ public class BingoConfig {
         @Expose
         @ConfigOption(
                 name = "Show Guide",
-                desc = "Show tips and difficulty for bingo goals inside the bingo card inventory.\n" +
-                        "§eData from Bingo Splash Community§7, made by §cMayxo"
+                desc = "Show tips and difficulty for bingo goals inside the Bingo Card inventory.\n" +
+                        "These tips are made from inspirations and guides from the community,\n"+
+                        "aiming to help you to complete the bingo card."
         )
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean bingoSplashGuide = true;
 
         @Expose
@@ -57,24 +61,27 @@ public class BingoConfig {
 
         @Expose
         @ConfigOption(name = "Enable", desc = "Shortens chat messages about skill level ups, collection gains, " +
-                "new area discoveries and skyblock level up messages while on bingo.")
+                "new area discoveries and SkyBlock level up messages while on Bingo.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
 
         @Expose
         @ConfigOption(name = "Hide Border", desc = "Hide the border messages before and after the compact level up messages.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean hideBorder = true;
 
         @Expose
-        @ConfigOption(name = "Outside Bingo", desc = "Compact the level up chat messages outside of an bingo profile as well.")
+        @ConfigOption(name = "Outside Bingo", desc = "Compact the level up chat messages outside of an Bingo profile as well.")
         @ConfigEditorBoolean
         public boolean outsideBingo = false;
     }
 
     @Expose
-    @ConfigOption(name = "Minion Craft Helper", desc = "Show how many more items you need to upgrade the minion in your inventory. Especially useful for bingo.")
+    @ConfigOption(name = "Minion Craft Helper", desc = "Show how many more items you need to upgrade the minion in your inventory. Especially useful for Bingo.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean minionCraftHelperEnabled = true;
 
     @Expose