Merge remote-tracking branch 'origin/dev' into dev

4 files changed, 19 insertions, 8 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java b/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java
index b9a69ed8c..4e93679d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java
@@ -17,6 +17,12 @@ public class Abilities {
     public boolean itemAbilityCooldownBackground = false;
 
     @Expose
+    @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped summoning souls laying on the ground. " +
+            "§cNot working in Dungeon if Skytils' 'Hide Non-Starred Mobs Nametags' feature is enabled!")
+    @ConfigEditorBoolean
+    public boolean summoningSoulDisplay = false;
+
+    @Expose
     @ConfigOption(name = "Summoning Mob", desc = "")
     @ConfigEditorAccordion(id = 0)
     public boolean summoningMob = false;
@@ -44,4 +50,9 @@ public class Abilities {
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean summoningMobColored = false;
+
+    @Expose
+    @ConfigOption(name = "Fire Veil Particles", desc = "Hiding the flame particles when using the Fire Veil Wand ability.")
+    @ConfigEditorBoolean
+    public boolean fireVeilWandHider = false;
 }
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 3fe253cc0..f674680bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
@@ -84,7 +84,13 @@ public class Chat {
 
     @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 doing a Kuudra fight.")
+            "except for players who are close to the player, inside dungeon or during a Kuudra fight.")
     @ConfigEditorBoolean
     public boolean hideFarDeathMessages = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Far Deaths 2", desc = "Hide the death messages of other players, " +
+            "except for players who are close to the player, inside dungeon or during a Kuudra fight.")
+    @ConfigEditorBoolean
+    public boolean hideFarDeathMessages2 = false;
 }
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 8f8d6e5e3..75b0831ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
@@ -82,7 +82,7 @@ public class Inventory {
     public boolean rngMeterNoDrop = false;
 
     @Expose
-    @ConfigOption(name = "Selected Drop", desc = "Highlight the selected drop in the catacombs oder slayer rng meter inventory")
+    @ConfigOption(name = "Selected Drop", desc = "Highlight the selected drop in the catacombs or slayer rng meter inventory")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
     public boolean rngMeterSelectedDrop = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
index d8ad7886e..4c58a5118 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -24,12 +24,6 @@ public class Misc {
     public boolean hideExpBottles = false;
 
     @Expose
-    @ConfigOption(name = "Summon Soul Display", desc = "Shows the name above summoning souls that ready to pick up. " +
-            "§cNot working in Dungeon if Skytils' 'Hide Non-Starred Mobs Nametags' feature is enabled!")
-    @ConfigEditorBoolean
-    public boolean summonSoulDisplay = false;
-
-    @Expose
     @ConfigOption(name = "Skytils Damage Splash", desc = "Fixing the custom damage splash feature from skytils.")
     @ConfigEditorBoolean
     public boolean fixSkytilsDamageSplash = true;