Nicholas Rees
9542ae5be0
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# discordbot/src/main/java/zone/themcgamer/discordbot/command/impl/InviteCommand.java
2021-03-15 17:49:37 -05:00
Braydon
e916aa1861
Merge pull request #13 from nickreesdev/master
...
Discord Bot: Fixed an issue with the panel not properly marking the server hosting the bot as RUNNING. Also fixed a few wording issues and cleaned up some things.
2021-03-15 16:00:24 -04:00
Nicholas Rees
049c436ac3
Discord Bot: Fixed an issue with the panel not properly marking the server hosting the bot as RUNNING. Also fixed a few wording issues and cleaned up some things.
2021-03-15 11:30:56 -05:00
nickreesdev
3468f80518
Discord Bot: Cleaned things up a little bit and fixed an issue where the panel wouldn't mark the bot server as RUNNING.
2021-03-15 11:15:42 -05:00
Joel
4180b25348
Have done some changes for logging.
2021-03-15 16:55:35 +01:00
Joel
93357ecb4e
Optimized imports
2021-02-24 20:11:26 +01:00
Joel
e0d93fba8b
Some updates in the toggleRole manager
2021-02-24 20:04:20 +01:00
Joel
ba40c09981
Check if user is bot
2021-02-21 23:25:05 +01:00
Joel
549ca47d61
Simplified MainGuildListener#onGuildMessageReactionAdd
2021-02-21 23:22:16 +01:00
Joel
df6576ad10
Checking if bot is sending a dm to itself.
2021-02-21 22:44:17 +01:00
Joel
bb812615b9
Updates in bot
2021-02-21 22:40:16 +01:00
Joel
ce72acddf3
Added EditMessageCommand command
2021-02-21 22:22:54 +01:00
Joel
55b68e8f07
Added Join & Quit Log
2021-02-21 22:05:22 +01:00
Joel
e53b1feb50
Merge remote-tracking branch 'origin/master' into master
2021-02-21 21:49:38 +01:00
Joel
59b13bad06
Added a role toggling system in main discord.
2021-02-21 21:49:32 +01:00
Braydon
c128e1ad5f
Merge pull request #12 from nickreesdev/master
...
Changed a message in DeliveryManMenu to use the static DELIVERY_MAN_NAME field.
2021-02-21 14:35:50 -05:00
nickreesdev
dc8e23bd02
Changed a message in DeliveryManMenu to use the static DELIVERY_MAN_NAME field.
2021-02-21 13:31:38 -06:00
Joel
a922104f8f
Added timeleft in chat cooldown
2021-02-21 19:01:09 +01:00
Joel
84e9a98778
Added CooldownHandler#getCooldown
2021-02-21 19:00:57 +01:00
Joel
01871a9b4b
Fixed mistake in chat prefix
2021-02-21 17:44:17 +01:00
Joel
09a4a6140f
- Added sounds to ChatManager and ServerTraveler - Also cooldown message is different now.
2021-02-21 17:43:21 +01:00
Joel
f6fd0427a5
- Redesigned lores in DeliveryManMenu
2021-02-21 17:42:43 +01:00
Rainnny7
38b6fc34a2
Merge remote-tracking branch 'origin/master'
2021-02-20 22:55:53 -05:00
Rainnny7
6803133935
[17.8k Lines] Started working on the chat filter
2021-02-20 22:55:47 -05:00
Braydon
092eaa19ec
Merge pull request #11 from nickreesdev/master
...
Made it show "are" instead of "is" in the join MOTD if there is not one player online.
2021-02-20 22:07:02 -05:00
nickreesdev
a8e6b158c3
Made it show "are" instead of "is" in the join MOTD if there is not one player online.
2021-02-20 21:05:28 -06:00
Rainnny7
4d2a8369d9
[17.3k Lines] Cleaned up the delivery man a bit
2021-02-20 21:21:26 -05:00
Rainnny7
652988432f
[17.4k Lines] Added more blocking events to two factor auth
2021-02-20 20:37:27 -05:00
Rainnny7
bad226c19b
[17.4k Lines] Added a QR code image to the two factor authentication system
2021-02-20 20:35:53 -05:00
Rainnny7
d360fabcc8
[17.3k Lines] Started on the base of two factor authentication
2021-02-20 19:30:39 -05:00
Rainnny7
0c664d2ef1
Merge remote-tracking branch 'origin/master'
2021-02-20 17:49:25 -05:00
Rainnny7
15e199b94b
[17.1k Lines] Added login logging to the account repository, and added more chat emotes
2021-02-20 17:49:18 -05:00
Joel
530310bec0
Removed unused commands
2021-02-20 20:48:44 +01:00
Braydon
6e983ae807
Merge pull request #10 from nickreesdev/master
...
Made it so muted players can't use /message and or /reply
2021-02-20 13:28:49 -05:00
nickreesdev
671f315b93
Merge branch 'master' of https://github.com/McGamerZone/McGamerCore
2021-02-20 12:25:32 -06:00
nickreesdev
b83c25a5e5
Made it where players can't message or reply if they're muted.
2021-02-20 12:25:02 -06:00
Braydon
2bd4aee8ae
Merge pull request #9 from nickreesdev/master
...
Added a chat cooldown for non donators
2021-02-20 13:00:00 -05:00
nickreesdev
1f933ce804
Added a 3 second chat cooldown for non-donators.
2021-02-20 11:57:14 -06:00
nickreesdev
31fe12357b
Merge branch 'master' of https://github.com/McGamerZone/McGamerCore
2021-02-19 23:40:26 -06:00
Braydon
7d48084e0b
Merge pull request #8 from nickreesdev/master
...
Added a /find command.
2021-02-20 00:40:13 -05:00
nickreesdev
7693893536
Merge branch 'master' of https://github.com/McGamerZone/McGamerCore
2021-02-19 23:38:38 -06:00
nickreesdev
eb84659e5b
Added a /find command.
2021-02-19 23:38:16 -06:00
Braydon
2b3d34debf
Merge pull request #7 from nickreesdev/master
...
Bug fixes
2021-02-20 00:05:42 -05:00
nickreesdev
60a0ff3b4d
Merge branch 'master' of https://github.com/McGamerZone/McGamerCore
2021-02-19 23:02:58 -06:00
nickreesdev
87b21fb606
Fixed a bug where newer versions of Minecraft would make it impossible to get out of the traveler menu.
...
"Traveller" -> "Traveler"
2021-02-19 23:02:27 -06:00
Braydon
956c6abb93
Merge pull request #6 from nickreesdev/master
...
Added emotes to chat.
2021-02-19 23:49:46 -05:00
nickreesdev
ac13715cb0
Added emotes to chat.
2021-02-19 22:48:25 -06:00
Braydon
4a77fe053b
Merge pull request #5 from nickreesdev/master
...
Delivery Man Changes
2021-02-19 23:22:19 -05:00
nickreesdev
35736ed02d
Merge branch 'master' of https://github.com/McGamerZone/McGamerCore
2021-02-19 22:12:29 -06:00
nickreesdev
6ae4579eab
Added a sound for when a player claims a reward.
2021-02-19 22:11:53 -06:00
