Skip to content

Commit 1c26d12

Browse files
authored
Merge branch 'LunarClient:master' into master
2 parents 53c6662 + ba59dee commit 1c26d12

185 files changed

Lines changed: 1962 additions & 124 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/validate-upload.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,11 @@ jobs:
8484
uses: actions/checkout@v4
8585

8686
- name: Configure Google Cloud credentials
87-
uses: google-github-actions/auth@v1
87+
uses: google-github-actions/auth@v3
8888
with:
89-
token_format: "access_token"
90-
workload_identity_provider: "projects/303279774233/locations/global/workloadIdentityPools/github/providers/github-oidc"
89+
workload_identity_provider: 'projects/824216268633/locations/global/workloadIdentityPools/github-actions/providers/github-actions-oidc'
9190
service_account: "github-actions@mw-lunarclient-cdn.iam.gserviceaccount.com"
92-
create_credentials_file: true
93-
91+
9492
- name: Setup Python 3.x
9593
uses: actions/setup-python@v5
9694
with:

inactive.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"corepvp",
4848
"craftoriya",
4949
"crimsonsmp",
50+
"critz",
5051
"crystal",
5152
"crobarus",
5253
"crove",
@@ -77,7 +78,6 @@
7778
"gummymc",
7879
"hcstatic",
7980
"hikari",
80-
"historiamc",
8181
"hivemc",
8282
"hotbox",
8383
"hypermc",
@@ -92,7 +92,6 @@
9292
"juvymc",
9393
"kantay",
9494
"kazergg",
95-
"kiopvp",
9695
"ksurvival",
9796
"klocunie",
9897
"koupahgames",
@@ -268,5 +267,5 @@
268267
"nesiummc",
269268
"xeroxnetwork",
270269
"akaris",
271-
"visualpvp"
270+
"xnetwork"
272271
]
387 KB
Loading
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"id": "arabicmcsmpbedwars",
3+
"name": "ArabicMC Network",
4+
"description": "ArabicMC: SMP adventures and fast-paced BedWars battles",
5+
"addresses": [
6+
"arabicmc.org"
7+
],
8+
"primaryAddress": "arabicmc.org",
9+
"minecraftVersions": [
10+
"1.20.*",
11+
"1.21.*"
12+
],
13+
"primaryMinecraftVersion": "1.21.11",
14+
"primaryColor": "#fb542b",
15+
"secondaryColor": "#f9d0c6",
16+
"primaryLanguage": "ar",
17+
"languages": [
18+
"ar",
19+
"en"
20+
],
21+
"primaryRegion": "EU",
22+
"regions": [
23+
"NA",
24+
"EU",
25+
"OC",
26+
"AS",
27+
"SA"
28+
],
29+
"gameTypes": [
30+
"PvP",
31+
"Survival"
32+
],
33+
"website": "https://web.arabicmc.org",
34+
"store": "https://store.arabicmc.org",
35+
"compliance": {
36+
"privacyPolicy": "https://web.arabicmc.org/privacy",
37+
"termsOfService": "https://web.arabicmc.org/terms",
38+
"rules": "https://web.arabicmc.org/rules"
39+
},
40+
"socials": {
41+
"discord": "https://discord.gg/arabicmc"
42+
},
43+
"crossplay": true
44+
}

servers/bawmc/background.png

2.69 MB
Loading

servers/bawmc/logo.png

148 KB
Loading

servers/bawmc/metadata.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"id": "bawmc",
3+
"name": "BawMC",
4+
"website": "https://bawmc.net",
5+
"store": "https://loja.bawmc.net",
6+
"description": "A Brazilian Survival and Minigames server!",
7+
"addresses": [
8+
"bawmc.net",
9+
"bawmc.com.br",
10+
"bawmc.com"
11+
],
12+
"primaryAddress": "bawmc.net",
13+
"primaryColor": "#00BDFC",
14+
"secondaryColor": "#00F8FC",
15+
"minecraftVersions": [
16+
"1.8.*",
17+
"1.12.*",
18+
"1.16.*",
19+
"1.17.*",
20+
"1.18.*",
21+
"1.19.*",
22+
"1.20.*",
23+
"1.21.*"
24+
],
25+
"primaryMinecraftVersion": "1.21",
26+
"crossplay": true,
27+
"primaryRegion": "SA",
28+
"regions": [
29+
"SA"
30+
],
31+
"primaryLanguage": "pt-BR",
32+
"languages": [
33+
"pt-BR",
34+
"pt-PT"
35+
],
36+
"gameTypes": [
37+
"PvP",
38+
"Minigames",
39+
"Survival"
40+
],
41+
"socials": {
42+
"discord": "https://discord.gg/bawmc",
43+
"tiktok": "@excambaw",
44+
"instagram": "Excambaw",
45+
"youtube": "@excambaw"
46+
}
47+
}

servers/bestpvp/logo.png

78 KB
Loading

servers/bestpvp/metadata.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"id": "bestpvp",
3+
"name": "BestPVP",
4+
"addresses": [
5+
"bestpvp.hu"
6+
],
7+
"primaryAddress": "bestpvp.hu",
8+
"primaryColor": "#ff75c3",
9+
"secondaryColor": "#ffb8e0",
10+
"minecraftVersions": [
11+
"1.21.*"
12+
],
13+
"primaryMinecraftVersion": "1.21.1",
14+
"primaryRegion": "EU",
15+
"regions": [
16+
"EU"
17+
],
18+
"gameTypes": [
19+
"PvP"
20+
]
21+
}
1.82 MB
Loading

0 commit comments

Comments
 (0)