Merge branch 'master' into master

src/main/resources/server.properties

@@ -59,8 +59,20 @@ motd={"text":"","extra":[{"text":"Limbo Server!","color":"yellow"}]}
 #Server list version as string
 version=Limbo!
 
-#Tab-List Header
-tab-header={"text":"","extra":[{"text":"Welcome to Limbo!","color":"green"}]}
+#Tab-List Header (May be left blank)
+tab-header=
 
-#Tab-List Footer
-tab-footer={"text":"","extra":[{"text":"Limbo Server by LOOHP","color":"yellow"}]}
+#Tab-List Footer (May be left blank)
+tab-footer=
+
+#Server resource pack url (May be left blank)
+resource-pack=
+
+#Server resource pack hash (May be left blank)
+resource-pack-sha1=
+
+#Whether to kick players if they do not accept the server resource pack
+required-resource-pack=false
+
+#JSON formatted text to show when prompting the player to install the resource pack (May be left blank)
+resource-pack-prompt={"text":"","extra":[{"text":"Install server resource pack!","color":"yellow"}]}