Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from LabyMod:master #225

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/actions/validate-manifest/validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ def main():
if server_directory != data['server_name']:
comment += '**Servername has to be directory name!**\n'

# Validate wildcards
if 'server_wildcards' in data:
for wildcard in data['server_wildcards']:
if not wildcard.startswith('%.'):
comment += '- Invalid wildcard entry. Each entry must start with **%.**. Further information here: https://en.wikipedia.org/wiki/Wildcard_DNS_record (`server_wildcards`)\n'

# Check for https
if 'social' in data:
social = data['social']
Expand Down
Binary file added minecraft_servers/bencraft/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/bencraft/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/bencraft/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions minecraft_servers/bencraft/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"server_name": "bencraft",
"nice_name": "Bencraft",
"direct_ip": "play.bencraft.xyz",
"supported_languages": ["de"],
"social": {
"web": "https://bencraft.xyz",
"web_shop": "https://shop.bencraft.xyz",
"discord": "https://discord.com/invite/mdWBX7whUG",
"youtube": "https://www.youtube.com/channel/UCZ_4IvaHjkJuKjP6FJSeb8Q"
},
"gamemodes": {
"bedwars": {
"name": "BedWars",
"color": "#f5c945",
"version": "1.20<*"
},
"hideandseek": {
"name": "Hide and Seek",
"color": "#c28610",
"version": "1.20<*"
},
"tycoon": {
"name": "Tycoon",
"color": "#e33d20",
"version": "1.20<*"
}
},
"discord": {
"server_id": "1137731868440137738"
},
"location": {
"country_code": "DE",
"country": "Germany",
"city": "Hessen"
}
}
Binary file added minecraft_servers/crystopia/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/crystopia/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/crystopia/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/crystopia/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions minecraft_servers/crystopia/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"server_name": "crystopia",
"nice_name": "Crystopia",
"direct_ip": "crystopia.net",
"supported_languages": [
"en",
"de"
],
"social": {
"web": "https://www.crystopia.net",
"web_support": "https://www.crystopia.net/guides",
"twitter": "crystopianet",
"discord": "https://discord.com/invite/q7xW3MH425",
"youtube": "https://www.youtube.com/@crystopia"
},
"gamemodes": {
"smp": {
"name": "SMP",
"color": "#FFA500",
"command": "/smp",
"versions": "1.20.4"
}
},
"chat": {
"message_formats": [
"^§[a-f0-9](?<level>\\d+)( \\||§8 \\|) §[a-f0-9](?<sender>[a-zA-Z0-9_]{2,16})§r§7: §f(?<message>.*)$"
]
},
"discord": {
"server_id": 1084507325450162247,
"rename_to_minecraft_name": false
},
"brand": {
"primary": "#2E8BC0",
"background": "#0C2D48",
"text": "#B1D4E0"
}
}
Binary file added minecraft_servers/endermc/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/endermc/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/endermc/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/endermc/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/endermc/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions minecraft_servers/endermc/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"server_name": "endermc",
"nice_name": "EnderMC Network",
"direct_ip": "mc.endkind.net",
"social": {
"web": "https://mc.endkind.net",
"web_shop": "https://mc.endkind.net/shop"
},
"gamemodes": {
"community_craft": {
"name": "CommunityCraft",
"color": "#fff"
},
"tnttag": {
"name": "TNT Tag",
"color": "#fff",
"url": "https://mc.endkind.net/mode/tnt_tag"
},
"aaa": {
"name": "All Against All",
"color": "#fff",
"url": "https://mc.endkind.net/mode/aaa"
}
}
}
Binary file modified minecraft_servers/fantasy/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified minecraft_servers/fantasy/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 7 additions & 6 deletions minecraft_servers/fantasy/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
"nice_name": "Rede Fantasy",
"direct_ip": "redefantasy.com",
"server_wildcards": [
"%.redefantasy.com"
"%.redefantasy.com",
"redefantasy.digital"
],
"gamemodes": {
"prison": {
"name": "Prison Phoenix",
"color": "#FFAA00",
"command": "/serverconnector prison-phoenix"
"prison_eclipse": {
"name": "Prison Eclipse",
"color": "#661d6c",
"command": "/serverconnector prison-eclipse"
}
},
"social": {
Expand All @@ -32,4 +33,4 @@
"country": "Brazil",
"country_code": "BR"
}
}
}
Binary file added minecraft_servers/fp/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/fp/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/fp/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/fp/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions minecraft_servers/fp/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"server_name": "fp",
"nice_name": "Fp Mine",
"direct_ip": "m.fpt.icu",
"supported_languages": [
"pt-BR"
],
"social": {
"web": "https://m.fpt.icu",
"twitter": "fptbb",
"discord": "https://discord.gg/kQrB6sW6Vh"
},
"discord": {
"server_id": 900808498294706267
},
"brand": {
"primary": "#e64889",
"background": "#1b1b1d",
"text": "#000000"
},
"location": {
"city": "São Paulo",
"country": "Brazil",
"country_code": "BR"
},
"command_delay": 3000
}
Binary file added minecraft_servers/ikara/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/ikara/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/ikara/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/ikara/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added minecraft_servers/ikara/logo.png
Binary file added minecraft_servers/ikara/[email protected]
42 changes: 42 additions & 0 deletions minecraft_servers/ikara/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"server_name": "ikara",
"nice_name": "Ikara",
"direct_ip": "ikara.gg",
"supported_languages": [
"en"
],
"social": {
"web_shop": "https://store.ikara.gg",
"twitter": "PlayIKARA",
"tiktok": "PlayIkara",
"discord": "https://discord.gg/BzUyWTCWD2",
"youtube": "https://www.youtube.com/@Ikaranetwork"
},
"gamemodes": {
"factions": {
"name": "Factions",
"color": "#7CFDFF",
"command": "/server factions"
},
"practice": {
"name": "Practice",
"color": "#FFE287",
"command": "/server practice"
},
"survival": {
"name": "Survival",
"color": "#8CFCB9",
"command": "/server survival"
}
},
"discord": {
"server_id": 566396846549893136,
"rename_to_minecraft_name": false
},
"brand": {
"primary": "#f8c161",
"background": "#464646",
"text": "#EEEEEE"
},
"yt_trailer": "1PkHxJT02J4&t"
}
Binary file removed minecraft_servers/letsgrief/background.png
Diff not rendered.
Binary file removed minecraft_servers/letsgrief/[email protected]
Diff not rendered.
Binary file removed minecraft_servers/letsgrief/icon.png
Diff not rendered.
Binary file removed minecraft_servers/letsgrief/[email protected]
Diff not rendered.
23 changes: 0 additions & 23 deletions minecraft_servers/letsgrief/manifest.json

This file was deleted.

Binary file added minecraft_servers/neverseentv/background.png
Binary file added minecraft_servers/neverseentv/icon.png
Binary file added minecraft_servers/neverseentv/[email protected]
34 changes: 34 additions & 0 deletions minecraft_servers/neverseentv/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"server_name": "neverseentv",
"nice_name": "Neverseentv Netwerk",
"direct_ip": "neverseentv.de",
"supported_languages": [
"de"
],
"gamemodes": {
"survival": {
"name": "SMP",
"color": "#EAF100",
"versions": "1.21",
"command": "/smp"
}
},
"social": {
"discord": "https://discord.gg/neverseen",
"youtube": "https://www.youtube.com/@neverseen_tv"
},
"brand": {
"primary": "#897edc",
"background": "#1c1c1c",
"text": "#FFFFFF"
},
"location": {
"city": "Eygelshoven",
"country": "Niederlande",
"country_code": "NL"
},
"discord": {
"server_id": 1049317898725883954,
"rename_to_minecraft_name": false
}
}
8 changes: 3 additions & 5 deletions minecraft_servers/nordichub/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,19 @@
],
"social": {
"web": "https://portal.nordichub.dk",
"web_shop": "https://butik.nordichub.dk",
"web_shop": "https://nordichubdk.tebex.io",
"discord": "https://discord.gg/t8Wwzmu67Y"
},
"gamemodes": {
"prison": {
"name": "Prison",
"color": "#389EDC",
"command": "/prison",
"versions": "1.8.9"
"command": "/prison"
},
"skyblock": {
"name": "Skyblock",
"color": "#389EDC",
"command": "/skyblock",
"versions": "1.8.9"
"command": "/skyblock"
}
},
"discord": {
Expand Down
Binary file removed minecraft_servers/northsoft/background.png
Diff not rendered.
Binary file removed minecraft_servers/northsoft/[email protected]
Diff not rendered.
Binary file removed minecraft_servers/northsoft/icon.png
Diff not rendered.
Binary file removed minecraft_servers/northsoft/[email protected]
Diff not rendered.
41 changes: 0 additions & 41 deletions minecraft_servers/northsoft/manifest.json

This file was deleted.

Binary file added minecraft_servers/opinsel/background.png
Binary file added minecraft_servers/opinsel/[email protected]
Binary file added minecraft_servers/opinsel/icon.png
Binary file added minecraft_servers/opinsel/[email protected]
17 changes: 17 additions & 0 deletions minecraft_servers/opinsel/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"server_name": "opinsel",
"nice_name": "OpInsel",
"direct_ip": "mc.opinsel.de",
"supported_languages": [
"de"
],
"social": {
"web": "https://opinsel.de",
"web_shop": "https://opinsel.de/shop",
"discord": "https://discord.gg/Mn9drhfaDQ"
},
"location": {
"country": "Germany",
"country_code": "DE"
}
}
Binary file added minecraft_servers/risingpixels/background.png
Binary file added minecraft_servers/risingpixels/icon.png
Binary file added minecraft_servers/risingpixels/[email protected]
Binary file added minecraft_servers/risingpixels/logo.png
Binary file added minecraft_servers/risingpixels/[email protected]
32 changes: 32 additions & 0 deletions minecraft_servers/risingpixels/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"server_name": "risingpixels",
"nice_name": "RisingPixels",
"direct_ip": "risingpixels.net",
"supported_languages": [
"de",
"en"
],
"social": {
"web": "https://www.risingpixels.net",
"web_support": "https://www.risingpixels.net/support",
"twitter": "rpxlsnet",
"discord": "https://discord.gg/aHvRGg4hqb",
"tiktok": "rpxlsnet",
"youtube": "https://www.youtube.com/@rpxlsnet"
},
"gamemodes": {
"luckywars": {
"name": "LuckyWars"
},
"luckyrace": {
"name": "LuckyRace"
},
"knockit": {
"name": "KnockIt"
}
},
"discord": {
"server_id": 810885141874475052,
"rename_to_minecraft_name": false
}
}
Binary file added minecraft_servers/sunrisemc/background.png
Binary file added minecraft_servers/sunrisemc/[email protected]
Binary file added minecraft_servers/sunrisemc/icon.png
Binary file added minecraft_servers/sunrisemc/[email protected]
Binary file added minecraft_servers/sunrisemc/logo.png
Loading
Loading