Skip to content

Commit 718ef87

Browse files
ShonP40ShonP40
authored
Merge branch 'master' into add-cave
2 parents 019c78e + e6bd9f2 commit 718ef87

File tree

15 files changed

+224
-44
lines changed

15 files changed

+224
-44
lines changed

‎mappings/index.json‎

Lines changed: 170 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -296,15 +296,83 @@
296296
},
297297
"inactive": false
298298
},
299+
{
300+
"id": "electronnetwork",
301+
"name": "Electron Network",
302+
"description": "A unique PVP server with HCF, PVP and minigames.",
303+
"addresses": [
304+
"electronmc.club"
305+
],
306+
"primaryAddress": "electronmc.club",
307+
"primaryColor": "#AA00AA",
308+
"secondaryColor": "#AAAAAA",
309+
"primaryLanguage": "en",
310+
"languages": [
311+
"en"
312+
],
313+
"minecraftVersions": [
314+
"1.7.10",
315+
"1.7",
316+
"1.8.9",
317+
"1.8"
318+
],
319+
"primaryMinecraftVersion": "1.8.9",
320+
"primaryRegion": "EU",
321+
"regions": [
322+
"EU"
323+
],
324+
"gameTypes": [
325+
"HCF",
326+
"PVP",
327+
"Minigames"
328+
],
329+
"website": "https://www.electronmc.club/",
330+
"store": "https://store.electronmc.club/",
331+
"socials": {
332+
"discord": "https://dsc.gg/electronmc",
333+
"youtube": "ElectronNetwork",
334+
"twitter": "ElectronNetMC"
335+
},
336+
"inactive": false
337+
},
338+
{
339+
"id": "elevatemc",
340+
"name": "ElevateMC Network",
341+
"website": "https://elevatemc.com/",
342+
"store": "https://store.elevatemc.com/",
343+
"addresses": [
344+
"elevatemc.com"
345+
],
346+
"primaryAddress": "elevatemc.com",
347+
"primaryColor": "#494949",
348+
"secondaryColor": "#1BDDCB",
349+
"minecraftVersions": [
350+
"1.7.10",
351+
"1.7",
352+
"1.8.9",
353+
"1.8"
354+
],
355+
"primaryMinecraftVersion": "1.8.9",
356+
"gameTypes": [
357+
"PvP"
358+
],
359+
"socials": {
360+
"twitter": "ElevateMCNet",
361+
"discord": "https://discord.com/invite/GkqtzCYCvF",
362+
"telegram": "ElevateMC"
363+
},
364+
"inactive": false
365+
},
299366
{
300367
"id": "ezpvp",
301368
"name": "EzPvP Network",
302369
"description": "KitPvP Network in Europe",
303370
"addresses": [
371+
"ezpvp.org",
304372
"ezpvp.lol",
305373
"jamals.lol"
306374
],
307-
"primaryAddress": "ezpvp.lol",
375+
"primaryAddress": "ezpvp.org",
308376
"minecraftVersions": [
309377
"1.7.10",
310378
"1.7",
@@ -314,9 +382,9 @@
314382
"primaryMinecraftVersion": "1.8.9",
315383
"primaryColor": "#AF15CA",
316384
"secondaryColor": "#FFFFFF",
317-
"primaryLanguage": "en",
385+
"primaryLanguage": "it",
318386
"languages": [
319-
"en"
387+
"it"
320388
],
321389
"primaryRegion": "EU",
322390
"regions": [
@@ -689,24 +757,20 @@
689757
"inactive": false
690758
},
691759
{
692-
"id": "potpvpnetwork",
693-
"name": "PotPvP Network",
694-
"website": "https://www.potpvp.com/",
695-
"store": "https://store.potpvp.com/",
696-
"description": "Competitive Minecraft PvP Network",
760+
"id": "protocolnetwork",
761+
"name": "Protocol Network",
762+
"description": "Where the best players play",
697763
"addresses": [
698-
"potpvp.com",
699-
"skylandkits.net",
700-
"bridge.rip"
764+
"protocol.rip"
701765
],
702-
"primaryAddress": "potpvp.com",
766+
"primaryAddress": "protocol.rip",
703767
"minecraftVersions": [
704768
"1.7.10",
705769
"1.8.9"
706770
],
707771
"primaryMinecraftVersion": "1.7.10",
708-
"primaryColor": "#f7b204",
709-
"secondaryColor": "#ffffff",
772+
"primaryColor": "#f26151",
773+
"secondaryColor": "#6a2338",
710774
"primaryLanguage": "en",
711775
"languages": [
712776
"en"
@@ -717,47 +781,90 @@
717781
],
718782
"gameTypes": [
719783
"PvP",
784+
"HCF",
720785
"UHC"
721786
],
787+
"website": "https://protocol.rip/",
788+
"store": "https://protocol.rip/store/",
722789
"socials": {
723-
"twitter": "PotPvPServer",
724-
"discord": "https://discord.gg/PotPvP",
725-
"telegram": "PotPvP"
790+
"discord": "https://discord.com/invite/eG2NS9XS"
726791
},
727792
"inactive": false
728793
},
729794
{
730-
"id": "protocolnetwork",
731-
"name": "Protocol Network",
732-
"description": "Where the best players play",
795+
"id": "scalanetwork",
796+
"name": "Scala Network",
797+
"website": "https://www.scala.gg/",
798+
"store": "https://store.scala.gg/",
799+
"description": "Competitive Minecraft PvP Network",
733800
"addresses": [
734-
"protocol.rip"
801+
"scala.gg",
802+
"potpvp.com",
803+
"esta.land"
735804
],
736-
"primaryAddress": "protocol.rip",
805+
"primaryAddress": "scala.gg",
737806
"minecraftVersions": [
738807
"1.7.10",
739808
"1.8.9"
740809
],
741-
"primaryMinecraftVersion": "1.7.10",
742-
"primaryColor": "#f26151",
743-
"secondaryColor": "#6a2338",
810+
"primaryMinecraftVersion": "1.8.9",
811+
"primaryColor": "#f7b204",
812+
"secondaryColor": "#ffffff",
744813
"primaryLanguage": "en",
745814
"languages": [
746815
"en"
747816
],
748817
"primaryRegion": "NA",
749818
"regions": [
750-
"NA"
819+
"NA",
820+
"EU"
751821
],
752822
"gameTypes": [
753823
"PvP",
754-
"HCF",
824+
"Minigames",
755825
"UHC"
756826
],
757-
"website": "https://protocol.rip/",
758-
"store": "https://protocol.rip/store/",
759827
"socials": {
760-
"discord": "https://discord.com/invite/eG2NS9XS"
828+
"twitter": "ScalaStudios",
829+
"discord": "https://discord.gg/PotPvP",
830+
"telegram": "ScalaStudios"
831+
},
832+
"inactive": false
833+
},
834+
{
835+
"id": "slyce",
836+
"name": "Slyce",
837+
"description": "Competitive Mini-Game Network",
838+
"addresses": [
839+
"slycemc.eu",
840+
"slycemc.com",
841+
"slyce.fr"
842+
],
843+
"primaryAddress": "play.slyce.fr",
844+
"minecraftVersions": [
845+
"1.8.9",
846+
"1.8"
847+
],
848+
"primaryLanguage": "en",
849+
"languages": [
850+
"en",
851+
"fr"
852+
],
853+
"primaryRegion": "EU",
854+
"regions": [
855+
"EU"
856+
],
857+
"primaryMinecraftVersion": "1.8.9",
858+
"primaryColor": "#f29001",
859+
"secondaryColor": "#6d617d",
860+
"gameTypes": [
861+
"PvP",
862+
"Minigames"
863+
],
864+
"website": "https://www.slyce.fr/",
865+
"socials": {
866+
"twitter": "slycemc",
867+
"discord": "https://discord.com/invite/r9zEakVkxt"
761868
},
762869
"inactive": false
763870
},
@@ -895,6 +1002,39 @@
8951002
},
8961003
"inactive": false
8971004
},
1005+
{
1006+
"id": "vanicnetwork",
1007+
"name": "Vanic Network",
1008+
"description": "Home of the largest Competitive UHC",
1009+
"addresses": [
1010+
"vanic.gg"
1011+
],
1012+
"primaryAddress": "vanic.gg",
1013+
"minecraftVersions": [
1014+
"1.7.10",
1015+
"1.8.9"
1016+
],
1017+
"primaryMinecraftVersion": "1.7.10",
1018+
"primaryColor": "#6ea3d2",
1019+
"secondaryColor": "#454545",
1020+
"primaryLanguage": "en",
1021+
"languages": [
1022+
"en"
1023+
],
1024+
"primaryRegion": "NA",
1025+
"regions": [
1026+
"NA"
1027+
],
1028+
"gameTypes": [
1029+
"PvP",
1030+
"UHC"
1031+
],
1032+
"socials": {
1033+
"twitter": "vanicfeed",
1034+
"discord:": "https://discord.gg/vanicmc"
1035+
},
1036+
"inactive": false
1037+
},
8981038
{
8991039
"id": "veltpvpnetwork",
9001040
"name": "VeltPvP",

‎mappings/servers/electronnetwork/discord.png‎

405 KB
Loading

‎mappings/servers/electronnetwork/icon.png‎

10.8 KB
Loading

‎mappings/servers/electronnetwork/logo.png‎

19.9 KB
Loading

‎mappings/servers/electronnetwork/metadata.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"id": "electronnetwork",
3+
"name": "Electron Network",
4+
"description": "A unique PVP server with HCF, PVP and minigames.",
5+
"addresses": [
6+
"electronmc.club"
7+
],
8+
"primaryAddress": "electronmc.club",
9+
"primaryColor": "#AA00AA",
10+
"secondaryColor": "#AAAAAA",
11+
"primaryLanguage": "en",
12+
"languages": [
13+
"en"
14+
],
15+
"minecraftVersions": [
16+
"1.7.*",
17+
"1.8.*"
18+
],
19+
"primaryMinecraftVersion": "1.8.9",
20+
"primaryRegion": "EU",
21+
"regions": [
22+
"EU"
23+
],
24+
"gameTypes": [
25+
"HCF",
26+
"PVP",
27+
"Minigames"
28+
],
29+
"website": "https://www.electronmc.club/",
30+
"store": "https://store.electronmc.club/",
31+
"socials": {
32+
"discord": "https://dsc.gg/electronmc",
33+
"youtube": "ElectronNetwork",
34+
"twitter": "ElectronNetMC"
35+
}
36+
}

‎mappings/servers/ezpvp/metadata.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@
33
"name": "EzPvP Network",
44
"description": "KitPvP Network in Europe",
55
"addresses": [
6+
"ezpvp.org",
67
"ezpvp.lol",
78
"jamals.lol"
89
],
9-
"primaryAddress": "ezpvp.lol",
10+
"primaryAddress": "ezpvp.org",
1011
"minecraftVersions": [
1112
"1.7.*",
1213
"1.8.*"
1314
],
1415
"primaryMinecraftVersion": "1.8.9",
1516
"primaryColor": "#AF15CA",
1617
"secondaryColor": "#FFFFFF",
17-
"primaryLanguage": "en",
18+
"primaryLanguage": "it",
1819
"languages": [
19-
"en"
20+
"it"
2021
],
2122
"primaryRegion": "EU",
2223
"regions": [

‎mappings/servers/potpvpnetwork/discord.png‎

-259 KB
Binary file not shown.

‎mappings/servers/potpvpnetwork/icon.png‎

-10.7 KB
Binary file not shown.

‎mappings/servers/potpvpnetwork/logo.png‎

-18 KB
Binary file not shown.

‎mappings/servers/scalanetwork/discord.png‎

75.6 KB
Loading

0 commit comments

Comments
 (0)