Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2018-12-05 19:00:18 -05:00
12 changed files with 35 additions and 29 deletions
@@ -11,7 +11,7 @@ public enum GameMode{
freebuild{{
disableWaveTimer = true;
}},
noWaves{{
attack{{
disableWaves = true;
hidden = true;
enemyCheat = true;