Merge branch 'master' of ssh://medusa.casa.alemor.org:4323/mar/container

src/minecraft_be/assets/minecraft/server.properties

@@ -52,7 +52,7 @@ max-threads=8
 # Maximum number of threads the server will try to use. If set to 0 or removed then it will use as many as possible.
 # Allowed values: Any positive integer.
 
-level-name=Default level
+level-name=Glunge Drip
 # Allowed values: Any string
 
 level-seed=

src/minecraft_be/assets/minecraft/whitelist.json

@@ -1,11 +1 @@
-[
-    {
-	"ignoresPlayerLimit":false,
-	"name":"MarVel0z",
-	"xuid":"2535473403284928"
-    },
-    {
-	"ignoresPlayerLimit":false,
-	"name":"BISONMEATS"
-    }
-]
+[{ignoresPlayerLimit:false,name:MarVel0z,xuid:2535473403284928},{ignoresPlayerLimit:false,name:BISONMEATS},{ignoresPlayerLimit:false},{ignoresPlayerLimit:false,name:TrinityAri,xuid:2535422548094088},{ignoresPlayerLimit:false,name:Marcade645},{ignoresPlayerLimit:false,name:JogsIntoMordor}]