Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2023-08-11 11:54:26 -04:00
2 changed files with 8 additions and 4 deletions
+2 -2
View File
@@ -1730,8 +1730,8 @@ block.tank-refabricator.name = 戦車再加工工場
block.mech-refabricator.name = メカ再加工工場 block.mech-refabricator.name = メカ再加工工場
block.ship-refabricator.name = 戦艦再加工工場 block.ship-refabricator.name = 戦艦再加工工場
block.tank-assembler.name = 戦車組立工場 block.tank-assembler.name = 戦車組立工場
block.ship-assembler.name = メカ組立工場 block.ship-assembler.name = 戦艦組立工場
block.mech-assembler.name = 戦艦組立工場 block.mech-assembler.name = メカ組立工場
block.reinforced-payload-conveyor.name = 強化ペイロードコンベアー block.reinforced-payload-conveyor.name = 強化ペイロードコンベアー
block.reinforced-payload-router.name = 強化ペイロードルーター block.reinforced-payload-router.name = 強化ペイロードルーター
block.payload-mass-driver.name = ペイロードマスドライバー block.payload-mass-driver.name = ペイロードマスドライバー
+6 -2
View File
@@ -29,7 +29,7 @@
}, },
{ {
"name": "Untitled Mindustry Servers", "name": "Untitled Mindustry Servers",
"address": ["45.144.66.250:6567", "45.144.66.250:6501"] "address": ["45.144.66.250:6567", "45.144.66.250:6601", "45.144.66.250:6611"]
}, },
{ {
"name": "C.A.M.S.", "name": "C.A.M.S.",
@@ -186,7 +186,7 @@
}, },
{ {
"name": "Cyandustry", "name": "Cyandustry",
"address": ["91.218.66.162:6568"] "address": ["n1.mindustry.me:7000","n1.mindustry.me:7500"]
}, },
{ {
"name": "Four Family", "name": "Four Family",
@@ -211,5 +211,9 @@
{ {
"name": "Vanilla CroCraft", "name": "Vanilla CroCraft",
"address": ["130.61.175.47:6567"] "address": ["130.61.175.47:6567"]
},
{
"name": "Extra Utilities",
"address": ["xyz.simpfun.cn:59901", "xyz.simpfun.cn:59290"]
} }
] ]