Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2024-01-05 08:22:21 -05:00
parent 61945e5ce7 9d62bd0422
commit ad746938a7
4 changed files with 662 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle_hu.properties
+647 -646
View File
File diff suppressed because it is too large Load Diff
core/assets/contributors
+1
View File
@@ -160,5 +160,6 @@ WayZer
SITUVNgcd SITUVNgcd
Gabriel "red" Fondato Gabriel "red" Fondato
Yoru Kitsune Yoru Kitsune
summoner
OpalSoPL OpalSoPL
BalaM314 BalaM314
core/assets/maps/basin.msav
BIN
View File
Binary file not shown.
servers_v7.json
+14 -6
View File
@@ -13,11 +13,11 @@
}, },
{ {
"name": "Crux's Revelations", "name": "Crux's Revelations",
"address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35160", "de-prem-01.hosts.optikservers.com:35116", "de-prem-01.hosts.optikservers.com:35922"] "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"]
}, },
{ {
"name": "CMS", "name": "CMS Empire",
"address": ["195.2.84.144","65.108.224.31:26165"] "address": ["195.2.84.144","178.20.45.250"]
}, },
{ {
"name": "ShardDustry Eventos", "name": "ShardDustry Eventos",
@@ -25,7 +25,7 @@
}, },
{ {
"name": "ShardDustry ES", "name": "ShardDustry ES",
"address": ["94.130.132.149:35689","94.130.132.149:35438","45.158.9.198:31290","45.158.9.198:30529"] "address": ["94.130.132.149:35689","94.130.132.149:35438","45.158.9.198:31290","45.158.9.198:30529","94.130.132.149:35116","94.130.132.149:35160"]
}, },
{ {
"name": "Tamazia", "name": "Tamazia",
@@ -77,7 +77,7 @@
}, },
{ {
"name": "KMWStudios", "name": "KMWStudios",
"address": ["x.kmwstudios.xyz:9000", "x.kmwstudios.xyz:9002", "x.kmwstudios.xyz:9003", "x.kmwstudios.xyz:9004", "x.kmwstudios.xyz:9005", "x.kmwstudios.xyz:9006", "x.kmwstudios.xyz:9007"] "address": ["mind.kmwstudios.xyz:28101", "mind.kmwstudios.xyz:28102", "mind.kmwstudios.xyz:28103", "mind.kmwstudios.xyz:28104", "mind.kmwstudios.xyz:28105", "mind.kmwstudios.xyz:28106", "mind.kmwstudios.xyz:28107"]
}, },
{ {
"name": "XCore", "name": "XCore",
@@ -210,7 +210,7 @@
}, },
{ {
"name": "Cyandustry", "name": "Cyandustry",
"address": ["94.130.89.220:7000","94.130.89.220:7001", "94.130.89.220:7002", "94.130.89.220:7003", "94.130.89.220:7004", "94.130.89.220:7005", "94.130.89.220:7006"] "address": ["94.130.89.220:7000","94.130.89.220:7001", "94.130.89.220:7002", "94.130.89.220:7003", "94.130.89.220:7004", "94.130.89.220:7005", "94.130.89.220:7006", "94.130.89.220:7007", "94.130.89.220:7008"]
}, },
{ {
"name": "Four Family", "name": "Four Family",
@@ -267,5 +267,13 @@
{ {
"name": "Gadgetroch's Server", "name": "Gadgetroch's Server",
"address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568"] "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568"]
},
{
"name": "Duel.Server"
"address":["160.251.41.148:6568","160.251.41.148:6569"]
},
{
"name": "AZDustry",
"address": ["118.127.8.162:25628"]
} }
] ]