From 73a7772eeb55a2950e1d8c8eeae9c7f0bf456e3a Mon Sep 17 00:00:00 2001 From: NazrinNya <137837419+NazrinNya@users.noreply.github.com> Date: Thu, 10 Aug 2023 00:43:10 +0300 Subject: [PATCH 1/6] Update servers_v7.json (#8908) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 2f622b67cf..3a2154d440 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -186,7 +186,7 @@ }, { "name": "Cyandustry", - "address": ["91.218.66.162:6568"] + "address": ["n1.mindustry.me:7000","n1.mindustry.me:7500"] }, { "name": "Four Family", From 933e4e84e02af3f0d23c4e5d68fc7266db5ae845 Mon Sep 17 00:00:00 2001 From: a-big-fish-fish <111189982+a-big-fish-fish@users.noreply.github.com> Date: Thu, 10 Aug 2023 21:58:42 +0800 Subject: [PATCH 2/6] Update servers_v7.json (#8911) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 3a2154d440..f5307074f7 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -211,5 +211,9 @@ { "name": "Vanilla CroCraft", "address": ["130.61.175.47:6567"] + }, + { + "name": "xianyu", + "address": ["xyz.simpfun.cn:59901"] } ] From aa026b8b41ecea9196c54e427483c99490bd4292 Mon Sep 17 00:00:00 2001 From: a-big-fish-fish <111189982+a-big-fish-fish@users.noreply.github.com> Date: Thu, 10 Aug 2023 22:10:08 +0800 Subject: [PATCH 3/6] Update servers_v7.json (#8912) --- servers_v7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index f5307074f7..410e34c843 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -213,7 +213,7 @@ "address": ["130.61.175.47:6567"] }, { - "name": "xianyu", - "address": ["xyz.simpfun.cn:59901"] + "name": "EXtra Utilities", + "address": ["xyz.simpfun.cn:59901", "xyz.simpfun.cn:59290"] } ] From 0119e71677906f0456249fa1084a3e9cdd85012c Mon Sep 17 00:00:00 2001 From: a-big-fish-fish <111189982+a-big-fish-fish@users.noreply.github.com> Date: Thu, 10 Aug 2023 23:15:26 +0800 Subject: [PATCH 4/6] Update servers_v7.json (#8913) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 410e34c843..40d18dab6e 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -213,7 +213,7 @@ "address": ["130.61.175.47:6567"] }, { - "name": "EXtra Utilities", + "name": "Extra Utilities", "address": ["xyz.simpfun.cn:59901", "xyz.simpfun.cn:59290"] } ] From e17d89e5a8329c7cdc039804bb42aba56e1f809a Mon Sep 17 00:00:00 2001 From: Satoshi Sasaki Date: Fri, 11 Aug 2023 02:26:58 +0900 Subject: [PATCH 5/6] Fixed that the description of mech and ship was reversed (#8914) --- core/assets/bundles/bundle_ja.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 49228059e8..ddab57b0e6 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -1730,8 +1730,8 @@ block.tank-refabricator.name = 戦車再加工工場 block.mech-refabricator.name = メカ再加工工場 block.ship-refabricator.name = 戦艦再加工工場 block.tank-assembler.name = 戦車組立工場 -block.ship-assembler.name = メカ組立工場 -block.mech-assembler.name = 戦艦組立工場 +block.ship-assembler.name = 戦艦組立工場 +block.mech-assembler.name = メカ組立工場 block.reinforced-payload-conveyor.name = 強化ペイロードコンベアー block.reinforced-payload-router.name = 強化ペイロードルーター block.payload-mass-driver.name = ペイロードマスドライバー From c5a53f119b2efdc000cc8c74ae33e675d8f692b0 Mon Sep 17 00:00:00 2001 From: IqKero <140623891+IqKero@users.noreply.github.com> Date: Fri, 11 Aug 2023 16:23:02 +0200 Subject: [PATCH 6/6] add new ips and change old one (#8918) (im Taras4k, but with new account) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 40d18dab6e..a6681912d0 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -29,7 +29,7 @@ }, { "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.",