Merge remote-tracking branch 'upstream/master' into Custom-rebirth-npc

This commit is contained in:
James McDowell
2021-05-26 19:44:58 +10:00
318 changed files with 1872 additions and 1719 deletions

View File

@@ -166,7 +166,7 @@ server:
DB_HOST: "localhost"
DB_USER: "cosmic_server"
DB_PASS: "snailshell"
INIT_CONNECTION_POOL_TIMEOUT: 60 # Seconds
INIT_CONNECTION_POOL_TIMEOUT: 90 # Seconds
#Login Configuration
WORLDS: 1 #Initial number of worlds on the server.