From 5b652ae51fc2716d777bbb18f9977910d9044114 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 22 Feb 2021 09:04:22 -0500 Subject: [PATCH 1/4] Added guidelines for inappropriate server content --- SERVERLIST.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SERVERLIST.md b/SERVERLIST.md index 83aa15a3d7..bef8443c8d 100644 --- a/SERVERLIST.md +++ b/SERVERLIST.md @@ -6,16 +6,17 @@ This is done by letting clients `GET` a [JSON list of servers](https://github.co You may want to add your server to this list. The steps for getting this done are as follows: 1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well. -You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins. +You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins. *Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example. -2. **Set an appropriate MOTD, name and description.** This is set with `config `. "Appropriate" means that: +2. Make sure that your server is able to handle inappropriate content - this includes NSFW display/sorter art and abusive messages. **Servers that allow such content will be removed immediately.** Consider banning display blocks if it is a problem for your server: `rules add bannedBlocks ["logic-display", "large-logic-display"]`. +3. **Set an appropriate MOTD, name and description.** This is set with `config `. "Appropriate" means that: - Your name or description must reflect the type of server you're hosting. Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt. - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you. - Try to be professional in your text; use common sense. -3. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option. -4. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`). -5. Finally, **submit a pull request** to add your server's IP to the list. +4. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option. +5. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`). +6. Finally, **submit a pull request** to add your server's IP to the list. This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json), then add a JSON object with a single key, indicating your server address. For example, if your server address is `google.com`, you would add a comma after the last entry and insert: ```json From 3b2a0cfd66d7eddf5266fafb5b75f75847e1f9fe Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 22 Feb 2021 09:05:27 -0500 Subject: [PATCH 2/4] Removed RCR due to lack of moderation --- servers_v6.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 432553f84c..54f1691e0f 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -1,8 +1,4 @@ -[ - { - "name": "RCR", - "address": ["rcr.fvds.ru"] - }, +[ { "name": "mindustry.pl", "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl"] From dbdfdac94baea58d0c51af6d72252c6112599c3f Mon Sep 17 00:00:00 2001 From: Sharlotte <60801210+Sharlottes@users.noreply.github.com> Date: Mon, 22 Feb 2021 23:19:46 +0900 Subject: [PATCH 3/4] translated yesterday update (#4755) * translated newest bundle updates * ps. why did i forgot https://github.com/Anuken/Mindustry/commit/1ef7ae70796beb4a28dee8f2c74b626d28348481#diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c this commit previous translation update? --- core/assets/bundles/bundle_ko.properties | 27 ++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 46cd9f857f..d4ebba340b 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -9,7 +9,7 @@ link.changelog.description = 업데이트 내용 목록 link.dev-builds.description = 불안정한 개발 버전 link.trello.description = 출시 예정 기능 계획을 게시한 공식 Trello 보드 link.itch.io.description = PC 다운로드가 있는 itch.io 페이지 -link.google-play.description = Google Play 스토어 목록 +link.google-play.description = oogle Play 스토어 목록 link.f-droid.description = F-Droid 카탈로그 목록 link.wiki.description = 공식 Mindustry 위키 link.suggestions.description = 새 기능 제안하기 @@ -1537,12 +1537,30 @@ lst.unitcontrol = 현재 지정된 유닛을 조종하기 lst.unitradar = 현재 지정된 유닛 주변의 유닛 검색하기 lst.unitlocate = 특정 유형의 위치/건물을 지도상에서 찾기\n지정된 유닛이 필요합니다. -lenum.type = 건물/유닛의 타입\n예로 분배기는 [accent]@router[]를 반환할 것입니다.\n문자열이 아니라. +logic.nounitbuild = [red]유닛의 건물 로직은 여기서 허용되지 않습니다. + +lenum.type = 건물/유닛의 타입\n예로 분배기는 문자열이 아니라 [accent]@router[]를 반환합니다. lenum.shoot = 특정 위치에 발사 lenum.shootp = 목표물 속도를 예측하여 발사 lenum.configure = 필터의 아이템같은 건물의 설정 lenum.enabled = 블록의 활성 여부 + lenum.color = 조명 색 설정 +laccess.controller = 유닛 제어자. 프로세서가 제어하면, 프로세서를 반환합니다.\n다른 유닛에 의해 지휘되면(G키), 지휘하는 유닛을 반환합니다.\n그 외에는 자신을 반환합니다. +laccess.dead = 유닛 또는 건물 사망/무효 여부 +laccess.controlled = 만약 유닛 제어자가 프로세서라면 [accent]@contProcessor[]를 반환합니다.\n만약 유닛/건물 제어자가 플레이어라면 [accent]@contPlayer[]를 반환합니다.\n만약 유닛이 다른 유닛에 의해 지휘되면(G키)[accent]@contFormation[]를 반환합니다.\n그 외에는 0을 반환합니다. +laccess.commanded = [red]이제 사용되지 않으며, 곧 제거될 예정입니다![]\대신 [accent]controlled[]를 사용하세요. + +graphicstype.clear = 이 색으로 화면을 채우기 +graphicstype.color = 아래 그래픽 실행문들의 색 설정하기 +graphicstype.stroke = 선 굵기 설정하기 +graphicstype.line = 선분 그리기 +graphicstype.rect = 직사각형 채우기 +graphicstype.linerect = 직사각형 외곽선 그리기 +graphicstype.poly = 정다각형 채우기 +graphicstype.linepoly = 정다각형 외곽선 그리기 +graphicstype.triangle = 삼각형 채우기 +graphicstype.image = 일부 콘텐츠의 이미지 그리기\n예: [accent]@router[] 또는 [accent]@dagger[]. lenum.always = 항상 참 lenum.idiv = 정수 나누기 @@ -1567,7 +1585,7 @@ lenum.sin = 사인(도) lenum.cos = 코사인(도) lenum.tan = 탄젠트(도) #not a typo, look up 'range notation' -lenum.rand = 범위 내 난수[0 ~ 값) +lenum.rand = 범위 내 십진법 난수[0 ~ 값) lenum.log = 자연 로그(진수) lenum.log10 = 상수 로그 lenum.noise = 2D 심플렉스 노이즈 @@ -1597,7 +1615,7 @@ lenum.rally = 지휘소 lenum.battery = 배터리 lenum.resupply = 보급 지점.\n[accent]"유닛 탄약 필요"[]가 활성화되었을 때만 유의미합니다. lenum.reactor = 핵융합로/토륨 원자로 -lenum.turret = 포탑ㅁ +lenum.turret = 포탑 sensor.in = 감지할 건물/유닛 @@ -1625,6 +1643,7 @@ unitlocate.outx = X좌표 unitlocate.outy = Y좌표 unitlocate.group = 찾을 건물 집단 +lenum.idle = 채광/건설 제외 이동만 중단\n기본 상태입니다. lenum.stop = 이동/채광/건설 중단 lenum.move = 특정 위치로 이동 lenum.approach = 특정 위치로 반지름만큼 접근 From d06a7bb7a246e95f3c5b6ab289f06075711b397c Mon Sep 17 00:00:00 2001 From: UnCaughT Date: Mon, 22 Feb 2021 18:09:55 +0300 Subject: [PATCH 4/4] Update servers_v6.json (#4756) The server now has a new domain. --- servers_v6.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 54f1691e0f..e40885d0f1 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -64,8 +64,8 @@ "address": ["mindustry.kr"] }, { - "name": "HexPvP", - "address": ["hexpvp.ddns.net"] + "name": "hexpvp.ml", + "address": ["hexpvp.ml"] }, { "name": "Omega",