diff options
| author | David Panić <david@panic.tk> | 2019-04-12 22:23:40 +0200 |
|---|---|---|
| committer | David Panić <david@panic.tk> | 2019-04-12 22:23:40 +0200 |
| commit | 54751c4fef7bf70ecbfc57cd939677d46feb12b9 (patch) | |
| tree | a2b4408e4a0f4826830c9f15729641b5a3931837 | |
| parent | fbe50b9c710aedfa9d2bc1304181e658f919ce9c (diff) | |
| parent | 498d5eac8566f52ef96907356ccd98d00d90faa8 (diff) | |
Fixed conflict
| -rw-r--r-- | src/main/java/com/redstoner/modules/chat/Chat.cmd | 2 | ||||
| -rw-r--r-- | src/main/java/com/redstoner/modules/discord/Discord.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/redstoner/modules/chat/Chat.cmd b/src/main/java/com/redstoner/modules/chat/Chat.cmd index a93763c..112a6f2 100644 --- a/src/main/java/com/redstoner/modules/chat/Chat.cmd +++ b/src/main/java/com/redstoner/modules/chat/Chat.cmd @@ -84,7 +84,7 @@ command chatonly { perm utils.chat.chatonly; [empty] { run chatonly; - help Shows that you're onlu able to chat, nothing else.; + help Shows that you're only able to chat, nothing else.; type player; } } diff --git a/src/main/java/com/redstoner/modules/discord/Discord.java b/src/main/java/com/redstoner/modules/discord/Discord.java index cdef453..dc3818f 100644 --- a/src/main/java/com/redstoner/modules/discord/Discord.java +++ b/src/main/java/com/redstoner/modules/discord/Discord.java @@ -115,7 +115,7 @@ public class Discord implements Module { } new Message(sender, null).appendText("\n&cRedstoner&7 has a &2Discord&7 Now! \nClick ") - .appendLinkHover("&e" + inviteLink, inviteLink, "&aClick to Join").appendText("&7 to join. \n\nTo sync you rank, copy ") + .appendLinkHover("&e" + inviteLink, inviteLink, "&aClick to Join").appendText("&7 to join. \n\nTo sync your rank, copy ") .appendSuggestHover("&e" + token, token, "&aClick to Copy").appendText("&7 into &3#rank-sync&7.\n").send(); } |