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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/assets/bundles/bundle_es.properties
This commit is contained in:
Anuken
2023-01-08 00:17:52 -05:00
parent e2fa834079 e6bfc1cee8
commit d082963167
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle_nl.properties
View File

@@ -1374,7 +1374,7 @@ block.deep-tainted-water.name = Deep Tainted Water
block.darksand-tainted-water.name = Donker Zand Vervuild Water block.darksand-tainted-water.name = Donker Zand Vervuild Water
block.tar.name = Olie block.tar.name = Olie
block.stone.name = Steen block.stone.name = Steen
block.sand-floor.name = Donker Zand block.sand-floor.name = Zand
block.darksand.name = Donker Zand block.darksand.name = Donker Zand
block.ice.name = Ijs block.ice.name = Ijs
block.snow.name = Sneeuw block.snow.name = Sneeuw

2
core/assets/bundles/bundle_pl.properties
View File

@@ -1527,7 +1527,7 @@ block.rotary-pump.name = Wirowa Pompa
block.thorium-reactor.name = Reaktor Torowy block.thorium-reactor.name = Reaktor Torowy
block.mass-driver.name = Katapulta Masy block.mass-driver.name = Katapulta Masy
block.blast-drill.name = Wybuchowe Wiertło block.blast-drill.name = Wybuchowe Wiertło
block.impulse-pump.name = Impulsywna Pompa block.impulse-pump.name = Impulsowa Pompa
block.thermal-generator.name = Generator Termalny block.thermal-generator.name = Generator Termalny
block.surge-smelter.name = Piec Mieszający block.surge-smelter.name = Piec Mieszający
block.mender.name = Naprawiacz block.mender.name = Naprawiacz

4
servers_v6.json
View File

@@ -23,10 +23,6 @@
"name": "C.A.M.S.", "name": "C.A.M.S.",
"address": ["0.baseduser.eu.org:42000", "nikochio.ddns.net"] "address": ["0.baseduser.eu.org:42000", "nikochio.ddns.net"]
}, },
{
"name": "ECAN",
"address": ["mindustry.ecansol.com:6597", "mindustry.ecansol.com:6499", "mindustry.ecansol.com:6599"]
},
{ {
"name": "Chaotic Neutral", "name": "Chaotic Neutral",
"address": ["c-n.ddns.net:1111", "c-n.ddns.net:2222", "c-n.ddns.net:3333"] "address": ["c-n.ddns.net:1111", "c-n.ddns.net:2222", "c-n.ddns.net:3333"]

16
servers_v7.json
View File

@@ -3,6 +3,10 @@
"name": "generic mindustry", "name": "generic mindustry",
"address": ["212.192.29.92:25554", "212.192.29.24:25298"] "address": ["212.192.29.92:25554", "212.192.29.24:25298"]
}, },
{
"name": "ECAN",
"address": ["mindustry.ecansol.com:6597", "mindustry.ecansol.com:6499", "mindustry.ecansol.com:6599"]
},
{ {
"name": "Mindustry Español", "name": "Mindustry Español",
"address": ["mes.xpdustry.fr"] "address": ["mes.xpdustry.fr"]
@@ -12,8 +16,8 @@
"address": ["smokeofanarchy.ru, backup.smokeofanarchy.ru"] "address": ["smokeofanarchy.ru, backup.smokeofanarchy.ru"]
}, },
{ {
"name": "mindustry.pl", "name": "Mindustry.pl",
"address": ["0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000", "1.baseduser.eu.org:6966", "1.baseduser.eu.org:6666", "1.baseduser.eu.org:6000"] "address": ["78.46.100.178", "0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000", "1.baseduser.eu.org:6966", "1.baseduser.eu.org:6666", "1.baseduser.eu.org:6000"]
}, },
{ {
"name": "SynapseOS", "name": "SynapseOS",
@@ -37,7 +41,7 @@
}, },
{ {
"name": "Omega Hub", "name": "Omega Hub",
"address": ["n7.mindustry.me", "n7.mindustry.me:6570", "n1.mindustry.me:6568", "n1.mindustry.me:6570", "n1.mindustry.me:6571", "n1.mindustry.me:6573", "n1.mindustry.me", "n1.mindustry.me:6599", "n1.mindustry.me:6774", "n1.mindustry.me:6608", "n1.mindustry.me:6572"] "address": ["omegahub.xyz", "rush.omegahub.xyz", "annexation.omegahub.xyz", "2r2t.omegahub.xyz", "3r3t.omegahub.xyz", "campaign.omegahub.xyz", "rapid.omegahub.xyz", "survivalattack.omegahub.xyz", "castlewars.omegahub.xyz", "skyblock.omegahub.xyz", "skywarsranked.omegahub.xyz", "colonization.omegahub.xyz"]
}, },
{ {
"name": "KMWStudios", "name": "KMWStudios",
@@ -85,7 +89,7 @@
}, },
{ {
"name": "The Devil", "name": "The Devil",
"address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936"] "address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936", "n2.akiracloud.net:10404"]
}, },
{ {
"name": "Eradicationdustry", "name": "Eradicationdustry",
@@ -118,5 +122,9 @@
{ {
"name": "|RussianServers|[]", "name": "|RussianServers|[]",
"address": ["2p2g.ml:6568","2p2g.ml:6569","2p2g.ml:6570","2p2g.ml:6571","2p2g.ml:6572","2p2g.ml:6573"] "address": ["2p2g.ml:6568","2p2g.ml:6569","2p2g.ml:6570","2p2g.ml:6571","2p2g.ml:6572","2p2g.ml:6573"]
},
{
"name": "Hungarian",
"address": ["play.hudustry.tk"]
} }
] ]