Skip to content

Commit dff0053

Browse files
authored
Merge branch 'master' into master
2 parents 0068edd + 3d88432 commit dff0053

File tree

10 files changed

+92
-3
lines changed

10 files changed

+92
-3
lines changed

.github/workflows/ping-servers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Prepare the working dir
1919
- name: Clear any existing files
2020
run: rm -rf *
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
with:
2323
token: ${{ secrets.PAT }}
2424

.github/workflows/validate-and-build-index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Prepare the working dir
1717
- name: Clear any existing files
1818
run: rm -rf *
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
with:
2121
token: ${{ secrets.PAT }}
2222

.github/workflows/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Prepare the working dir
1717
- name: Clear any existing files
1818
run: rm -rf *
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020

2121
# Install Python
2222
- name: Setup Python 3.9

mappings/index.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@
196196
],
197197
"primaryAddress": "play.coldnetwork.net",
198198
"minecraftVersions": [
199+
"1.7.10",
200+
"1.7",
199201
"1.8.9",
200202
"1.8"
201203
],
@@ -1111,6 +1113,50 @@
11111113
},
11121114
"inactive": false
11131115
},
1116+
{
1117+
"id": "pvprivals",
1118+
"name": "PvPRivals",
1119+
"website": "https://pvprivals.net/",
1120+
"description": "The Competitive Network",
1121+
"addresses": [
1122+
"pvprivals.net"
1123+
],
1124+
"primaryAddress": "pvprivals.net",
1125+
"primaryColor": "#55ffff",
1126+
"secondaryColor": "#0d0604",
1127+
"minecraftVersions": [
1128+
"1.7.10",
1129+
"1.8.9",
1130+
"1.8",
1131+
"1.12.*",
1132+
"1.16.*",
1133+
"1.17.*",
1134+
"1.18.*",
1135+
"1.19.*",
1136+
"1.20.*",
1137+
"1.21.*"
1138+
],
1139+
"primaryMinecraftVersion": "1.8.9",
1140+
"primaryLanguage": "en",
1141+
"languages": [
1142+
"en",
1143+
"de",
1144+
"fr"
1145+
],
1146+
"primaryRegion": "EU",
1147+
"regions": [
1148+
"EU"
1149+
],
1150+
"gameTypes": [
1151+
"PvP",
1152+
"UHC"
1153+
],
1154+
"socials": {
1155+
"twitter": "PvPRivalsNet",
1156+
"discord": "https://discord.gg/pvprivals"
1157+
},
1158+
"inactive": false
1159+
},
11141160
{
11151161
"id": "scalanetwork",
11161162
"name": "Scala Network",

mappings/servers/coldnetwork/metadata.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
],
1010
"primaryAddress": "play.coldnetwork.net",
1111
"minecraftVersions": [
12+
"1.7.*",
1213
"1.8.*"
1314
],
1415
"primaryMinecraftVersion": "1.8.9",
38.1 KB
Loading
8.38 KB
Loading
15.7 KB
Loading
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"id": "pvprivals",
3+
"name": "PvPRivals",
4+
"website": "https://pvprivals.net/",
5+
"description": "The Competitive Network",
6+
"addresses": [
7+
"pvprivals.net"
8+
],
9+
"primaryAddress": "pvprivals.net",
10+
"primaryColor": "#55ffff",
11+
"secondaryColor": "#0d0604",
12+
"minecraftVersions": [
13+
"1.7.10",
14+
"1.8.*",
15+
"1.12.*",
16+
"1.16.*",
17+
"1.17.*",
18+
"1.18.*",
19+
"1.19.*",
20+
"1.20.*",
21+
"1.21.*"
22+
],
23+
"primaryMinecraftVersion": "1.8.9",
24+
"primaryLanguage": "en",
25+
"languages": [
26+
"en",
27+
"de",
28+
"fr"
29+
],
30+
"primaryRegion": "EU",
31+
"regions": [
32+
"EU"
33+
],
34+
"gameTypes": [
35+
"PvP",
36+
"UHC"
37+
],
38+
"socials": {
39+
"twitter": "PvPRivalsNet",
40+
"discord": "https://discord.gg/pvprivals"
41+
}
42+
}
348 KB
Loading

0 commit comments

Comments
 (0)