Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2020-08-14 19:45:51 -04:00
commit 91e5fa5409

View file

@ -58,7 +58,6 @@ public class ServerControl implements ApplicationListener{
public ServerControl(String[] args){
Core.settings.defaults(
"shufflemode", "normal",
"bans", "",
"admins", "",
"shufflemode", "custom",