diff --git a/.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml b/.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml index 4bb9f4d2a0..86cc6c63e5 100644 --- a/.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml +++ b/.idea/.idea.Zero-K/.idea/projectSettingsUpdater.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/Shared/PlasmaShared/GlobalConst.cs b/Shared/PlasmaShared/GlobalConst.cs index 03e53af9df..ec54298590 100644 --- a/Shared/PlasmaShared/GlobalConst.cs +++ b/Shared/PlasmaShared/GlobalConst.cs @@ -195,7 +195,7 @@ static void SetMode(ModeType newMode) public const string BomberIcon = "/img/fleets/neutral.png"; public const string WarpIcon = "/img/warpcore.png"; - public const bool VpnCheckEnabled = false; + public const bool VpnCheckEnabled = true; public const double EurosToKudos = 10.0; public const string TeamEmail = "Zero-K team "; diff --git a/Zero-K.info/Controllers/GithubController.cs b/Zero-K.info/Controllers/GithubController.cs index fe3014f63e..2597bf7a7e 100644 --- a/Zero-K.info/Controllers/GithubController.cs +++ b/Zero-K.info/Controllers/GithubController.cs @@ -64,7 +64,7 @@ public async Task Hook() dynamic commits = payload.commits; foreach (dynamic commit in commits) { - sb.AppendFormat("\n {0} <{1}>", commit.message, commit.url); + sb.AppendFormat("\n~~ ~~\n{0} <{1}>", commit.message, commit.url); count++; } if (count > 0) text = $"[{payload.repository.name}] {payload.sender.login} has pushed {count} commits: {sb}"; diff --git a/ZkLobbyServer/LoginChecker.cs b/ZkLobbyServer/LoginChecker.cs index f0eb31c3d6..dd5972cd8e 100644 --- a/ZkLobbyServer/LoginChecker.cs +++ b/ZkLobbyServer/LoginChecker.cs @@ -173,7 +173,7 @@ public async Task DoLogin(Login login, string ip, List