Skip to content

Commit b08c554

Browse files
committed
Merge remote-tracking branch 'piplup55/fixes' into public
Conflicts: src/store/servers.ts
2 parents 45867d1 + a86222e commit b08c554

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

src/store/servers.ts

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export const servers: IServer[] = [
1313
{
1414
name : 'Piplup (Main)',
1515
link : 'https://piplup.smoo.it',
16-
server : { host: 'piplup.smoo.it', ip: '35.228.67.224' },
17-
location : { flag: 'fi', name: 'Finland' },
16+
server : { host: 'piplup.smoo.it', ip: '143.198.241.242' },
17+
location : { flag: 'gb', name: 'United Kingdom' },
1818
version : linkTree('server', 'piplup/server', 'TeamPiplup/SmoOnlineServer'),
1919
settings : {
2020
Server : { MaxPlayers: 10 },
@@ -26,8 +26,8 @@ export const servers: IServer[] = [
2626
{
2727
name : 'Piplup (Capture Sync)',
2828
link : 'https://piplup.smoo.it',
29-
server : { host: 'piplup.smoo.it', ip: '35.228.67.22', port: 1028 },
30-
location : { flag: 'fi', name: 'Finland' },
29+
server : { host: 'piplup.smoo.it', ip: '143.198.241.242', port: 1028 },
30+
location : { flag: 'gb', name: 'United Kingdom' },
3131
version : linkTree('server', 'piplup/server', 'TeamPiplup/SmoOnlineServer'),
3232
settings : {
3333
Server : { MaxPlayers: 8 },
@@ -36,22 +36,6 @@ export const servers: IServer[] = [
3636
PersistShines : { Enabled: true },
3737
},
3838
},
39-
{
40-
name : 'Piplup (UDP)',
41-
link : 'https://piplup.smoo.it',
42-
server : { host: 'piplus.smoo.it', ip: '34.29.243.224', port: 1029 },
43-
location : { flag: 'us', name: 'US-Central' },
44-
settings : {
45-
Server : { MaxPlayers: 8 },
46-
Scenario : { MergeEnabled: true },
47-
Shines : { Enabled: true },
48-
PersistShines : { Enabled: true },
49-
},
50-
version: {
51-
html : linkRelease('1.0.5-rcl.1', 'udp/1.0.5', 'Istador/smo-multi-rs'),
52-
details : `<p>Connecting requires mod version ${linkRelease('v1.4.0', 'v1.4.0', 'CraftyBoss/SuperMarioOdysseyOnline')} or later.</p>`,
53-
},
54-
},
5539
{
5640
dead : true,
5741
name : 'Sanae',

0 commit comments

Comments
 (0)