From f04296de38493e1eb00a9e6351a0b821b3c0fff1 Mon Sep 17 00:00:00 2001
From: Sychic <Sychic@github.com>
Date: Fri, 11 Dec 2020 19:15:20 -0500
Subject: resolve conflicts

---
 src/main/java/me/Danker/DankersSkyblockMod.java    |  2 +-
 .../java/me/Danker/commands/ToggleCommand.java     | 24 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 7e67d6c..c8eaff5 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -474,7 +474,7 @@ public class DankersSkyblockMod
 			event.setCanceled(true);
 			return;
 		}
-
+		// Implosion
 		if (!ToggleCommand.implosionMessages) {
 			if (message.contains("Your Implosion hit ") || message.contains("There are blocks in the way")) {
 				event.setCanceled(true);
diff --git a/src/main/java/me/Danker/commands/ToggleCommand.java b/src/main/java/me/Danker/commands/ToggleCommand.java
index b94bc16..d9a5805 100644
--- a/src/main/java/me/Danker/commands/ToggleCommand.java
+++ b/src/main/java/me/Danker/commands/ToggleCommand.java
@@ -66,10 +66,10 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
 		return "/" + getCommandName() + " <gparty/coords/golden/slayercount/rngesusalerts/splitfishing/chatmaddox/spiritbearalert/" +
-												"aotd/lividdagger/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/" +
-												"outlinetext/sceptremessages/midasstaffmessages/implosionmessages/healmessages/manamessages/cooldownmessages/caketimer/" +
-												"lowhealthnotify/lividsolver/stopsalvagestarred/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/tictactoepuzzle/" +
-												"startswithterminal/selectallterminal/itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/pickblockinexperiments/list>";
+			"aotd/lividdagger/sceptremessages/petcolors/dungeontimer/golemalerts/expertiselore/skill50display/" +
+			"outlinetext/midasstaffmessages/implosionmessages/healmessages/cooldownmessages/manamessages/caketimer/lowhealthnotify/" +
+			"lividsolver/stopsalvagestarred/threemanpuzzle/oruopuzzle/blazepuzzle/creeperpuzzle/waterpuzzle/tictactoepuzzle/" +
+			"watchermessage/startswithterminal/selectallterminal/itemframeonsealanterns/ultrasequencer/chronomatron/superpairs/hidetooltipsinaddons/pickblock/list>";
 	}
 
 	@Override
@@ -81,14 +81,14 @@ public class ToggleCommand extends CommandBase implements ICommand {
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
 			return getListOfStringsMatchingLastWord(args, "gparty", "coords", "golden", "slayercount", "rngesusalerts",
-												"splitfishing", "chatmaddox", "spiritbearalerts", "aotd", "lividdagger",
-												"petcolors", "dungeontimer", "golemalerts", "expertiselore",
-												"skill50display", "outlinetext","sceptremessages",  "midasstaffmessages",
-												"implosionmessages", "healmessages", "manamessages", "cooldownmessages","caketimer",
-												"lowhealthnotify", "lividsolver", "stopsalvagestarred", "threemanpuzzle", "oruopuzzle", "blazepuzzle",
-												"creeperpuzzle", "waterpuzzle", "tictactoepuzzle", "startswithterminal",
-												"selectallterminal", "itemframeonsealanterns", "ultrasequencer",
-												"chronomatron", "superpairs", "pickblockinexperiments", "list");
+					"splitfishing", "chatmaddox", "spiritbearalerts", "aotd", "lividdagger",
+					"sceptremessages", "petcolors", "dungeontimer", "golemalerts",
+					"expertiselore", "skill50display", "outlinetext", "midasstaffmessages",
+					"implosionmessages", "healmessages", "cooldownmessages", "manamessages", "caketimer", "lowhealthnotify",
+					"lividsolver", "stopsalvagestarred", "threemanpuzzle", "oruopuzzle", "blazepuzzle",
+					"creeperpuzzle", "waterpuzzle", "tictactoepuzzle", "watchermessage", "startswithterminal",
+					"selectallterminal", "itemframeonsealanterns", "ultrasequencer",
+					"chronomatron", "superpairs", "hidetooltipsinaddons", "pickblock", "list");
 		}
 		return null;
 	}
-- 
cgit