Merge branch 'master' into SlimTablist
# Conflicts: # src/de/steamwar/bungeecore/tablist/TablistServer.java
Dieser Commit ist enthalten in:
Commit
8b67c16e26
# Conflicts: # src/de/steamwar/bungeecore/tablist/TablistServer.java