Merge branch 'master' into testing

.gitignore

@@ -1,5 +1,6 @@
 # folders
 downloads/
+journeymap/
 logs/
 resourcepacks/
 saves/ 

config/journeymap-common.toml

@@ -0,0 +1,11 @@
+
+[admins]
+	#Default, all Ops have access to Server Admin UI in the Options screen.
+	#If set to false, only users in the Admin List will have access.
+	#If set to true, all ops and users in the Admin List will have access.
+	opAccess = true
+	#Players in this list have access to the Journeymap's Server Admin Panel
+	#Add users by name or UUID, Prefer UUID as it is more secure!
+	#Each value on a new line with the example format provided. (please delete the default values)
+	serverAdmins = []
+

usercache.json

@@ -0,0 +1 @@
+[{"name":"Citali","uuid":"87c0acc6-ec6e-4456-b256-b871edc60813","expiresOn":"2020-05-21 12:17:32 +0200"}]

usernamecache.json

@@ -0,0 +1,3 @@
+{
+  "87c0acc6-ec6e-4456-b256-b871edc60813": "Citali"
+}