diff options
| author | Sychic <Sychic@github.com> | 2020-12-11 19:15:20 -0500 |
|---|---|---|
| committer | Sychic <Sychic@github.com> | 2020-12-11 19:15:20 -0500 |
| commit | f04296de38493e1eb00a9e6351a0b821b3c0fff1 (patch) | |
| tree | b6fe8a56e43ad58f486ea50434c778446b422e25 /src/main/java/me/Danker/commands | |
| parent | ced6807030054015ba30ebfa62e0908f3a6f744a (diff) | |
| download | SkyblockMod-f04296de38493e1eb00a9e6351a0b821b3c0fff1.tar.gz SkyblockMod-f04296de38493e1eb00a9e6351a0b821b3c0fff1.tar.bz2 SkyblockMod-f04296de38493e1eb00a9e6351a0b821b3c0fff1.zip | |
resolve conflicts
Diffstat (limited to 'src/main/java/me/Danker/commands')
| -rw-r--r-- | src/main/java/me/Danker/commands/ToggleCommand.java | 24 |
1 files changed, 12 insertions, 12 deletions
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; } |