Skip to content

Commit 46d076f

Browse files
FN-FAL113FN-FAL113
committed
add new server flags and readme test results
1 parent 6e78911 commit 46d076f

21 files changed

+209
-10
lines changed

‎CS2ServerPicker/App.Designer.vb‎

Lines changed: 22 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CS2ServerPicker/App.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,12 @@
126126
<metadata name="Latency.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127127
<value>True</value>
128128
</metadata>
129+
<metadata name="DonateToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130+
<value>17, 17</value>
131+
</metadata>
132+
<metadata name="GithubToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
133+
<value>149, 17</value>
134+
</metadata>
129135
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
130136
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
131137
<value>

‎CS2ServerPicker/App.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@
111111
End Sub
112112

113113
Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
114-
Process.Start("https://github.com/FN-FAL113/csgo-server-picker")
114+
Process.Start("https://github.com/FN-FAL113/cs2-server-picker")
115115
End Sub
116116

117117
Private Sub PictureBox2_Click(sender As Object, e As EventArgs) Handles PictureBox2.Click
118-
Process.Start("https://www.paypal.com/paypalme/ameliaOrbeta")
118+
Process.Start("https://www.paypal.com/paypalme/fnfal113")
119119
End Sub
120120

121121
Private Sub InfoButton_Click(sender As Object, e As EventArgs) Handles InfoButton.Click
@@ -131,7 +131,7 @@
131131
Environment.NewLine +
132132
"Author: FN-FAL113 (github username)" + Environment.NewLine +
133133
"License: GNU General Public License V3" + Environment.NewLine +
134-
"App Version: 2.4.1",
134+
"App Version: 2.4.2",
135135
"App Info"
136136
)
137137
End Sub

‎CS2ServerPicker/CS2ServerPicker.vbproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,18 @@
402402
</ItemGroup>
403403
<ItemGroup>
404404
<None Include="asset\Settings.png" />
405+
<None Include="asset\flags\Tencent Guangzhou - Mobile %28China%29 %28tgdm%29.png" />
406+
<None Include="asset\flags\Tencent Guangzhou - Telecom %28China%29 %28tgdt%29.png" />
407+
<None Include="asset\flags\Tencent Guangzhou - Unicom %28China%29 %28tgdu%29.png" />
408+
<None Include="asset\flags\Multiplay Dallas %28Texas%29 %28dfw2%29.png" />
409+
<None Include="asset\flags\Multiplay Amsterdam %28Netherlands%29 %28ams4%29.png" />
410+
<None Include="asset\flags\Multiplay Hong Kong %28hkg4%29.png" />
411+
<None Include="asset\flags\Alibaba Cloud Beijing - Mobile %28China%29 %28pekm%29.png" />
412+
<None Include="asset\flags\Alibaba Cloud Shanghai - Mobile %28China%29 %28pvgm%29.png" />
413+
<None Include="asset\flags\Alibaba Cloud Beijing - Telecom %28China%29 %28pekt%29.png" />
414+
<None Include="asset\flags\Alibaba Cloud Shanghai - Telecom %28China%29 %28pvgt%29.png" />
415+
<None Include="asset\flags\Alibaba Cloud Beijing - Unicom %28China%29 %28peku%29.png" />
416+
<None Include="asset\flags\Alibaba Cloud Shanghai - Unicom %28China%29 %28pvgu%29.png" />
405417
<Content Include="fav_icon.ico" />
406418
</ItemGroup>
407419
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />

‎CS2ServerPicker/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
3232
' by using the '*' as shown below:
3333
' <Assembly: AssemblyVersion("1.0.*")>
3434

35-
<Assembly: AssemblyVersion("2.4.1.0")>
36-
<Assembly: AssemblyFileVersion("2.4.1.0")>
35+
<Assembly: AssemblyVersion("2.4.2.0")>
36+
<Assembly: AssemblyFileVersion("2.4.2.0")>
3737
<Assembly: NeutralResourcesLanguage("en")>

‎CS2ServerPicker/My Project/Resources.Designer.vb‎

Lines changed: 120 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CS2ServerPicker/My Project/Resources.resx‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,4 +292,40 @@
292292
<data name="Settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
293293
<value>..\asset\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
294294
</data>
295+
<data name="Multiplay Amsterdam (Netherlands) (ams4)" type="System.Resources.ResXFileRef, System.Windows.Forms">
296+
<value>..\asset\flags\Multiplay Amsterdam (Netherlands) (ams4).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
297+
</data>
298+
<data name="Multiplay Dallas (Texas) (dfw2)" type="System.Resources.ResXFileRef, System.Windows.Forms">
299+
<value>..\asset\flags\Multiplay Dallas (Texas) (dfw2).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
300+
</data>
301+
<data name="Tencent Guangzhou - Mobile (China) (tgdm)" type="System.Resources.ResXFileRef, System.Windows.Forms">
302+
<value>..\asset\flags\Tencent Guangzhou - Mobile (China) (tgdm).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
303+
</data>
304+
<data name="Tencent Guangzhou - Telecom (China) (tgdt)" type="System.Resources.ResXFileRef, System.Windows.Forms">
305+
<value>..\asset\flags\Tencent Guangzhou - Telecom (China) (tgdt).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
306+
</data>
307+
<data name="Tencent Guangzhou - Unicom (China) (tgdu)" type="System.Resources.ResXFileRef, System.Windows.Forms">
308+
<value>..\asset\flags\Tencent Guangzhou - Unicom (China) (tgdu).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
309+
</data>
310+
<data name="Alibaba Cloud Beijing - Mobile (China) (pekm)" type="System.Resources.ResXFileRef, System.Windows.Forms">
311+
<value>..\asset\flags\Alibaba Cloud Beijing - Mobile (China) (pekm).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
312+
</data>
313+
<data name="Alibaba Cloud Beijing - Telecom (China) (pekt)" type="System.Resources.ResXFileRef, System.Windows.Forms">
314+
<value>..\asset\flags\Alibaba Cloud Beijing - Telecom (China) (pekt).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
315+
</data>
316+
<data name="Alibaba Cloud Beijing - Unicom (China) (peku)" type="System.Resources.ResXFileRef, System.Windows.Forms">
317+
<value>..\asset\flags\Alibaba Cloud Beijing - Unicom (China) (peku).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
318+
</data>
319+
<data name="Alibaba Cloud Shanghai - Mobile (China) (pvgm)" type="System.Resources.ResXFileRef, System.Windows.Forms">
320+
<value>..\asset\flags\Alibaba Cloud Shanghai - Mobile (China) (pvgm).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
321+
</data>
322+
<data name="Alibaba Cloud Shanghai - Telecom (China) (pvgt)" type="System.Resources.ResXFileRef, System.Windows.Forms">
323+
<value>..\asset\flags\Alibaba Cloud Shanghai - Telecom (China) (pvgt).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
324+
</data>
325+
<data name="Alibaba Cloud Shanghai - Unicom (China) (pvgu)" type="System.Resources.ResXFileRef, System.Windows.Forms">
326+
<value>..\asset\flags\Alibaba Cloud Shanghai - Unicom (China) (pvgu).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
327+
</data>
328+
<data name="Multiplay Hong Kong (hkg4)" type="System.Resources.ResXFileRef, System.Windows.Forms">
329+
<value>..\asset\flags\Multiplay Hong Kong (hkg4).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
330+
</data>
295331
</root>

‎CS2ServerPicker/Services/ServerService.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Imports Newtonsoft.Json.Linq
33
Module ServerService
44

55
Private clusterDict As New Dictionary(Of String, String) From {
6-
{"China", "Perfect,Hong Kong,Alibaba"},
6+
{"China", "Perfect,Hong Kong,Alibaba,Tencent"},
77
{"Japan", "Tokyo"},
88
{"Stockholm (Sweden)", "Stockholm"},
99
{"India", "Chennai,Mumbai"}
@@ -64,8 +64,8 @@ Module ServerService
6464
Next
6565
Next
6666

67-
' As of november the 1st server revision, different server network IDs and geolocation that has existing server name prop were added.
68-
' Have to make validations on the dictionary to prevent duplicate key exception.
67+
' Different server network IDs and geolocation that has existing server name prop were added.
68+
' Validations on the dictionary to prevent duplicate key exception.
6969
If Not App.Get_Server_Dictionary_Unclustered().ContainsKey(serverName) Then
7070
App.Get_Server_Dictionary_Unclustered().Add(serverName, String.Join(",", ipArr))
7171
Else

‎CS2ServerPicker/asset/flags/Alibaba Cloud Beijing - Mobile (China) (pekm).png‎

707 Bytes
Loading

‎CS2ServerPicker/asset/flags/Alibaba Cloud Beijing - Telecom (China) (pekt).png‎

707 Bytes
Loading

0 commit comments

Comments
 (0)