Merge branch 'beta' into yaw_snappingyaw_snapping

18 files changed, 247 insertions, 95 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java b/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java
index 9708f5dd4..5c7c719ae 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java
@@ -10,7 +10,7 @@ import com.google.gson.annotations.Expose;
 public class Ashfang {
 
     @Expose
-    @ConfigOption(name = "Freeze", desc = "Show the cooldown how long Ashfang blocks all your abilities.")
+    @ConfigOption(name = "Freeze", desc = "Show the cooldown for how long Ashfang blocks your abilities.")
     @ConfigEditorBoolean
     public boolean freezeCooldown = false;
 
@@ -20,7 +20,7 @@ public class Ashfang {
     public Position freezeCooldownPos = new Position(10, 10, false, true);
 
     @Expose
-    @ConfigOption(name = "Reset Time", desc = "Show the cooldown until ashfang pulls his underlings back.")
+    @ConfigOption(name = "Reset Time", desc = "Show the cooldown until Ashfang pulls his underlings back.")
     @ConfigEditorBoolean
     public boolean nextResetCooldown = false;
 
@@ -30,7 +30,7 @@ public class Ashfang {
     public Position nextResetCooldownPos = new Position(10, 10, false, true);
 
     @Expose
-    @ConfigOption(name = "Gravity Orbs", desc = "Showing the Gravity Orbs more clearly.")
+    @ConfigOption(name = "Gravity Orbs", desc = "Shows the Gravity Orbs more clearly.")
     @ConfigEditorBoolean
     public boolean gravityOrbs = false;
 
@@ -40,7 +40,7 @@ public class Ashfang {
     public String gravityOrbsColor = "0:120:255:85:85";
 
     @Expose
-    @ConfigOption(name = "Blazing Souls", desc = "Showing the Blazing Souls more clearly.")
+    @ConfigOption(name = "Blazing Souls", desc = "Shows the Blazing Souls more clearly.")
     @ConfigEditorBoolean
     public boolean blazingSouls = false;
 
@@ -50,22 +50,22 @@ public class Ashfang {
     public String blazingSoulsColor = "0:245:85:255:85";
 
     @Expose
-    @ConfigOption(name = "Highlight Blazes", desc = "Highlight the different blazes in their respected color.")
+    @ConfigOption(name = "Highlight Blazes", desc = "Highlight the different blazes in their respective colors.")
     @ConfigEditorBoolean
     public boolean highlightBlazes = false;
 
     @Expose
-    @ConfigOption(name = "Hide Particles", desc = "Hide particles around the ashfang boss.")
+    @ConfigOption(name = "Hide Particles", desc = "Hide particles around the Ashfang boss.")
     @ConfigEditorBoolean
     public boolean hideParticles = false;
 
     @Expose
-    @ConfigOption(name = "Hide Names", desc = "Hide the name of full health blazes around ashfang (only useful when highlight blazes is enabled)")
+    @ConfigOption(name = "Hide Names", desc = "Hide the names of full health blazes around Ashfang (only useful when highlight blazes is enabled)")
     @ConfigEditorBoolean
     public boolean hideNames = false;
 
     @Expose
-    @ConfigOption(name = "Hide Damage", desc = "Hide damage splashes around ashfang.")
+    @ConfigOption(name = "Hide Damage", desc = "Hide damage splashes around Ashfang.")
     @ConfigEditorBoolean
     public boolean hideDamageSplash = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java
index 2e3ea2195..a324d2a86 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java
@@ -29,7 +29,7 @@ public class Bazaar {
     public boolean cancelledBuyOrderClipboard = true;
 
     @Expose
-    @ConfigOption(name = "Update Timer", desc = "A countdown timer for upcoming Bazzar data update.")
+    @ConfigOption(name = "Update Timer", desc = "A countdown timer for the next Bazaar data update.")
     @ConfigEditorBoolean
     public boolean updateTimer = false;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java
index 4b4610d75..4eb0547d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java
@@ -8,7 +8,7 @@ public class Bingo {
 
     @Expose
     @ConfigOption(name = "Compact Chat Messages", desc = "Shortens chat messages about skill level ups, collection gains, " +
-            "new area discoveries, and bestiarity upgrades while on bingo.")
+            "new area discoveries, and bestiary upgrades while on bingo.")
     @ConfigEditorBoolean
     public boolean compactChatMessages = true;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
index 35c764116..b9f83a887 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
@@ -7,7 +7,7 @@ import org.lwjgl.input.Keyboard;
 public class Chat {
 
     @Expose
-    @ConfigOption(name = "Peek Chat", desc = "Hold this key to keep the chat open")
+    @ConfigOption(name = "Peek Chat", desc = "Hold this key to keep the chat open.")
     @ConfigEditorKeybind(defaultKey = Keyboard.KEY_Z)
     public int peekChat = Keyboard.KEY_Z;
 
@@ -29,7 +29,7 @@ public class Chat {
     public boolean empty = true;
 
     @Expose
-    @ConfigOption(name = "Warping", desc = "Block 'sending request to join ..' and 'warping ..' messages.")
+    @ConfigOption(name = "Warping", desc = "Block 'sending request to join...' and 'warping...' messages.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean warping = true;
@@ -41,7 +41,7 @@ public class Chat {
     public boolean welcome = true;
 
     @Expose
-    @ConfigOption(name = "Guild Exp", desc = "Hide Guild Exp messages.")
+    @ConfigOption(name = "Guild Exp", desc = "Hide guild exp messages.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean guildExp = true;
@@ -59,11 +59,24 @@ public class Chat {
     public boolean winterGift = true;
 
     @Expose
-    @ConfigOption(name = "Powder Mining", desc = "Hide messages while opening chests in crystal hollows.")
+    @ConfigOption(name = "Powder Mining", desc = "Hide messages while opening chests in crystal hollows. " +
+            "(Except power numbers over 1k, Prehistoric Egg and Robotron Parts)")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean powderMining = true;
 
+    @Expose
+    @ConfigOption(name = "Kill Combo", desc = "Hide messages about the current kill combo from the Grandma Wolf Pet.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean killCombo = false;
+
+    @Expose
+    @ConfigOption(name = "Watchdog", desc = "Hide the message where hypixel is flexing how many players they have banned over the last week.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean watchDog = true;
+
     //TODO remove
     @Expose
     @ConfigOption(name = "Others", desc = "Hide other annoying messages.")
@@ -89,7 +102,7 @@ public class Chat {
     public boolean chatFilter = false;
 
     @Expose
-    @ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages in the dungeon.")
+    @ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages in dungeons.")
     @ConfigEditorBoolean
     public boolean dungeonMessages = true;
 
@@ -99,8 +112,8 @@ public class Chat {
     public boolean dungeonBossMessages = false;
 
     @Expose
-    @ConfigOption(name = "Hide Far Deaths", desc = "Hide the death messages of other players, " +
-            "except for players who are close to the player, inside dungeon or during a Kuudra fight.")
+    @ConfigOption(name = "Hide Far Deaths", desc = "Hide other players' death messages, " +
+            "except for players who are nearby or during dungeons/a Kuudra fight.")
     @ConfigEditorBoolean
     public boolean hideFarDeathMessages = false;
     //TODO jawbus + x
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java
index ed1ea7f56..385f471d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java
@@ -7,7 +7,7 @@ import com.google.gson.annotations.Expose;
 public class CommandsFeatures {
 
     @Expose
-    @ConfigOption(name = "Fandom Wiki", desc = "Using §ehypixel-skyblock.fandom.com §7instead of Hypixel wiki")
+    @ConfigOption(name = "Fandom Wiki", desc = "Use Fandom wiki (§ehypixel-skyblock.fandom.com§7) instead of the Hypixel wiki (§ewiki.hypixel.net§7).")
     @ConfigEditorBoolean
     public boolean useFandomWiki = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
index c392edeba..a491090d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
@@ -13,12 +13,12 @@ import java.util.List;
 public class DamageIndicator {
 
     @Expose
-    @ConfigOption(name = "Damage Indicator Enabled", desc = "Show the missing health of a boss.")
+    @ConfigOption(name = "Damage Indicator Enabled", desc = "Show the boss' remaining health.")
     @ConfigEditorBoolean
     public boolean enabled = false;
 
     @Expose
-    @ConfigOption(name = "Healing Chat Message", desc = "Sends a chat message when a boss heals himself.")
+    @ConfigOption(name = "Healing Chat Message", desc = "Sends a chat message when a boss heals themself.")
     @ConfigEditorBoolean
     public boolean healingMessage = false;
 
@@ -83,7 +83,7 @@ public class DamageIndicator {
     public boolean hideVanillaNametag = false;
 
     @Expose
-    @ConfigOption(name = "Time to Kill", desc = "Show the time it takes to kill the Slayer boss.")
+    @ConfigOption(name = "Time to Kill", desc = "Show the time it takes to kill the slayer boss.")
     @ConfigEditorBoolean
     public boolean timeToKillSlayer = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Diana.java b/src/main/java/at/hannibal2/skyhanni/config/features/Diana.java
index 984cc4165..072ac2fba 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Diana.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Diana.java
@@ -9,7 +9,7 @@ import org.lwjgl.input.Keyboard;
 public class Diana {
 
     @Expose
-    @ConfigOption(name = "Soopy Guess", desc = "Uses §eSoopy's Guess Logic §7to find the next burrow. Does not require SoopyV2 or chat triggers to be installed.")
+    @ConfigOption(name = "Soopy Guess", desc = "Uses §eSoopy's Guess Logic §7to find the next burrow. Does not require SoopyV2 or ChatTriggers to be installed.")
     @ConfigEditorBoolean
     public boolean burrowsSoopyGuess = false;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
index 074d4e0f7..7a2ed35ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
@@ -7,7 +7,7 @@ import com.google.gson.annotations.Expose;
 public class Dungeon {
 
     @Expose
-    @ConfigOption(name = "Clicked Blocks", desc = "Highlight the following blocks when clicked in dungeon: Lever, Chest, Wither Essence.")
+    @ConfigOption(name = "Clicked Blocks", desc = "Highlight levers, chests, and wither essence when clicked in dungeons.")
     @ConfigEditorBoolean
     public boolean highlightClickedBlocks = false;
 
@@ -16,7 +16,7 @@ public class Dungeon {
     public boolean showMilestone = false;
 
     @Expose
-    @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in dungeon.")
+    @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean showMilestonesDisplay = false;
@@ -32,7 +32,7 @@ public class Dungeon {
     public boolean deathCounter = false;
 
     @Expose
-    @ConfigOption(name = "Death Counter Display", desc = "Display the total amount of deaths in the current dungeon.")
+    @ConfigOption(name = "Death Counter Display", desc = "Display the total amount of deaths in the current dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
     public boolean deathCounterDisplay = false;
@@ -62,7 +62,7 @@ public class Dungeon {
     public boolean cleanEndF3IgnoreGuardians = false;
 
     @Expose
-    @ConfigOption(name = "Boss Damage Splash", desc = "Hiding damage splashes while inside the boss room. (fixing Skytils feature)")
+    @ConfigOption(name = "Boss Damage Splash", desc = "Hides damage splashes while inside the boss room (fixes a Skytils feature).")
     @ConfigEditorBoolean
     public boolean damageSplashBoss = false;
 
@@ -71,42 +71,42 @@ public class Dungeon {
     @ConfigEditorBoolean
     public boolean highlightDeathmites = true;
 
-    @ConfigOption(name = "Object Hider", desc = "Hide various things in dungeon.")
+    @ConfigOption(name = "Object Hider", desc = "Hide various things in dungeons.")
     @ConfigEditorAccordion(id = 3)
     public boolean objectHider = false;
 
     @Expose
-    @ConfigOption(name = "Hide Superboom TNT", desc = "Hide Superboom TNT laying around in dungeon.")
+    @ConfigOption(name = "Hide Superboom TNT", desc = "Hide Superboom TNT laying around in dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 3)
     public boolean hideSuperboomTNT = false;
 
     @Expose
-    @ConfigOption(name = "Hide Blessings", desc = "Hide Blessings laying around in dungeon.")
+    @ConfigOption(name = "Hide Blessings", desc = "Hide Blessings laying around in dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 3)
     public boolean hideBlessing = false;
 
     @Expose
-    @ConfigOption(name = "Hide Revive Stones", desc = "Hide Revive Stones laying around in dungeon.")
+    @ConfigOption(name = "Hide Revive Stones", desc = "Hide Revive Stones laying around in dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 3)
     public boolean hideReviveStone = false;
 
     @Expose
-    @ConfigOption(name = "Hide Premium Flesh", desc = "Hide Premium Flesh laying around in dungeon.")
+    @ConfigOption(name = "Hide Premium Flesh", desc = "Hide Premium Flesh laying around in dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 3)
     public boolean hidePremiumFlesh = false;
 
     @Expose
-    @ConfigOption(name = "Hide Journal Entry", desc = "Hide Journal Entry pages laying around in dungeon.")
+    @ConfigOption(name = "Hide Journal Entry", desc = "Hide Journal Entry pages laying around in dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 3)
     public boolean hideJournalEntry = false;
 
     @Expose
-    @ConfigOption(name = "Hide Skeleton Skull", desc = "Hide skeleton skulls laying around in dungeon.")
+    @ConfigOption(name = "Hide Skeleton Skull", desc = "Hide Skeleton Skulls laying around in dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 3)
     public boolean hideSkeletonSkull = true;
@@ -138,7 +138,7 @@ public class Dungeon {
     public boolean dungeonCopilot = false;
 
     @Expose
-    @ConfigOption(name = "Copilot Enabled", desc = "Suggests what to do next in dungeon.")
+    @ConfigOption(name = "Copilot Enabled", desc = "Suggests what to do next in dungeons.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 5)
     public boolean copilotEnabled = false;
@@ -154,20 +154,20 @@ public class Dungeon {
     public boolean partyFinder = false;
 
     @Expose
-    @ConfigOption(name = "Colored Class Level", desc = "Show the class levels in party finder in colors.")
+    @ConfigOption(name = "Colored Class Level", desc = "Color class levels in party finder.")
     @ConfigAccordionId(id = 6)
     @ConfigEditorBoolean
     public boolean partyFinderColoredClassLevel = true;
 
     @Expose
-    @ConfigOption(name = "Moving Skeleton Skulls", desc = "Highlight Skeleton Skulls when combining into a " +
-            "Skeletor in orange color (not useful combined with feature Hide Skeleton Skull)")
+    @ConfigOption(name = "Moving Skeleton Skulls", desc = "Highlight Skeleton Skulls when combining into an " +
+            "orange Skeletor (not useful when combined with feature Hide Skeleton Skull).")
     @ConfigEditorBoolean
     public boolean highlightSkeletonSkull = true;
 
     @Expose
     @ConfigOption(name = "Croesus Unopened Chest Tracker", desc = "Adds a visual highlight to the Croesus inventory that " +
-            "shows what chests have not yet been opened.")
+            "shows unopened chests.")
     @ConfigEditorBoolean
     public boolean croesusUnopenedChestTracker = true;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
index 9bb106829..d745db119 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
@@ -13,7 +13,7 @@ public class Fishing {
     @Expose
     @ConfigOption(
             name = "Trophy Counter",
-            desc = "Counts every single Trohy message from chat and tells you how many you got already."
+            desc = "Counts Trophy messages from chat and tells you how many you have found."
     )
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
@@ -102,7 +102,7 @@ public class Fishing {
     public Position sharkFishCounterPos = new Position(10, 10, false, true);
 
     @Expose
-    @ConfigOption(name = "Shorten Fishing Message", desc = "Shorten the chat message what type of sea creature you have fished.")
+    @ConfigOption(name = "Shorten Fishing Message", desc = "Shortens the chat message that says what type of sea creature you have fished.")
     @ConfigEditorBoolean
     public boolean shortenFishingMessage = false;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java
index 58e014ce9..423705358 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java
@@ -43,7 +43,7 @@ public class Garden {
 
     @Expose
     @ConfigOption(name = "Visitor Timer", desc = "Timer when the next visitor will appear, " +
-            "and a number how many visitors are already waiting.")
+            "and a number for how many visitors are already waiting.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 2)
     public boolean visitorTimerEnabled = true;
@@ -85,10 +85,10 @@ public class Garden {
     public boolean visitorInventory = false;
 
     @Expose
-    @ConfigOption(name = "Visitor Price", desc = "Show the bazaar price of the items required for the visitors.")
+    @ConfigOption(name = "Visitor Price", desc = "Show the bazaar price of the items required for the visitors, like in NEU.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 4)
-    public boolean visitorShowPrice = true;
+    public boolean visitorShowPrice = false;
 
     @Expose
     @ConfigOption(name = "Amount and Time", desc = "Show the exact item amount and the remaining time when farmed manually. Especially useful for ironman.")
@@ -115,7 +115,7 @@ public class Garden {
     public boolean visitorNotificationTitle = true;
 
     @Expose
-    @ConfigOption(name = "Highlight", desc = "Highlight visitor when the required items are in the inventory or the visitor is new and needs to checked what items it needs.")
+    @ConfigOption(name = "Highlight", desc = "Highlight visitor when the required items are in the inventory or the visitor is new and required items need to be checked.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
     public boolean visitorHighlight = true;
@@ -153,6 +153,16 @@ public class Garden {
     public boolean cropMilestoneProgress = true;
 
     @Expose
+    @ConfigOption(
+            name = "Warn When Close",
+            desc = "Warn with title and sound when the next crop milestone upgrade happens in 5 seconds. " +
+                    "Useful for switching to a different pet for leveling.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 6)
+    public boolean cropMilestoneWarnClose = true;
+
+
+    @Expose
     @ConfigOption(name = "Display Position", desc = "")
     @ConfigEditorButton(runnableId = "cropMilestoneProgress", buttonText = "Edit")
     @ConfigAccordionId(id = 6)
@@ -163,7 +173,7 @@ public class Garden {
     @ConfigAccordionId(id = 6)
     @ConfigEditorAccordion(id = 7)
     public boolean cropMilestoneNext = false;
-    // TODO moulconfig runnable suppoort
+    // TODO moulconfig runnable support
 
     @Expose
     @ConfigOption(
@@ -173,14 +183,14 @@ public class Garden {
     @ConfigAccordionId(id = 7)
     public boolean cropMilestoneBestDisplay = true;
 
-    // TODO moulconfig runnable suppoort
+    // TODO moulconfig runnable support
     @Expose
     @ConfigOption(name = "Sort Type", desc = "Sort the crops by either garden exp or by skyblock exp.")
     @ConfigEditorDropdown(values = {"Garden Exp", "SkyBlock Exp"})
     @ConfigAccordionId(id = 7)
     public int cropMilestoneBestType = 0;
 
-    // TODO moulconfig runnable suppoort
+    // TODO moulconfig runnable support
     @Expose
     @ConfigOption(name = "Only show top", desc = "Only show the top # crops.")
     @ConfigEditorSlider(
@@ -191,7 +201,7 @@ public class Garden {
     @ConfigAccordionId(id = 7)
     public int cropMilestoneShowOnlyBest = 10;
 
-    // TODO moulconfig runnable suppoort
+    // TODO moulconfig runnable support
     @Expose
     @ConfigOption(
             name = "Always On",
@@ -206,19 +216,19 @@ public class Garden {
     @ConfigAccordionId(id = 7)
     public Position cropMilestoneNextDisplayPos = new Position(-112, -143, false, true);
 
-    // TODO moulconfig runnable suppoort
+    // TODO moulconfig runnable support
     @Expose
     @ConfigOption(name = "Custom Keybind", desc = "")
     @ConfigEditorAccordion(id = 8)
     public boolean keybind = false;
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Use custom keybinds while having a farming tool or Daedalus Axe in the hand in the garden. §cOnly updates after scrolling in the hotbar.")
+    @ConfigOption(name = "Enabled", desc = "Use custom keybinds while holding a farming tool or daedalus axe in the garden. §cOnly updates after scrolling in the hotbar.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 8)
     public boolean keyBindEnabled = false;
 
-    @ConfigOption(name = "Disable All", desc = "Disabling all keys.")
+    @ConfigOption(name = "Disable All", desc = "Disable all keys.")
     @ConfigEditorButton(runnableId = "gardenKeyBindPresetDisabled", buttonText = "Disable")
     @ConfigAccordionId(id = 8)
     public int keyBindPresetDisable = 0;
@@ -276,13 +286,13 @@ public class Garden {
     public boolean optimalSpeed = false;
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Show the optimal speed for your current tool in the hand. (Ty MelonKingDE for the values)")
+    @ConfigOption(name = "Enabled", desc = "Show the optimal speed for your current tool in the hand. (Ty MelonKingDE for the values).")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 9)
     public boolean optimalSpeedEnabled = true;
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Warn via title when you don't have the optimal speed.")
+    @ConfigOption(name = "Warning Title", desc = "Warn via title when you don't have the optimal speed.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 9)
     public boolean optimalSpeedWarning = false;
@@ -294,7 +304,109 @@ public class Garden {
     public Position optimalSpeedPos = new Position(188, -105, false, true);
 
     @Expose
+    @ConfigOption(name = "Garden Level", desc = "")
+    @ConfigEditorAccordion(id = 10)
+    public boolean gardenLevel = false;
+
+    @Expose
+    @ConfigOption(name = "Display", desc = "Show the current garden level and progress to the next level.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 10)
+    public boolean gardenLevelDisplay = true;
+
+    @Expose
+    @ConfigOption(name = "Garden Level Position", desc = "")
+    @ConfigEditorButton(runnableId = "gardenLevel", buttonText = "Edit")
+    @ConfigAccordionId(id = 10)
+    public Position gardenLevelPos = new Position(-375, -215, false, true);
+
+    @Expose
+    @ConfigOption(name = "Elite Farming Weight", desc = "")
+    @ConfigEditorAccordion(id = 11)
+    public boolean eliteFarmingWeight = false;
+
+    @Expose
+    @ConfigOption(name = "Display", desc = "Display your farming weight on screen. " +
+            "The calculation and api is provided by The Elite SkyBlock Farmers. " +
+            "See §ehttps://elitebot.dev/info §7for more info.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 11)
+    public boolean eliteFarmingWeightDisplay = true;
+
+    @Expose
+    @ConfigOption(name = "Farming Weight Position", desc = "")
+    @ConfigEditorButton(runnableId = "eliteFarmingWeight", buttonText = "Edit")
+    @ConfigAccordionId(id = 11)
+    public Position eliteFarmingWeightPos = new Position(-370, -167, false, true);
+
+    @Expose
+    @ConfigOption(name = "Leaderboard Ranking", desc = "Show your position in the farming weight leaderboard. " +
+            "Only if your farming weight is high enough! Updates every 10 minutes.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 11)
+    public boolean eliteFarmingWeightLeaderboard = true;
+
+    @Expose
+    @ConfigOption(name = "Dicer Counter", desc = "")
+    @ConfigEditorAccordion(id = 12)
+    public boolean dicerCounter = false;
+
+    @Expose
+    @ConfigOption(name = "Rng Drop Counter", desc = "Count RNG drops for Melon Dicer and Pumpkin Dicer.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 12)
+    public boolean dicerCounterDisplay = true;
+
+    @Expose
+    @ConfigOption(name = "Dicer Counter Position", desc = "")
+    @ConfigEditorButton(runnableId = "dicerCounter", buttonText = "Edit")
+    @ConfigAccordionId(id = 12)
+    public Position dicerCounterPos = new Position(16, -232, false, true);
+
+    @Expose
+    @ConfigOption(name = "Money per Hour", desc = "")
+    @ConfigEditorAccordion(id = 13)
+    public boolean moneyPerHour = false;
+
+    @Expose
+    @ConfigOption(name = "Show money per Hour", desc = "Displays the money per hour YOU get with YOUR crop/minute value when selling the item to bazaar.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 13)
+    public boolean moneyPerHourDisplay = true;
+
+    // TODO moulconfig runnable support
+    @Expose
+    @ConfigOption(name = "Only show top", desc = "Only show the best # items.")
+    @ConfigEditorSlider(
+            minValue = 1,
+            maxValue = 25,
+            minStep = 1
+    )
+    @ConfigAccordionId(id = 13)
+    public int moneyPerHourShowOnlyBest = 5;
+
+    // TODO moulconfig runnable support
+    @Expose
+    @ConfigOption(
+            name = "Always On",
+            desc = "Show the money/hour Display always while on the garden.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 13)
+    public boolean moneyPerHourAlwaysOn = false;
+
+    @Expose
+    @ConfigOption(name = "Money per hour Position", desc = "")
+    @ConfigEditorButton(runnableId = "moneyPerHour", buttonText = "Edit")
+    @ConfigAccordionId(id = 13)
+    public Position moneyPerHourPos = new Position(16, -232, false, true);
+
+    @Expose
     @ConfigOption(name = "Plot Price", desc = "Show the price of the plot in coins when inside the Configure Plots inventory.")
     @ConfigEditorBoolean
     public boolean plotPrice = true;
+
+    @Expose
+    @ConfigOption(name = "Desk in Menu", desc = "Show a Desk button in the SkyBlock Menu. Opens the /desk command on click.")
+    @ConfigEditorBoolean
+    public boolean deskInSkyBlockMenu = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Hidden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Hidden.java
index 315be5382..547c4a24d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Hidden.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Hidden.java
@@ -37,8 +37,11 @@ public class Hidden {
     public Map<String, Long> gardenCropCounter = new HashMap<>();
 
     @Expose
-    public Map<String, Long> gardenTimeTillNextCropMilestone = new HashMap<>();
+    public Map<String, Integer> gardenCropsPerSecond = new HashMap<>();
 
     @Expose
-    public Map<String, Integer> gardenCropsPerSecond = new HashMap<>();
+    public int gardenExp = -1;
+
+    @Expose
+    public Map<String, Integer> gardenDicerRngDrops = new HashMap<>();
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
index 3575e2379..65ad96900 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
@@ -43,19 +43,19 @@ public class Inventory {
     public boolean rngMeter = false;
 
     @Expose
-    @ConfigOption(name = "Floor Names", desc = "Show the floor names in the catacombs rng meter inventory")
+    @ConfigOption(name = "Floor Names", desc = "Show the floor names in the catacombs rng meter inventory.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
     public boolean rngMeterFloorName = false;