From f38a6ed7f59fe811ce8170fb124a0dc6429bb385 Mon Sep 17 00:00:00 2001 From: router Date: Sat, 28 Oct 2023 16:32:03 +0300 Subject: [PATCH 1/5] Update bundle_ru attributions (#9205) * Update bundle_ru attributions i don't think anyone calls me by my old alias anymore * Update bundle_ru.properties --- core/assets/bundles/bundle_ru.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 3d3fdba4b6..77cb9ed498 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -1,4 +1,4 @@ -credits.text = Создатель [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в оф. русский [accent]discord-сервер Mindustry[].\n\nРедакторы и переводчики на русский язык:\n[blue]Prosta4ok_ua[green]#[yellow]6336\n[darkgray]XZimur[]\n[#30FF30]Beryllium\n[tan]Félix [slate]Córvus\n[orange]Vanguard\n[#a00000]Slotterleet[]\n[unlaunched]Даркнесс#3729[]\n[white]lucin#0949[] +credits.text = Создатель [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в оф. русский [accent]discord-сервер Mindustry[].\n\nРедакторы и переводчики на русский язык:\n[blue]Prosta4ok_ua[green]#[yellow]6336\n[darkgray]XZimur[]\n[lightgray]routerchain\n[tan]Félix [slate]Córvus\n[orange]Vanguard\n[#a00000]Slotterleet[]\n[unlaunched]inflexibledarkness[]\n[white]lucin#0949[] credits = Авторы contributors = Переводчики и помощники discord = Присоединяйтесь к нашему Discord! From 17978f736f83f4668170da72e86ae97de552aa6c Mon Sep 17 00:00:00 2001 From: lemon3357 <126368248+lemon3357@users.noreply.github.com> Date: Sat, 28 Oct 2023 21:32:12 +0800 Subject: [PATCH 2/5] Update servers_v7.json (#9204) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 2f2c7756a3..1dd284b022 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -193,7 +193,7 @@ }, { "name": "Realm of Serene Lime", - "address": ["43.248.116.142:10627","n2.akiracloud.net:10686","n2.akiracloud.net:10486", "p12.simpfun.cn:8654"] + "address": ["43.248.116.142:10627","n2.akiracloud.net:10686","n2.akiracloud.net:10486", "p12.simpfun.cn:8654", "n2.akiracloud.net:10385"] }, { "name": "CreateDustry", From af20ea56054d8a57256ce975c34d80a22028a191 Mon Sep 17 00:00:00 2001 From: meiqiu <119494143+MEIQIUawa@users.noreply.github.com> Date: Sun, 29 Oct 2023 06:55:03 +0800 Subject: [PATCH 3/5] Update servers_v7.json (#9211) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 1dd284b022..d171c394ef 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,7 +1,7 @@ [ { "name": "meiqiuMDT", - "address": ["43.248.103.156:14740","211.101.236.94:10000","bj-1.lcf.icu:10240"] + "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240"] }, { "name": "CMS", From 44757f0cb4ca127cdf903d09c6794ce39d144dc2 Mon Sep 17 00:00:00 2001 From: meiqiu <119494143+MEIQIUawa@users.noreply.github.com> Date: Sun, 29 Oct 2023 23:19:53 +0800 Subject: [PATCH 4/5] Update servers_v7.json (#9214) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index d171c394ef..b849e86849 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,7 +1,7 @@ [ { "name": "meiqiuMDT", - "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240"] + "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240","play.simpfun.cn:14523"] }, { "name": "CMS", From 270c7845b8e97390692c78c2bd0b2230213861bd Mon Sep 17 00:00:00 2001 From: NazrinNya <137837419+NazrinNya@users.noreply.github.com> Date: Sun, 29 Oct 2023 20:57:22 +0300 Subject: [PATCH 5/5] Update servers_v7.json (#9215) * Update servers_v7.json * Update servers_v7.json * Update servers_v7.json --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index b849e86849..0e089bfb37 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -210,7 +210,7 @@ }, { "name": "Cyandustry", - "address": ["136.243.14.186:7000","136.243.14.186:7001", "136.243.14.186:7002", "136.243.14.186:7003", "136.243.14.186:7004", "136.243.14.186:7005", "136.243.14.186:7006"] + "address": ["88.99.95.188:7000","88.99.95.188:7001", "88.99.95.188:7002", "88.99.95.188:7003", "88.99.95.188:7004", "88.99.95.188:7005", "88.99.95.188:7006"] }, { "name": "Four Family",