Merge remote-tracking branch 'refs/remotes/origin/master' into develop-chatReply

# Conflicts:
#	src/main/java/eu/mhsl/craftattack/spawn/Main.java
#	src/main/java/eu/mhsl/craftattack/spawn/util/statistics/NetworkMonitor.java
#	src/main/resources/config.yml
#	src/main/resources/plugin.yml

src/main/resources/config.yml

@@ -1,3 +1,7 @@
+plugin:
+  disabledAppliances:
+    - NameOfApplianceClass
+
 worldMuseum:
   uuid:
   connect-server-name: worldmuseum
@@ -42,11 +46,24 @@ help:
   spawn: "Der Weltspawn befindet sich bei x:0 y:0 z:0"
 
 playerLimit:
-  maxPlayers: 100
+  maxPlayers: 10
 
 whitelist:
   overrideIntegrityCheck: false
   api: https://mhsl.eu/craftattack/api/user
 
 tablist:
-  interface: eth0
+  interface: eth0
+
+outlawed:
+  voluntarily: []
+
+packselect:
+  packs:
+    - somepack:
+        name: "Texture pack name"
+        description: "Texture pack description"
+        author: "Pack Author(s)"
+        url: "https://example.com/download/pack.zip"
+        hash: "" # SHA1 hash of ZIP file (will be auto determined by the server on startup when not set)
+        icon: "" # base64 player-head texture, can be obtained from sites like https://minecraft-heads.com/ under developers > Value

src/main/resources/plugin.yml

@@ -37,5 +37,8 @@ commands:
   panicBan:
   vogelfrei:
   settings:
+  texturepack:
+  maintanance:
+  yearRank:
   msg:
   r: