Merge Greg's branch into the master branch #244

Merged
greg6775 merged 23 commits from greg-dev into master 2019-12-23 16:22:53 +01:00

23 commits

Author SHA1 Message Date
GregTCLTK
6c021cd07a
Info stuff 2019-12-23 16:10:49 +01:00
GregTCLTK
7489e6c79f
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-23 15:32:46 +01:00
GregTCLTK
ef74e3240b
Queue Command but queue is not working 2019-12-23 15:32:34 +01:00
Skidder
93e57c6ba7
Merge pull request #242 from BigBotNetwork/master
Merged!
2019-12-23 14:25:01 +01:00
Skidder
2552062b9d
Merge pull request #241 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_81
Bump JDA from 4.0.0_79 to 4.1.0_81
2019-12-23 14:22:46 +01:00
dependabot-preview[bot]
1954198f71
Bump JDA from 4.0.0_79 to 4.1.0_81
Bumps JDA from 4.0.0_79 to 4.1.0_81.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23 13:22:04 +00:00
GregTCLTK
6ea63342af
Outsource yk 2019-12-22 20:48:11 +01:00
GregTCLTK
7bc151fc48
Removed unused imports 2019-12-22 20:30:36 +01:00
GregTCLTK
d462b0822d
Fix 2019-12-22 20:28:00 +01:00
GregTCLTK
29a1b3947d
Remove Link command strings 2019-12-22 20:17:05 +01:00
GregTCLTK
4814cb00a0
Unused import fix 2019-12-22 16:50:06 +01:00
GregTCLTK
f373b5e969
Music pre-release!!! 2019-12-22 16:47:37 +01:00
GregTCLTK
7907bedf15
Fix 2019-12-22 16:43:37 +01:00
GregTCLTK
88bff41e9a
Uh a AudioManager 2019-12-22 15:30:39 +01:00
GregTCLTK
7738951911
AudioPlayerSendHandler leak^^ 2019-12-22 15:26:32 +01:00
GregTCLTK
869c9987ab
i18n stuff 2019-12-22 15:25:54 +01:00
GregTCLTK
a7c9578ee5
Music stuff yk 2019-12-22 14:46:21 +01:00
GregTCLTK
b1f82ae79d
Better Starboard 2019-12-22 12:24:48 +01:00
GregTCLTK
96fbc9334c
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-22 11:12:09 +01:00
GregTCLTK
4f7f675a8a
Update 2019-12-22 11:12:01 +01:00
Skidder
fd385774f6
Merge pull request #233 from BigBotNetwork/master
Merged!
2019-12-22 11:11:19 +01:00
GregTCLTK
895d06d714
Screenshare is back 2019-12-22 09:57:40 +01:00
GregTCLTK
e051c81221
A new command? 🤔 2019-12-22 01:04:10 +01:00