Merge master into '450-new-settings-rewrite'

Conflicts:
  - PerformBackup.java
  - Settings.java
This commit is contained in:
ljacqu
2016-01-31 21:31:42 +01:00
14 changed files with 48 additions and 209 deletions
@@ -186,7 +186,6 @@ public class UtilsTest {
}
// Note: This method is used through reflections
@SuppressWarnings("unused")
public static Player[] onlinePlayersImpl() {
return new Player[]{
mock(Player.class), mock(Player.class)