diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index da4762e3b2..223bf3e367 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -57,6 +57,7 @@ text.sector.resume=Resume text.sector.unlocked=Sector completed! text.sector.locked=[scarlet][[Incomplete] text.sector.unexplored=[accent][[Unexplored] +text.close=Close text.quit=Quit text.maps=Maps text.maps.none=[LIGHT_GRAY]No maps found! @@ -79,9 +80,6 @@ text.server.kicked.nameInUse=There is someone with that name\nalready on this se text.server.kicked.nameEmpty=Your name must contain at least one character or number. text.server.kicked.idInUse=You are already on this server! Connecting with two accounts is not permitted. text.server.kicked.customClient=This server does not support custom builds. Download an official version. -text.server.connected={0} has joined. -text.server.disconnected={0} has disconnected. -text.nohost=Can't host server on a custom map! text.host.info=The [accent]host[] button hosts a server on ports [scarlet]6567[] and [scarlet]6568.[]\nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. text.join.info=Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[LIGHT_GRAY]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP. text.hostserver=Host Server @@ -92,7 +90,6 @@ text.hosts.discovering=Discovering LAN games text.server.refreshing=Refreshing server text.hosts.none=[lightgray]No LAN games found! text.host.invalid=[scarlet]Can't connect to host. -text.server.friendlyfire=Friendly Fire text.trace=Trace Player text.trace.playername=Player name: [accent]{0} text.trace.ip=IP: [accent]{0} diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 78b1bf4794..c77d8c4232 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -18,9 +18,6 @@ text.players.single={0} Spieler online text.server.mismatch=Paketfehler: Mögliche Client / Server-Version stimmt nicht überein. Stell sicher, dass du und der Host die neueste Version von Mindustry haben! text.server.kicked.kick=Du wurdest vom Server gekickt! text.server.kicked.invalidPassword=Falsches Passwort. -text.server.connected={0} ist beigetreten -text.server.disconnected={0} hat die Verbindung getrennt. -text.nohost=Server kann nicht auf einer benutzerdefinierten Karte gehostet werden! text.hostserver=Server hosten text.host=Host text.hosting=[accent] Server wird geöffnet... @@ -224,7 +221,6 @@ text.deconstruction=You've just selected [accent]block deconstruction mode[].\n\ text.showagain=Don't show again next session text.unlocks=Unlocks text.addplayers=Add/Remove Players -text.newgame=New Game text.maps=Maps text.maps.none=[LIGHT_GRAY]No maps found! text.unlocked=New Block Unlocked! @@ -241,7 +237,6 @@ text.server.kicked.idInUse=You are already on this server! Connecting with two a text.server.kicked.customClient=This server does not support custom builds. Download an official version. text.host.info=The [accent]host[] button hosts a server on ports [scarlet]6567[] and [scarlet]6568.[]\nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. text.join.info=Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[LIGHT_GRAY]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP. -text.server.friendlyfire=Friendly Fire text.trace=Trace Player text.trace.playername=Player name: [accent]{0} text.trace.ip=IP: [accent]{0} @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index a8136b7ead..0342feb773 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -21,7 +21,6 @@ text.level.mode=Modo de juego: text.savegame=Guardar Partida text.loadgame=Cargar Partida text.joingame=Unirse a una Partida -text.newgame=Nueva Partida text.quit=Salir text.about.button=Acerca de text.name=Nombre @@ -35,9 +34,6 @@ text.server.kicked.clientOutdated=Cliente desactualizado ¡Actualiza tu juego! text.server.kicked.serverOutdated=Servidor desactualizado ¡Pidele actualizar al anfitrión! text.server.kicked.banned=Tu entrada está prohibida en este servidor. text.server.kicked.recentKick=Has sido echado recientemente.\nEspera antes de conectarte de nuevo. -text.server.connected=se ha unido. -text.server.disconnected=se ha desconectado -text.nohost=¡No se puede alojar el servidor en un mapa personalizado! text.host.info=El botón [acento] host [] aloja un servidor en los puertos [escarlata] 6567 [] y [escarlata] 6568. [] Cualquiera en el mismo [LIGHT_GRAY] wifi o red local [] debería poder ver su servidor en su servidor lista. Si desea que las personas puedan conectarse desde cualquier lugar mediante IP, se requiere [acento] reenvío de puerto []. [LIGHT_GRAY] Nota: Si alguien tiene problemas para conectarse a su juego LAN, asegúrese de haber permitido a Mindustry el acceso a su red local en la configuración de su firewall. text.join.info=Aquí puede ingresar un servidor [acento] IP [] para conectarse, o descubrir servidores de [acento] red local [] para conectarse. Tanto el modo multijugador LAN como WAN son compatibles. [LIGHT_GRAY] Nota: no hay una lista de servidores global automática; si desea conectarse con alguien por IP, deberá solicitar al host su IP. text.hostserver=Hostear servidor @@ -48,7 +44,6 @@ text.hosts.discovering=Descubriendo juegos en LAN text.server.refreshing=Servidor refrescante text.hosts.none=[lightgray] ¡No se encontraron juegos LAN! text.host.invalid=[escarlata] No se puede conectar al host. -text.server.friendlyfire=Fuego amigo text.trace=Rastro del jugador text.trace.playername=Nombre del jugador: [acento] {0} text.trace.ip=IP: [acento] {0} @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 4d29faf7f7..c4d1a6238c 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -22,9 +22,6 @@ text.server.kicked.invalidPassword=Mot de passe non valide ! text.server.kicked.clientOutdated=Client dépassé! Mettez à jour votre jeu! text.server.kicked.serverOutdated=Serveur dépassé! Demandez à l'hôte de le mettre à jour! text.server.kicked.banned=Vous êtes banni sur ce serveur. -text.server.connected=a rejoint le serveur -text.server.disconnected={0} s'est déconnecté. -text.nohost=Impossible d'héberger le serveur sur une carte personnalisée! text.hostserver=Héberger un serveur text.host=Héberger text.hosting=[accent]Ouverture du serveur ... @@ -33,7 +30,6 @@ text.hosts.discovering=Recherche de parties LAN text.server.refreshing=Actualisation du serveur text.hosts.none=[lightgray]Aucun jeu LAN trouvé! text.host.invalid=[scarlet]Impossible de se connecter à l'hôte. -text.server.friendlyfire=Tir allié text.trace=suivre le joueur text.trace.playername=Nom du joueur: [accent] {0} text.trace.ip=IP: [accent] {0} @@ -268,7 +264,6 @@ text.deconstruction=You've just selected [accent]block deconstruction mode[].\n\ text.showagain=Don't show again next session text.unlocks=Unlocks text.addplayers=Add/Remove Players -text.newgame=New Game text.maps=Maps text.maps.none=[LIGHT_GRAY]No maps found! text.unlocked=New Block Unlocked! @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index b4c7f1e2a4..fe8a068392 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -21,9 +21,6 @@ text.server.kicked.kick=Anda telah dikeluarkan dari server! text.server.kicked.invalidPassword=Kata sandi salah! text.server.kicked.clientOutdated=Client versi lama! Update game Anda! text.server.kicked.serverOutdated=Server versi lama! Tanyakan host untuk mengupdate! -text.server.connected={0} telah bergabung. -text.server.disconnected={0} telah terputus. -text.nohost=Tidak dapat meng-host server pada peta khusus! text.hostserver=Host Server text.host=Host text.hosting=[accent]Membuka server... @@ -32,7 +29,6 @@ text.hosts.discovering=Mencari game LAN text.server.refreshing=Menyegarkan server text.hosts.none=[lightgray]Tidak ada game LAN yang ditemukan! text.host.invalid=[scarlet]Tidak dapat terhubung ke host. -text.server.friendlyfire=Tembak Sesama text.server.add=Tambahkan Server text.server.delete=Yakin ingin menghapus server ini? text.server.hostname=Host: {0} @@ -233,7 +229,6 @@ text.deconstruction=You've just selected [accent]block deconstruction mode[].\n\ text.showagain=Don't show again next session text.unlocks=Unlocks text.addplayers=Add/Remove Players -text.newgame=New Game text.maps=Maps text.maps.none=[LIGHT_GRAY]No maps found! text.unlocked=New Block Unlocked! @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_ita.properties b/core/assets/bundles/bundle_ita.properties index 4b02d88130..4580e311ad 100644 --- a/core/assets/bundles/bundle_ita.properties +++ b/core/assets/bundles/bundle_ita.properties @@ -21,7 +21,6 @@ text.level.mode=Modalità di gioco: text.savegame=Salva text.loadgame=Carica text.joingame=Gioca MP -text.newgame=Nuovo gioco text.quit=Esci text.about.button=Informazioni text.name=Nome: @@ -35,9 +34,6 @@ text.server.kicked.clientOutdated=Versione del client obsoleta! Aggiorna il tuo text.server.kicked.serverOutdated=Server obsoleto! Chiedi all'host di aggiornare! text.server.kicked.banned=Sei stato bannato su questo server. text.server.kicked.recentKick=Sei stato cacciato di recente. Attendi prima di connetterti di nuovo. -text.server.connected={0} si è connesso -text.server.disconnected={0} si è disconnesso -text.nohost=Impossibile hostare il server con una mappa personalizzata! text.host.info=Il pulsante [accent]hos [] ospita un server sulle porte [scarlet]6567[] e [scarlet]656.[] Chiunque sulla stessa [LIGHT_GRAY]connessione wifi o rete locale[] dovrebbe essere in grado di vedere il proprio server nel proprio elenco server.\n\n Se vuoi che le persone siano in grado di connettersi ovunque tramite IP, è richiesto il [accent]port forwarding[]. \n\n[LIGHT_GRAY]Nota: se qualcuno sta riscontrando problemi durante la connessione al gioco LAN, assicurati di aver consentito a Mindustry di accedere alla rete locale nelle impostazioni del firewall. text.join.info=Qui è possibile inserire un [accent]IP del server[] a cui connettersi, o scoprire [accento]un server sulla rete locale[] disponibile.\n Sono supportati sia il multiplayer LAN che WAN. \n\n[LIGHT_GRAY]Nota: non esiste un elenco di server globali automatici; se si desidera connettersi a qualcuno tramite IP, è necessario chiedere all'host il proprio IP. text.hostserver=Server host @@ -48,7 +44,6 @@ text.hosts.discovering=Scoperta partite LAN text.server.refreshing=Aggiornamento server text.hosts.none=[lightgray]Nessuna partita LAN trovata! text.host.invalid=[scarlet]Impossibile connettersi all'host. -text.server.friendlyfire=Fuoco amico text.trace=Trace Player text.trace.playername=Nome del giocatore: [accent]{0} text.trace.ip=IP: [accent]{0} @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 37430f195e..aad7d24b6a 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -11,14 +11,14 @@ text.link.wiki.description=공식 Mindustry 위키 text.linkfail=링크를 여는데 실패했습니다!URL이 기기의 클립보드에 복사되었습니다. text.editor.web=HTML5 버전은 에디터 기능을 지원하지 않습니다!게임을 다운로드 한 뒤에 사용 해 주세요. text.web.unsupported=HTML5 버전은 이 기능을 지원하지 않습니다!게임을 다운로드 한 뒤에 사용 해 주세요. -text.multiplayer.web=이 버전은 멀티플레이를 지원하지 않습니다!멀티플레이를 웹 브라우저에서 즐기고 싶다면, itch.io 페이지에서 \"multiplayer web version\" 링크로 들어가면 됩니다. +text.multiplayer.web=이 버전은 멀티플레이를 지원하지 않습니다!멀티플레이를 웹 브라우저에서 즐기고 싶다면, itch.io 페이지에서 "multiplayer web version" 링크로 들어가면 됩니다. text.host.web=HTML5 버전은 게임 호스팅을 지원하지 않습니다!게임을 다운로드 한 뒤에 사용 해 주세요. text.gameover=코어가 터졌습니다. 게임 오버! text.highscore=[YELLOW]최고점수 달성! text.lasted=마지막으로 달성한 웨이브 text.level.highscore=최고 점수 : [accent]{0} text.level.delete.title=삭제 확인 -text.map.delete=정말로 \"[orange]{0}[]\" 맵을 삭제하시겠습니까? +text.map.delete=정말로 "[orange]{0}[]" 맵을 삭제하시겠습니까? text.level.select=맵 선택 text.level.mode=게임모드: text.construction.title=블록 배치 안내서 @@ -31,7 +31,6 @@ text.savegame=게임 저장 text.loadgame=게임 불러오기 text.joingame=게임 참가 text.addplayers=플레이어 추가/제거 -text.newgame=새 게임 text.quit=나가기 text.maps=맵 text.maps.none=[LIGHT_GRAY]맵을 찾을 수 없습니다! @@ -54,9 +53,6 @@ text.server.kicked.nameInUse=이 닉네임이 이미 서버에서 사용중입 text.server.kicked.nameEmpty=닉네임에는 반드시 영어 또는 숫자가 있어야 합니다. text.server.kicked.idInUse=당신은 이미 서버에 접속중입니다! 다중 계정은 허용되지 않습니다. text.server.kicked.customClient=이 서버는 커스텀 빌드를 지원하지 않습니다. 공식 버전을 사용하세요. -text.server.connected={0} 님이 접속했습니다. -text.server.disconnected={0} 님이 나갔습니다. -text.nohost=커스텀 맵을 호스트 할 수 없습니다! text.host.info=[accent]호스트[] 버튼은 현재 네트워크의 [scarlet]6567[] 과 [scarlet]6568[] 포트를 사용합니다.\n[LIGHY_GRAY]같은 Wi-Fi 또는 로컬 네트워크[] 에서 서버 목록을 볼 수 있습니다.\n\n만약 플레이어들이 이 IP를 통해 어디에서나 연결할 수 있게 하고 싶다면, 공유기 설정에서 [accent]포트 포워딩[]을 해야 합니다.\n\n[LIGHT_GRAY]참고 : LAN 게임 연결에 문제가 있는 사람이 있다면, 방화벽 설정에서 Mindustry 가 로컬 네트워크에 액세스하도록 허용했는지 확인 해 주세요. text.join.info=여기서 [accent]서버 IP[]를 입력하여 다른 서버에 접속할 수 있습니다.\n또는 [accent]로컬 네트워크(LAN)[] 서버를 검색하여 접속할 수 있습니다.\nLAN 및 WAN 멀티 플레이어 모두 지원됩니다.\n\n[LIGHT_GRAY]참고 : 여기에서는 자동으로 글로벌 서버를 추가하지 않습니다. IP로 다른 사람의 서버에 접속할려면 서버장에게 IP를 요청해야 합니다. text.hostserver=서버 열기 @@ -67,7 +63,6 @@ text.hosts.discovering=LAN 게임 찾기 text.server.refreshing=서버 목록 새로고치는중... text.hosts.none=[lightgray]LAN 게임을 찾을 수 없습니다! text.host.invalid=[scarlet]서버에 연결할 수 없습니다! -text.server.friendlyfire=팀킬 text.trace=플레이어 추적 text.trace.playername=플레이어 이름: [accent]{0} text.trace.ip=IP : [accent]{0} @@ -276,7 +271,6 @@ text.blocks.inputfuel=연료 text.blocks.fuelburntime=연료 연소 시간 text.blocks.inputcapacity=입력 용량 text.blocks.outputcapacity=출력 용량 - text.unit.blocks=블록들 text.unit.powersecond=초당 전력 단위 text.unit.liquidsecond=액체 단위 / 초 @@ -288,7 +282,6 @@ text.unit.degrees=도 text.unit.seconds=초 text.unit.none= text.unit.items=아이템 - text.category.general=일반 text.category.power=전력 text.category.liquids=액체 @@ -355,12 +348,10 @@ mode.sandbox.name=샌드박스 mode.sandbox.description=무한한 자원과 다음 웨이브 시작을 위한 타이머가 없습니다. mode.freebuild.name=자유 건축 mode.freebuild.description=제한된 자원과 다음 웨이브 시작을 위한 타이머가 없습니다. - content.item.name=아이템 content.liquid.name=액체 content.unit-type.name=종류 content.recipe.name=블록들 - item.stone.name=돌 item.stone.description=흔히 찾을 수 있는 자원. 바닥에서 돌을 캐거나 용암을 사용하여 얻을 수 있습니다. item.tungsten.name=텅스텐 @@ -389,12 +380,10 @@ item.blast-compound.name=폭발 화합물 item.blast-compound.description=폭탄 및 폭발물에 사용되는 휘발성 화합물.연료로 불을 낼 수 있지만, 별로 추천하지는 않습니다. item.pyratite.name=피러레이트 item.pyratite.description=화염 무기에 사용되는 엄청난 가연성 물질. - liquid.water.name=물 liquid.lava.name=용암 liquid.oil.name=석유 liquid.cryofluid.name=크라이오플루드 - text.item.explosiveness=[LIGHT_GRAY]폭발력 : {0} text.item.flammability=[LIGHT_GRAY]인화성 : {0} text.item.radioactivity=[LIGHT_GRAY]방사능 : {0} @@ -498,4 +487,17 @@ block.liquid-junction.name=액체 교차기 block.bridge-conduit.name=브릿지 도관 block.rotary-pump.name=로타리 펌프 block.nuclear-reactor.name=핵발전소 -text.save.old=이 저장파일은 이전 버전의 게임용이며, 지금은 사용할 수 없습니다. \n\n[LIGHT_GRAY]4.0 정식때 이전 게임버전에서 만든 저장파일과 호환됩니다. \ No newline at end of file +text.save.old=이 저장파일은 이전 버전의 게임용이며, 지금은 사용할 수 없습니다. \n\n[LIGHT_GRAY]4.0 정식때 이전 게임버전에서 만든 저장파일과 호환됩니다. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index ef022067b0..80958f5139 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -21,9 +21,6 @@ text.server.kicked.kick=Zostałeś wyrzucony z serwera! text.server.kicked.invalidPassword=Nieprawidłowe hasło! text.server.kicked.clientOutdated=Nieaktualna gra! Zaktualizują ją! text.server.kicked.serverOutdated=Nieaktualna gra! Zaktualizują ją! -text.server.connected={0} dołączył do gry . -text.server.disconnected={0} został rozłączony. -text.nohost=Nie można hostować serwera na mapie niestandardowej! text.hostserver=Serwer hosta text.host=Host text.hosting=[accent] Otwieranie serwera ... @@ -32,7 +29,6 @@ text.hosts.discovering=Wyszukiwanie gier w sieci LAN text.server.refreshing=Odświeżanie serwera text.hosts.none=[lightgray] Brak serwerów w sieci LAN! text.host.invalid=[scarlet] Nie można połączyć się z hostem. -text.server.friendlyfire=Bratobójczy ogień text.server.add=Dodaj serwer text.server.delete=Czy na pewno chcesz usunąć ten serwer? text.server.hostname=Host: {0} @@ -232,7 +228,6 @@ text.deconstruction=You've just selected [accent]block deconstruction mode[].\n\ text.showagain=Don't show again next session text.unlocks=Unlocks text.addplayers=Add/Remove Players -text.newgame=New Game text.maps=Maps text.maps.none=[LIGHT_GRAY]No maps found! text.unlocked=New Block Unlocked! @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 3b54e1282d..2e28e9c87c 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -171,7 +171,6 @@ text.showagain=Don't show again next session text.unlocks=Unlocks text.joingame=Join Game text.addplayers=Add/Remove Players -text.newgame=New Game text.maps=Maps text.maps.none=[LIGHT_GRAY]No maps found! text.about.button=About @@ -193,9 +192,6 @@ text.server.kicked.nameInUse=There is someone with that name\nalready on this se text.server.kicked.nameEmpty=Your name must contain at least one character or number. text.server.kicked.idInUse=You are already on this server! Connecting with two accounts is not permitted. text.server.kicked.customClient=This server does not support custom builds. Download an official version. -text.server.connected={0} has joined. -text.server.disconnected={0} has disconnected. -text.nohost=Can't host server on a custom map! text.host.info=The [accent]host[] button hosts a server on ports [scarlet]6567[] and [scarlet]6568.[]\nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. text.join.info=Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[LIGHT_GRAY]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP. text.hostserver=Host Server @@ -206,7 +202,6 @@ text.hosts.discovering=Discovering LAN games text.server.refreshing=Refreshing server text.hosts.none=[lightgray]No LAN games found! text.host.invalid=[scarlet]Can't connect to host. -text.server.friendlyfire=Friendly Fire text.trace=Trace Player text.trace.playername=Player name: [accent]{0} text.trace.ip=IP: [accent]{0} @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 81593c7e58..188ef80076 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -21,7 +21,6 @@ text.level.mode=Режим игры: text.savegame=Сохранить игру text.loadgame=Загрузить игру text.joingame=Присоединиться -text.newgame=Новая игра text.quit=Выход text.about.button=Об игре text.name=Название: @@ -36,9 +35,6 @@ text.server.kicked.clientOutdated=Устаревший клиент! Обнов text.server.kicked.serverOutdated=Устаревший сервер! Попросите хост обновить! text.server.kicked.banned=Вы заблокированы на этом сервере. text.server.kicked.recentKick=Вы недавно были кикнуты.\n Подождите немного перед следующим подключением -text.server.connected={0} присоединился -text.server.disconnected={0} отключился. -text.nohost=Не удается запустить сервер на пользовательской карте! text.host.info=The [accent]host[] button hosts a server on ports [scarlet]6567[] and [scarlet]6568.[]\nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. text.join.info=Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[LIGHT_GRAY]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP. text.hostserver=Запустить сервер @@ -49,7 +45,6 @@ text.hosts.discovering=Поиск локальных игр text.server.refreshing=Обновление сервера text.hosts.none=[lightgray]Локальных игр не обнаружено! text.host.invalid=[scarlet] Не удается подключиться к хосту. -text.server.friendlyfire=Дружественный огонь text.trace=Слежка за игроком text.trace.playername=Имя игрока: [accent]{0} text.trace.ip=IP: [accent]{0} @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index b8006f0edb..6760fdf413 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -21,7 +21,6 @@ text.level.mode=Oyun Modu text.savegame=Oyunu Kaydet text.loadgame=Oyunu yükle text.joingame=Oyuna katıl -text.newgame=Yeni Oyun text.quit=Çık text.about.button=Hakkında text.name=Adı: @@ -35,9 +34,6 @@ text.server.kicked.clientOutdated=Oyun sürümünüz geçerli değil. Oyununu g text.server.kicked.serverOutdated=Eski sunucu! Ev sahibinden güncellemesini isteyin! text.server.kicked.banned=Bu sunucudan yasaklandınız. text.server.kicked.recentKick=Son zamanlarda tekmelendin. Tekrar bağlanmadan önce bekleyin. -text.server.connected={0} katıldı. -text.server.disconnected={0} bağlantısı kesildi. -text.nohost=Özel bir haritada sunucuyu barındıramıyor! text.host.info=[Vurgu] ana bilgisayarı [] düğmesi, [657] [65] [65] ve [65] [6568] bağlantı noktalarında bir sunucuyu barındırır. [] Aynı [LIGHT_GRAY] wifi veya yerel ağ [] üzerindeki herkes sunucunuzu sunucularında görebilir. liste. Kişilerin IP tarafından herhangi bir yerden bağlanabilmesini istiyorsanız [vurgu] bağlantı noktası iletme [] gereklidir. [LIGHT_GRAY] Not: Birisi LAN oyununuza bağlanırken sorun yaşıyorsa, güvenlik duvarı ayarlarınızda Mindustry'e yerel ağınıza erişebildiğinizden emin olun. text.join.info=Burada, bağlanmak için yerel ağ [] sunucularına bağlanmak ya da [aksan] sunucularını bulmak için bir [vurgu] sunucunun IP [] girebilirsiniz. Hem LAN hem de WAN çok oyunculu desteklenir. [LIGHT_GRAY] Not: Otomatik bir global sunucu listesi yoktur; Birisine IP ile bağlanmak isterseniz, ana bilgisayardan kendi IP adreslerini sormanız gerekir. text.hostserver=Oyunu Sun @@ -48,7 +44,6 @@ text.hosts.discovering=LAN oyunlarını keşfetme text.server.refreshing=Canlandırıcı sunucu text.hosts.none=[lightgray] Hayır LAN oyunları bulundu! text.host.invalid=[scarlet] Ana bilgisayara bağlanılamıyor. -text.server.friendlyfire=Dost ateşi text.trace=Oyuncuyu Takip Et text.trace.playername=Oyuncu adı: [accent] {0} text.trace.ip=IP: [vurgu] {0} @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 7a85ec0af1..6c60ca5897 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -10,7 +10,6 @@ text.level.mode=Ігровий режим text.savegame=Зберегти гру text.loadgame=Завантажити гру text.joingame=Приєднатися\nдо гри -text.newgame=Нова гра text.quit=Вийти text.about.button=Про text.name=Назва: @@ -22,9 +21,6 @@ text.server.kicked.kick=Ви були вигнані з сервера! text.server.kicked.invalidPassword=Невірний пароль! text.server.kicked.clientOutdated=Застарілий клієнт! Оновіть свою гру! text.server.kicked.serverOutdated=Застарілий сервер! Попросіть хост оновити! -text.server.connected={0} приєднався. -text.server.disconnected={0} від'єднано. -text.nohost=Неможливо розмістити сервер на власній карті! text.hostserver=Хост-сервер text.host=Хост text.hosting=[accent] Відкриття сервера ... @@ -33,7 +29,6 @@ text.hosts.discovering=Знайомство з мережевими іграми text.server.refreshing=Оновити сервери text.hosts.none=[lightgray] Ніяких ігор у мережі не знайдено! text.host.invalid=[scarlet] Неможливо підключитися до хосту. -text.server.friendlyfire=Дружній вогонь text.server.add=Додати сервер text.server.delete=Ви впевнені, що хочете видалити цей сервер? text.server.hostname=Хост: {0} @@ -493,3 +488,16 @@ block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index d997fcdde8..6d14067994 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -21,7 +21,6 @@ text.level.mode=遊戲模式： text.savegame=儲存遊戲 text.loadgame=載入遊戲 text.joingame=多人連線 -text.newgame=新遊戲 text.quit=退出 text.about.button=關於 text.name=姓名： @@ -36,9 +35,6 @@ text.server.kicked.clientOutdated=客戶端版本過舊！請更新遊戲！ text.server.kicked.serverOutdated=伺服器版本過舊！請聯絡伺服主更新伺服器！ text.server.kicked.banned=您已經從這個伺服器被封禁。 text.server.kicked.recentKick=您已經從伺服器被踢除。\n請稍後再進行連線。\n -text.server.connected={0} 已加入遊戲。 -text.server.disconnected={0} 已中斷連線。 -text.nohost=無法在伺服器中使用自訂地圖！ text.host.info=目前伺服器監聽於連接埠 [scarlet]6567[] 與 [scarlet]6568[]。\n所有跟您在同一個[LIGHT_GRAY]無線網路或區域網路[]環境的玩家應該能在他們的伺服器清單中找到您的伺服器。\n如果您希望網際網路上的玩家透過 IP 位址連線到您的伺服器，您必須設定[accent]連接埠轉發[]。\n\n[LIGHT_GRAY]注意：如果區域網路內有玩家無法連線至您的伺服器，請務必確認您已於防火牆設定中開放 Mindustry 存取您的區域網路。 text.join.info=您可以在此輸入欲連線的伺服器[accent] IP 位址[]，或尋找[accent]區域網路[]內的伺服器。目前支援區域網路與網際網路連線。\n\n [LIGHT_GRAY]注意：這裡沒有網際網路伺服器清單，如果您想透過 IP 位址連線到某人的伺服器，您必須向他們詢問 IP 位址。 text.hostserver=建立伺服器 @@ -49,7 +45,6 @@ text.hosts.discovering=搜尋區域網路遊戲 text.server.refreshing=刷新伺服器 text.hosts.none=[lightgray]找不到區域網路伺服器！ text.host.invalid=[scarlet]無法連線至伺服器。 -text.server.friendlyfire=隊友傷害 text.trace=跟隨玩家\n text.trace.playername=玩家名稱：[accent] {0} text.trace.ip=IP：[accent] {0} @@ -493,3 +488,16 @@ block.liquid-junction.name=Liquid Junction block.bridge-conduit.name=Bridge Conduit block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor +text.customgame=Custom Game +text.campaign=Campaign +text.sectors=Sectors +text.sector=Selected Sector: [LIGHT_GRAY]{0} +text.sector.time=Time: [LIGHT_GRAY]{0} +text.sector.deploy=Deploy +text.sector.resume=Resume +text.sector.unlocked=Sector completed! +text.sector.locked=[scarlet][[Incomplete] +text.sector.unexplored=[accent][[Unexplored] +text.close=Close +text.save.playtime=Playtime: {0} +text.editor.brush=Brush diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 0d6dd699ef..c0309586f5 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -269,7 +269,7 @@ public class NetServer extends Module{ public static void onDisconnect(Player player){ if(player.con.hasConnected){ - Call.sendMessage("[accent]" + player.name + " has disconnected."); + Call.sendMessage("[accent]" + player.name + " [accent]has disconnected."); Call.onPlayerDisconnect(player.id); } player.remove(); @@ -316,7 +316,7 @@ public class NetServer extends Module{ public static void connectConfirm(Player player){ player.add(); player.con.hasConnected = true; - Call.sendMessage("[accent]" + player.name + " has connected."); + Call.sendMessage("[accent]" + player.name + " [accent]has connected."); Log.info("&y{0} has connected.", player.name); } diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index b511ef1ba6..80a5c9ef35 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -31,22 +31,14 @@ public class DesktopInput extends InputHandler{ //controller info private float controlx, controly; private boolean controlling; - /** - * Current cursor type. - */ + /**Current cursor type.*/ private CursorType cursorType = normal; - /** - * Position where the player started dragging a line. - */ + /**Position where the player started dragging a line.*/ private int selectX, selectY; - /** - * Whether selecting mode is active. - */ + /**Whether selecting mode is active.*/ private PlaceMode mode; - /** - * Animation scale for line. - */ + /**Animation scale for line.*/ private float selectScale; public DesktopInput(Player player){ @@ -54,9 +46,7 @@ public class DesktopInput extends InputHandler{ this.section = "player_" + (player.playerIndex + 1); } - /** - * Draws a placement icon for a specific block. - */ + /**Draws a placement icon for a specific block.*/ void drawPlace(int x, int y, Block block, int rotation){ if(validPlace(x, y, block, rotation)){ Draw.color(); diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index 12ec2c3296..cba0c7fac0 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -216,8 +216,8 @@ public class WorldGenerator{ Block floor = Blocks.stone; Block wall = Blocks.air; - double elevation = sim.octaveNoise2D(3, 0.5, 1f / 500, x, y) * 4.1 - 1; - double temp = sim3.octaveNoise2D(7, 0.54, 1f / 820f, x, y); + double elevation = sim.octaveNoise2D(detailed ? 7 : 2, 0.5, 1f / 500, x, y) * 4.1 - 1; + double temp = sim3.octaveNoise2D(detailed ? 12 : 6, 0.54, 1f / 820f, x, y); double r = sim2.octaveNoise2D(1, 0.6, 1f / 70, x, y); double edgeDist = Math.max(sectorSize / 2, sectorSize / 2) - Math.max(Math.abs(x - sectorSize / 2), Math.abs(y - sectorSize / 2)); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index 624255d23e..07d28df037 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -63,6 +63,7 @@ public class PlayerListFragment extends Fragment{ menu.addButton("$text.server.bans", ui.bans::show).disabled(b -> Net.client()); menu.addButton("$text.server.admins", ui.admins::show).disabled(b -> Net.client()); + menu.addButton("$text.close", this::toggle); }).margin(0f).pad(10f).growX(); }).touchable(Touchable.enabled).margin(14f);