diff --git a/build.gradle b/build.gradle index 8f262d8a3d..9ea249e419 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = '2f18f69ffb' + uCoreVersion = 'c28462b127' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c66ef58c8a..e3e938a7b0 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -356,6 +356,11 @@ setting.mutemusic.name=Mute Music setting.sfxvol.name=SFX Volume setting.mutesound.name=Mute Sound text.keybind.title=Rebind Keys + +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer + keybind.move_x.name=Move x keybind.move_y.name=Move y keybind.select.name=Select @@ -368,8 +373,9 @@ keybind.pause.name=Pause keybind.dash.name=Dash keybind.chat.name=Chat keybind.player_list.name=Player list -keybind.console.name=console +keybind.console.name=Console keybind.rotate.name=Rotate + mode.text.help.title=Description of modes mode.waves.name=waves mode.waves.description=the normal mode. limited resources and automatic incoming waves. diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index d4a6c10095..782a4db285 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -15,7 +15,6 @@ text.players={0} Spieler online 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.hostserver=Server hosten text.host=Host text.hosting=[accent] Server wird geöffnet... @@ -464,7 +463,6 @@ 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} @@ -503,8 +501,6 @@ unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.fabricator.name=Fabricator unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. -unit.scout.name=Scout -unit.scout.description=A basic ground unit. Uses lead as ammo. unit.titan.name=Titan unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets. unit.monsoon.name=Monsoon @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 291b4de50c..525754fa3a 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -26,7 +26,6 @@ text.players.single={0} jugador en línea text.server.mismatch=Error de paquete: posible desajuste de la versión cliente / servidor.\n¡Asegúrate de que tú y el anfitrión tengáis la última versión de Mindustry! text.server.closing=[accent] Cerrando servidor ... text.server.kicked.kick=¡Has sido expulsado del servidor! -text.server.kicked.invalidPassword=¡Contraseña inválida! 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. @@ -464,7 +463,6 @@ 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} @@ -503,8 +501,6 @@ unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.fabricator.name=Fabricator unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. -unit.scout.name=Scout -unit.scout.description=A basic ground unit. Uses lead as ammo. unit.titan.name=Titan unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets. unit.monsoon.name=Monsoon @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 05733570dc..5a662ab6a0 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -16,7 +16,6 @@ text.players.single=joueur en ligne text.server.mismatch=Erreur de paquet: possible incompatibilité de version client/serveur. Assurez-vous que vous et l'hôte avez la dernière version de Mindustry! text.server.closing=[accent]Fermeture du serveur ... text.server.kicked.kick=Vous avez été expulsé du serveur! -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. @@ -464,7 +463,6 @@ 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} @@ -503,8 +501,6 @@ unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.fabricator.name=Fabricator unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. -unit.scout.name=Scout -unit.scout.description=A basic ground unit. Uses lead as ammo. unit.titan.name=Titan unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets. unit.monsoon.name=Monsoon @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index e69195ed9e..c198499407 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -16,7 +16,6 @@ text.players.single={0} pemain online text.server.mismatch=Kesalahan paket: kemungkinan versi client / server tidak sesuai.\nPastikan Anda dan host memiliki versi terbaru Mindustry! text.server.closing=[accent]Menutup server... 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.hostserver=Host Server @@ -464,7 +463,6 @@ 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} @@ -503,8 +501,6 @@ unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.fabricator.name=Fabricator unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. -unit.scout.name=Scout -unit.scout.description=A basic ground unit. Uses lead as ammo. unit.titan.name=Titan unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets. unit.monsoon.name=Monsoon @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_ita.properties b/core/assets/bundles/bundle_ita.properties index da5013fe0a..13affd756b 100644 --- a/core/assets/bundles/bundle_ita.properties +++ b/core/assets/bundles/bundle_ita.properties @@ -26,7 +26,6 @@ text.players.single={0} giocatori online text.server.mismatch=Errore nel pacchetto: possibile discrepanza nella versione client / server. Assicurati che tu e l'host abbiate l'ultima versione di Mindustry! text.server.closing=[accent]Chiusura server ... text.server.kicked.kick=Sei stato cacciato dal server! -text.server.kicked.invalidPassword=Password non valida. text.server.kicked.clientOutdated=Versione del client obsoleta! Aggiorna il tuo gioco! text.server.kicked.serverOutdated=Server obsoleto! Chiedi all'host di aggiornare! text.server.kicked.banned=Sei bannato da questo server. @@ -254,7 +253,6 @@ text.showagain=non mostrare più text.unlocks=Sblocchi text.addplayers=Aggiungi/rimuovi giocatori text.customgame=Gioco personalizzato -text.campaign=Campagna text.sectors=Settori text.sector=Settori Selezionati: [LIGHT_GRAY]{0} text.sector.time=Tempo: [LIGHT_GRAY]{0} @@ -508,11 +506,36 @@ unit.drone.name=Drone unit.drone.description=Un'unità base, che mina e costruisce. unit.fabricator.name=Costruttore unit.fabricator.description=Un drone molto avanzato che raccoglie minerali e costruisce molto meglio e più velocemente di un drone base. -unit.scout.name=Esploratore -unit.scout.description=Un unità di base a terra. Usa piombo come munizioni. unit.titan.name=Titano unit.titan.description=Un'unità di terra corazzata avanzata. Utilizza carburo come munizione. Attacca sia bersagli terrestri che aerei. unit.monsoon.name=Monsone unit.monsoon.description=Un bombardiere molto potente, che raderà al suolo chiunque gli passi davanti. unit.interceptor.name=Intercettatore unit.interceptor.description=Un veloce ed efficiente torretta che funziona con il piombo. +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 9eb3daa3ec..e194623f7b 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -40,7 +40,6 @@ text.server.mismatch=클라이언트와 서버 버전이 일치하지 않습니 text.server.closing=[accent]서버 닫는중... text.server.kicked.kick=당신은 서버에서 추방되었습니다! text.server.kicked.fastShoot=당신은 총을 너무 빨리 발사했습니다. -text.server.kicked.invalidPassword=알 수 없는 비밀번호 입니다! text.server.kicked.clientOutdated=오래된 버전의 클라이언트 입니다! 게임을 업데이트 하세요! text.server.kicked.serverOutdated=오래된 버전의 서버입니다! 서버 호스트 관리자에게 문의하세요! text.server.kicked.banned=당신은 서버에서 밴 망치를 맞아 차단당했습니다. @@ -281,7 +280,6 @@ text.category.liquids=액체 text.category.items=아이템 text.category.crafting=제작 text.category.shooting=사격 - setting.difficulty.easy=쉬움 setting.difficulty.normal=보통 setting.difficulty.hard=어려움 @@ -304,9 +302,7 @@ setting.musicvol.name=음악 크기 setting.mutemusic.name=음소거 setting.sfxvol.name=효과음 크기 setting.mutesound.name=소리 끄기 - text.keybind.title=키 바인딩 - keybind.move_x.name=오른쪽/왼쪽 이동 keybind.move_y.name=위쪽/아래쪽 이동 keybind.select.name=선택 @@ -321,7 +317,6 @@ keybind.chat.name=채팅 keybind.player_list.name=플레이어 목록 keybind.console.name=콘솔 keybind.rotate.name=회전 - mode.text.help.title=도움말 mode.waves.name=단계 mode.waves.description=이것은 일반 모드입니다. 제한된 자원과 자동으로 다음 단계가 시작됩니다. @@ -329,12 +324,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=텅스텐 @@ -363,12 +356,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} @@ -377,7 +368,6 @@ text.item.hardness=[LIGHT_GRAY]강도:{0} text.liquid.heatcapacity=[LIGHT_GRAY]발열량:{0} text.liquid.viscosity=[LIGHT_GRAY]점도:{0} text.liquid.temperature=[LIGHT_GRAY]온도:{0} - block.deepwater.name=깊은물 block.water.name=물 block.lava.name=용암 @@ -485,10 +475,8 @@ 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 정식때 이전 게임버전에서 만든 저장파일과 호환됩니다. text.customgame=커스텀 게임 -text.campaign=캠페인 text.sectors=구역 text.sector=선택된 구역:[LIGHT_GRAY]{0} text.sector.time=시간:[LIGHT_GRAY]{0} @@ -503,13 +491,10 @@ text.credits.text=Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\n\n[GR text.sector.gameover=이 구역을 잃었습니다. 다시 배치하시겠습니까? text.sector.retry=다시할꺼임 text.wave.lasted=[accent]{0}[] 까지 버티셨습니다. - setting.fpscap.name=최대 FPS setting.fpscap.none=없음 setting.fpscap.text={0} FPS - block.command-center.name=명령 본부 - text.mission=목표:[LIGHT_GRAY] {0} text.mission.wave=[accent]{0}[]단계가 될때까지 생존하세요. text.mission.battle=적 본부를 파괴하세요. @@ -520,20 +505,16 @@ text.mission.complete.body=구역 {0},{1} 탐색 성공. text.mission.resource=Obtain {0} x{1} text.unit.health=[LIGHT_GRAY]체력:{0} text.unit.speed=[LIGHT_GRAY]속도:{0} - block.drone-pad.name=드론 공장 block.fabricator-pad.name=페버 공장 block.interceptor-pad.name=인터셉터 공장 block.monsoon-pad.name=문순 공장 block.mass-driver.name=물질 이동기 block.blast-drill.name=고속 발열 드릴 - unit.drone.name=드론 unit.drone.description=초기형 드론 유닛입니다. 기본적으로 코어에서 1대를 스폰합니다. 자동으로 아이템을 수집/채광하며 블럭들을 수리합니다. unit.fabricator.name=페버 unit.fabricator.description=고급 드론 유닛입니다. 자동으로 아이템과 수집/채광/블록들을 수리하며, 일반 드론보다 더 빠르게 작업할 수 있습니다. -unit.scout.name=스카웃 -unit.scout.description=기본 지상 유닛입니다. 납을 탄약으로 사용합니다. unit.titan.name=타이탄 unit.titan.description=고급 지상 유닛입니다. 합금을 탄약으로 사용하며 지상과 공중 둘다 공격할 수 있습니다. unit.monsoon.name=문순 @@ -542,9 +523,19 @@ unit.interceptor.name=인터셉터 unit.interceptor.description=빠르고, 공격하고 튀는 방식을 사용합니다. 납을 탄약으로 사용합니다. unit.dagger.name=디거 unit.dagger.description=기본 지상 유닛입니다. 스웜과 같이 쓰면 유용합니다. - mode.sandbox.warning=Note that blocks cannot be used in sandbox mode until they are unlocked in other modes.\n\n[LIGHT_GRAY]If you have not unlocked any blocks, none will appear. block.thermal-pump.name=지열 펌프 block.dagger-pad.name=디거 공장 block.titan-pad.name=타이탄 공장 -block.thermal-generator.name=지열 발전기 \ No newline at end of file +block.thermal-generator.name=지열 발전기 +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +setting.difficulty.purge=purge +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index e23156e686..33fb18bf2d 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -16,7 +16,6 @@ text.players.single={0} gracz online text.server.mismatch=Błąd pakietu: możliwa niezgodność wersji klienta/serwera.\nUpewnij się, że Ty i host macie najnowszą wersję Mindustry! text.server.closing=[accent] Zamykanie serwera ... 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.hostserver=Stwórz Serwer @@ -462,7 +461,6 @@ block.rotary-pump.name=Wirowa Pompa block.nuclear-reactor.name=Reaktor Nuklearny text.save.old=Ten zapis jest ze starej wersji i gra nie może go teraz wczytać.\n\n[LIGHT_GRAY]Wsparcie starych zapisów będzie w pełnej wersji 4.0. text.customgame=Własna Gra -text.campaign=Kampania text.sectors=Sektory text.sector=Wybrany Sektor: [LIGHT_GRAY]{0} text.sector.time=Czas: [LIGHT_GRAY]{0} @@ -503,8 +501,6 @@ unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.fabricator.name=Fabricator unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. -unit.scout.name=Scout -unit.scout.description=A basic ground unit. Uses lead as ammo. unit.titan.name=Titan unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets. unit.monsoon.name=Monsoon @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index eb0579d4d2..13a657a115 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -162,7 +162,6 @@ text.server.mismatch=Packet error: Versão do Cliente/Servidor Incompativel.\nTe text.server.closing=[accent]Fechando servidor... text.server.kicked.kick=Voce foi expulso do servidor! text.server.kicked.fastShoot=Voce esta atirando rapido demais. -text.server.kicked.invalidPassword=Senha Incorreta! text.server.kicked.clientOutdated=Cliente desatualizado! Atualize seu jogo! text.server.kicked.serverOutdated=Servidor desatualiado! Peca ao dono para atualizar! text.server.kicked.banned=Voce foi banido do servidor. @@ -463,7 +462,6 @@ block.rotary-pump.name=Bomba Rotatoria block.nuclear-reactor.name=Reator Nuclear text.save.old=Este save é para uma versão antiga do jogo, E não pode ser usado.\n\n[LIGHT_GRAY]Salvar Versões antigas vai ser Implementado Na versão 4.0 completa text.customgame=Jogo Customizado -text.campaign=Campanha text.sectors=Setores text.sector=Setor Selecionado: [LIGHT_GRAY]{0} text.sector.time=Tempo: [LIGHT_GRAY]{0} @@ -503,8 +501,6 @@ unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.fabricator.name=Fabricator unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. -unit.scout.name=Scout -unit.scout.description=A basic ground unit. Uses lead as ammo. unit.titan.name=Titan unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets. unit.monsoon.name=Monsoon @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index a5e1427a13..49245f4e2c 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -33,7 +33,6 @@ text.loadgame=Загрузить игру text.joingame=Присоединиться text.addplayers=Доб/удалить игроков text.customgame=Пользовательская игра -text.campaign=Кампания text.sectors=Секторы text.sector=Выбранный сектор: [LIGHT_GRAY]{0} text.sector.time=Время: [LIGHT_GRAY]{0} @@ -64,7 +63,6 @@ text.server.mismatch=Ошибка пакета: возможное несоот text.server.closing=[accent]Закрытие сервера... text.server.kicked.kick=Вас выгнали с сервера! text.server.kicked.fastShoot=Вы стреляете слишком быстро. -text.server.kicked.invalidPassword=Неверный пароль. text.server.kicked.clientOutdated=Устаревший клиент! Обновите игру! text.server.kicked.serverOutdated=Устаревший сервер! Попросите хост обновить! text.server.kicked.banned=Вы заблокированы на этом сервере. @@ -535,3 +533,9 @@ unit.monsoon.name=Муссон unit.monsoon.description=Тяжелый ковровый бомбардировщик. Использует взрывоопасное соединение или пиратит в качестве боеприпасов. unit.interceptor.name=Истребитель-перехватчик unit.interceptor.description=Быстрая и ударная боевая единица, которая использует набег с отскоком. +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 0d4ec3fd11..ba2db113b1 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -26,7 +26,6 @@ text.players.single={0} Oyuncu Çevrimiçi text.server.mismatch=Paket hatası: olası istemci / sunucu sürümü uyuşmazlığı. Siz ve ev sahibi Mindustry'nin en son sürümüne sahip olduğunuzdan emin olun! text.server.closing=[accent] Sunucu kapatılıyor ... text.server.kicked.kick=Sunucudan kovuldun! -text.server.kicked.invalidPassword=Geçersiz şifre! text.server.kicked.clientOutdated=Oyun sürümünüz geçerli değil. Oyununu güncelleyin! text.server.kicked.serverOutdated=Eski sunucu! Ev sahibinden güncellemesini isteyin! text.server.kicked.banned=Bu sunucudan yasaklandınız. @@ -464,7 +463,6 @@ 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} @@ -503,8 +501,6 @@ unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.fabricator.name=Fabricator unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. -unit.scout.name=Scout -unit.scout.description=A basic ground unit. Uses lead as ammo. unit.titan.name=Titan unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets. unit.monsoon.name=Monsoon @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index cb7fc3916c..3a98155084 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -22,9 +22,9 @@ text.map.delete=Ви впевнені, що хочете видалити кар text.level.select=Вибір рівня text.level.mode=Ігровий режим: text.construction.title=Block Construction Guide -text.construction=\You've just selected [accent]block construction mode[].\n\n\To begin placing, simply tap a valid location near your ship.\n\Once you have selected some blocks, press the checkbox to confirm, and your ship will begin constructing them.\n\\n\- [accent]Remove blocks[] from your selection by tapping them.\n\- [accent]Shift the selection[] by holding and dragging any block in the selection.\n\- [accent]Place blocks in a line[] by tapping and holding an empty spot, then dragging in a direction.\n\- [accent]Cancel construction or selection[] by pressing the X at the bottom left. +text.construction=You've just selected [accent]block construction mode[].\n\nTo begin placing, simply tap a valid location near your ship.\nOnce you have selected some blocks, press the checkbox to confirm, and your ship will begin constructing them.\n\\n- [accent]Remove blocks[] from your selection by tapping them.\n- [accent]Shift the selection[] by holding and dragging any block in the selection.\n- [accent]Place blocks in a line[] by tapping and holding an empty spot, then dragging in a direction.\n- [accent]Cancel construction or selection[] by pressing the X at the bottom left. text.deconstruction.title=Block Deconstruction Guide -text.deconstruction=\You've just selected [accent]block deconstruction mode[].\n\n\To begin breaking, simply tap a block near your ship.\n\Once you have selected some blocks, press the checkbox to confirm, and your ship will begin de-constructing them.\n\\n\- [accent]Remove blocks[] from your selection by tapping them.\n\- [accent]Remove blocks in an area[] by tapping and holding an empty spot, then dragging in a direction.\n\- [accent]Cancel deconstruction or selection[] by pressing the X at the bottom left. +text.deconstruction=You've just selected [accent]block deconstruction mode[].\n\nTo begin breaking, simply tap a block near your ship.\nOnce you have selected some blocks, press the checkbox to confirm, and your ship will begin de-constructing them.\n\\n- [accent]Remove blocks[] from your selection by tapping them.\n- [accent]Remove blocks in an area[] by tapping and holding an empty spot, then dragging in a direction.\n- [accent]Cancel deconstruction or selection[] by pressing the X at the bottom left. text.showagain=Не показувати знову до наступного сеансу text.coreattack=< Ядро під атакою! > text.unlocks=Разблоковане @@ -535,3 +535,7 @@ unit.monsoon.name=Мусон unit.monsoon.description=Важкий килимовий бомбардувальник. Використовує вибухонебезпечну речовину або піратит як боєприпаси. unit.interceptor.name=Винищувач-перехполювач unit.interceptor.description=Швидка, ударна бойова одиниця, котра використовує набіг з відскоком +text.settings.language=Language +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index a26b822571..576a5f23be 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -32,7 +32,6 @@ text.loadgame=载入游戏 text.joingame=加入游戏 text.addplayers=增加/删除玩家 text.customgame=自定义游戏 -text.campaign=战役 text.sectors=区域 text.sector=区域: [LIGHT_GRAY]{0} text.sector.time=时间: [LIGHT_GRAY]{0} @@ -59,7 +58,6 @@ text.server.mismatch=Packet error: 可能是客户端/服务器版本不匹配\n text.server.closing=[accent]正在关闭服务器... text.server.kicked.kick=你被踢出服务器了! text.server.kicked.fastShoot=你发射得太快了！ -text.server.kicked.invalidPassword=无效的密码！ text.server.kicked.clientOutdated=客户端版本过旧！请升级！ text.server.kicked.serverOutdated=服务器版本过旧！请联系房主升级！ text.server.kicked.banned=你被这个服务器拉黑了。 @@ -497,8 +495,6 @@ unit.drone.name=无人机 unit.drone.description=初始的无人机单位.自动在核心生成,自动采矿,收集物品,修复方块 unit.fabricator.name=装配工 unit.fabricator.description=高级无人机单位,自动采矿,收集物品和修复方块.比普通无人机快很多. -unit.scout.name=侦察机 -unit.scout.description=基础地面单位,使用钨作为弹药. unit.titan.name=泰坦 unit.titan.description=高级的有武装地面单位,使用电石作为弹药.攻击地面单位和空中单位. unit.monsoon.name=狂风 @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 0bfaf23406..147f64c2c6 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -27,7 +27,6 @@ text.server.mismatch=封包錯誤：客戶端與伺服器版本可能不相符 text.server.closing=[accent] 正在關閉伺服器... text.server.kicked.kick=您已被踢出伺服器！ text.server.kicked.fastShoot=您射擊的太快了！ -text.server.kicked.invalidPassword=密碼無效！ text.server.kicked.clientOutdated=客戶端版本過舊！請更新遊戲！ text.server.kicked.serverOutdated=伺服器版本過舊！請聯絡伺服主更新伺服器！ text.server.kicked.banned=您已經從這個伺服器被封禁。 @@ -464,7 +463,6 @@ 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} @@ -503,8 +501,6 @@ unit.drone.name=Drone unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.fabricator.name=Fabricator unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. -unit.scout.name=Scout -unit.scout.description=A basic ground unit. Uses lead as ammo. unit.titan.name=Titan unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets. unit.monsoon.name=Monsoon @@ -516,3 +512,30 @@ block.thermal-pump.name=Thermal Pump block.dagger-pad.name=Dagger Pad block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator +text.coreattack=< Core is under attack! > +text.continue=Continue +text.nextmission=Next Mission +text.server.kicked.serverClose=Server closed. +text.server.kicked.sectorComplete=Sector completed. +text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector. +text.map.invalid=Error loading map: corrupted or invalid map file. +section.general.name=General +section.view.name=View +section.multiplayer.name=Multiplayer +block.deepwater.name=deepwater +block.water.name=water +block.lava.name=lava +block.oil.name=oil +block.blackstone.name=blackstone +block.stone.name=stone +block.dirt.name=dirt +block.sand.name=sand +block.ice.name=ice +block.snow.name=snow +block.grass.name=grass +block.shrub.name=shrub +block.rock.name=rock +block.blackrock.name=blackrock +block.icerock.name=icerock +unit.dagger.name=Dagger +unit.dagger.description=A basic ground unit. Useful in swarms. diff --git a/core/src/io/anuke/mindustry/content/blocks/Blocks.java b/core/src/io/anuke/mindustry/content/blocks/Blocks.java index 1e5a793f91..a9ae94fc43 100644 --- a/core/src/io/anuke/mindustry/content/blocks/Blocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/Blocks.java @@ -106,7 +106,7 @@ public class Blocks extends BlockList implements ContentList{ stone = new Floor("stone"){{ hasOres = true; drops = new ItemStack(Items.stone, 1); - blends = block -> block != this && !(block instanceof Ore); + blends = block -> block != this && !(block instanceof OreBlock); minimapColor = Color.valueOf("323232"); playerUnmineable = true; }}; diff --git a/core/src/io/anuke/mindustry/world/blocks/Ore.java b/core/src/io/anuke/mindustry/world/blocks/Ore.java deleted file mode 100644 index 398771f070..0000000000 --- a/core/src/io/anuke/mindustry/world/blocks/Ore.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.anuke.mindustry.world.blocks; - -import io.anuke.mindustry.content.blocks.Blocks; - -public class Ore extends Floor{ - - public Ore(String name){ - super(name); - blends = block -> block != this && block != Blocks.stone; - } - -} diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java index 5d79dacc2c..79c09df684 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java @@ -14,7 +14,7 @@ public class OreBlock extends Floor{ public OreBlock(Item ore, Floor base){ super("ore-" + ore.name + "-" + base.name); - this.formalName = ore.name + " " + base.formalName; + this.formalName = ore.localizedName() + " " + base.formalName; this.drops = new ItemStack(ore, 1); this.base = base; this.variants = 3;