mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-07-04 15:27:19 +07:00
Fixed font line height / Bundles updated / Changelog date
This commit is contained in:
Anuken
@ -26,7 +26,7 @@ allprojects {
|
||||
appName = 'Mindustry'
|
||||
gdxVersion = '1.9.8'
|
||||
roboVMVersion = '2.3.0'
|
||||
uCoreVersion = '06b465e3385ded22d84f42cb09554352a1d3ad6c'
|
||||
uCoreVersion = '3d515618feeb9d05fd2727320be7e612e0b8c859'
|
||||
|
||||
getVersionString = {
|
||||
String buildVersion = getBuildVersion()
|
||||
|
||||
@ -361,6 +361,8 @@ category.general.name=General
|
||||
category.view.name=View
|
||||
category.multiplayer.name=Multiplayer
|
||||
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.move_x.name=Move x
|
||||
keybind.move_y.name=Move y
|
||||
keybind.select.name=Select/Shoot
|
||||
|
||||
@ -204,7 +204,6 @@ text.maps.none=[LIGHT_GRAY]No maps found!
|
||||
text.unlocked=New Block Unlocked!
|
||||
text.unlocked.plural=New Blocks Unlocked!
|
||||
text.server.closing=[accent]Closing server...
|
||||
text.server.kicked.fastShoot=You are shooting too quickly.
|
||||
text.server.kicked.clientOutdated=Outdated client! Update your game!
|
||||
text.server.kicked.serverOutdated=Outdated server! Ask the host to update!
|
||||
text.server.kicked.banned=You are banned on this server.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -62,7 +62,6 @@ text.players.single={0} jugador online
|
||||
text.server.mismatch=Error de paquete: posiblemente versión incompatible de cliente/servidor.\n¡Asegurate de que tu y el anfitrión tengan\nla última versión de Mindustry!
|
||||
text.server.closing=[accent]Cerrando servidor...
|
||||
text.server.kicked.kick=¡Has sido kickeado del servidor!
|
||||
text.server.kicked.fastShoot=Estás disparando demasiado rápido.
|
||||
text.server.kicked.serverClose=El servidor ha cerrado.
|
||||
text.server.kicked.sectorComplete=Sector completado.
|
||||
text.server.kicked.sectorComplete.text=Tu misión ha sido completada.\nEl servidor ahora continuara con el próximo sector.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -244,7 +244,6 @@ text.maps=Cartes
|
||||
text.maps.none=[LIGHT_GRAY]Aucune carte trouvée!
|
||||
text.unlocked=Nouveau bloc debloqué!
|
||||
text.unlocked.plural=Nouveaux blocs débloqués!
|
||||
text.server.kicked.fastShoot=Vous tirez trop vite.
|
||||
text.server.kicked.recentKick=Vous avez été expulsé récemment.\nAttendez avant de vous connecter à nouveau.
|
||||
text.server.kicked.nameInUse=Il y a déjà quelqu'un avec ce nom\nsur ce serveur.
|
||||
text.server.kicked.nameEmpty=Votre nom doit contenir au moins une lettre ou un chiffere.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -211,7 +211,6 @@ text.maps=Maps
|
||||
text.maps.none=[LIGHT_GRAY]No maps found!
|
||||
text.unlocked=New Block Unlocked!
|
||||
text.unlocked.plural=New Blocks Unlocked!
|
||||
text.server.kicked.fastShoot=You are shooting too quickly.
|
||||
text.server.kicked.banned=You are banned on this server.
|
||||
text.server.kicked.recentKick=You have been kicked recently.\nWait before connecting again.
|
||||
text.server.kicked.nameInUse=There is someone with that name\nalready on this server.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -265,7 +265,6 @@ text.maps=Mappe
|
||||
text.maps.none=[LIGHT_GRAY]Nessuna mappa trovata!
|
||||
text.unlocked=Nuovo blocco scoperto!
|
||||
text.unlocked.plural=Nuovi blocchi scoperti!
|
||||
text.server.kicked.fastShoot=Stai sparando troppo velocemente.
|
||||
text.server.kicked.nameInUse=C'è già qualcuno con il tuo nome\nsu questo server.
|
||||
text.server.kicked.nameEmpty=Il tuo nome deve contenere almeno un carattere.
|
||||
text.server.kicked.idInUse=Sei già su questo server! Non è permesso connettersi con due account.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Reattore al torio
|
||||
block.alloy-smelter.name=Altoforno
|
||||
block.mend-projector.name=Riparatore
|
||||
unit.alpha-drone.name=Drone Alpha
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -39,7 +39,6 @@ text.players.single=현재 {0}명만 있음.
|
||||
text.server.mismatch=클라이언트와 서버 버전이 일치하지 않습니다. 자신이 서버를 호스트하거나 최신 버전을 사용 해 주세요!
|
||||
text.server.closing=[accent]서버 닫는중...
|
||||
text.server.kicked.kick=당신은 서버에서 추방되었습니다!
|
||||
text.server.kicked.fastShoot=당신은 총을 너무 빨리 발사했습니다.
|
||||
text.server.kicked.clientOutdated=오래된 버전의 클라이언트 입니다! 게임을 업데이트 하세요!
|
||||
text.server.kicked.serverOutdated=오래된 버전의 서버입니다! 서버 호스트 관리자에게 문의하세요!
|
||||
text.server.kicked.banned=당신은 서버에서 밴 망치를 맞아 차단당했습니다.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -210,7 +210,6 @@ text.maps=Mapy
|
||||
text.maps.none=[LIGHT_GRAY]Nie znalesiono żadnych map!
|
||||
text.unlocked=Odblokowano nowy blok!
|
||||
text.unlocked.plural=Odblokowano nowe bloki!
|
||||
text.server.kicked.fastShoot=Strzelasz zbyt szybko.
|
||||
text.server.kicked.banned=Zostałeś zbanowany na tym serwerze.
|
||||
text.server.kicked.recentKick=Zostałeś niedawno wyrzucony.\nPoczekaj chwilę przed ponownym połączniem.
|
||||
text.server.kicked.nameInUse=Ta nazwa jest już zajęta na tym serwerze.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -161,7 +161,6 @@ text.players.single={0} Jogador Ativo
|
||||
text.server.mismatch=Packet error: Versão do Cliente/Servidor Incompativel.\nTenha certeza Que Host tem\nA ultima versão de Mindustry!
|
||||
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.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.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -341,6 +341,8 @@ text.keybind.title=Переназначение клавиш
|
||||
category.general.name=Основное
|
||||
category.view.name=Просмотр
|
||||
category.multiplayer.name=Мультиплеер
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.move_x.name=Движение по x
|
||||
keybind.move_y.name=Движение по y
|
||||
keybind.select.name=Выбор/Выстрел
|
||||
|
||||
@ -256,7 +256,6 @@ text.maps=Maps
|
||||
text.maps.none=[LIGHT_GRAY]No maps found!
|
||||
text.unlocked=New Block Unlocked!
|
||||
text.unlocked.plural=New Blocks Unlocked!
|
||||
text.server.kicked.fastShoot=You are shooting too quickly.
|
||||
text.server.kicked.nameInUse=There is someone with that name\nalready on this server.
|
||||
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.
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -62,7 +62,6 @@ text.players.single={0} гравець онлай
|
||||
text.server.mismatch=Пакетна помилка: невідповідність версії клієнта / сервера. \nПереконайтеся, що ви та хост мають останню версію Mindustry!
|
||||
text.server.closing=[accent]Закриття сервера...
|
||||
text.server.kicked.kick=Ви були вигнані(кікнуті) з сервера!
|
||||
text.server.kicked.fastShoot=Ви стріляєте занадто швидко.
|
||||
text.server.kicked.serverClose=Сервер закритий.
|
||||
text.server.kicked.sectorComplete=Сектор завершено.
|
||||
text.server.kicked.sectorComplete.text=Ваша місія завершена. \nСервер продовжить роботу в наступному секторі.
|
||||
@ -590,3 +589,11 @@ block.tau-mech-factory.name=Tau Mech Reconstructor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -57,7 +57,6 @@ text.players.single={0} 玩家在线
|
||||
text.server.mismatch=Packet error: 可能是客户端/服务器版本不匹配\n请确保你和房主\n都安装了最新版 Mindustry！
|
||||
text.server.closing=[accent]正在关闭服务器...
|
||||
text.server.kicked.kick=你被踢出服务器了!
|
||||
text.server.kicked.fastShoot=你发射得太快了！
|
||||
text.server.kicked.clientOutdated=客户端版本过旧！请升级！
|
||||
text.server.kicked.serverOutdated=服务器版本过旧！请联系房主升级！
|
||||
text.server.kicked.banned=你被这个服务器拉黑了。
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=钍反应堆
|
||||
block.alloy-smelter.name=合金冶炼厂
|
||||
block.mend-projector.name=修理投影机
|
||||
unit.alpha-drone.name=Alpha 无人机
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -26,7 +26,6 @@ text.players.single={0} 個線上玩家
|
||||
text.server.mismatch=封包錯誤：客戶端與伺服器版本可能不相符。確保您和伺服主都有最新版本的 Mindustry！
|
||||
text.server.closing=[accent] 正在關閉伺服器...
|
||||
text.server.kicked.kick=您已被踢出伺服器！
|
||||
text.server.kicked.fastShoot=您射擊的太快了！
|
||||
text.server.kicked.clientOutdated=客戶端版本過舊！請更新遊戲！
|
||||
text.server.kicked.serverOutdated=伺服器版本過舊！請聯絡伺服主更新伺服器！
|
||||
text.server.kicked.banned=您已經從這個伺服器被封禁。
|
||||
@ -590,3 +589,11 @@ block.thorium-reactor.name=Thorium Reactor
|
||||
block.alloy-smelter.name=Alloy Smtler
|
||||
block.mend-projector.name=Mend Projector
|
||||
unit.alpha-drone.name=Alpha Drone
|
||||
text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
|
||||
keybind.press=Press a key...
|
||||
keybind.press.axis=Press an axis or key...
|
||||
keybind.deselect.name=Deselect
|
||||
block.surge-wall.name=Surge Wall
|
||||
block.surge-wall-large.name=Large Surge Wall
|
||||
block.cyclone.name=Cyclone
|
||||
block.fuse.name=Fuse
|
||||
|
||||
@ -117,7 +117,7 @@ public class UI extends SceneModule{
|
||||
font.setUseIntegerPositions(false);
|
||||
font.getData().setScale(Vars.fontScale);
|
||||
font.getData().down += Unit.dp.scl(4f);
|
||||
font.getData().lineHeight -= Unit.dp.scl(2f);
|
||||
font.getData().lineHeight -= Unit.dp.scl(4.3f);
|
||||
}, skin.font(), skin.getFont("default-font-chat"), skin.getFont("korean"), skin.getFont("trad-chinese"), skin.getFont("simp-chinese"));
|
||||
}
|
||||
|
||||
|
||||
@ -20,21 +20,22 @@ public class Changelogs{
|
||||
String description = value.getString("body").replace("\r", "");
|
||||
int id = value.getInt("id");
|
||||
int build = Integer.parseInt(value.getString("tag_name").substring(1));
|
||||
out.add(new VersionInfo(name, description, id, build));
|
||||
out.add(new VersionInfo(name, description, id, build, value.getString("published_at")));
|
||||
}
|
||||
success.accept(out);
|
||||
}, fail);
|
||||
}
|
||||
|
||||
public static class VersionInfo{
|
||||
public final String name, description;
|
||||
public final String name, description, date;
|
||||
public final int id, build;
|
||||
|
||||
public VersionInfo(String name, String description, int id, int build){
|
||||
public VersionInfo(String name, String description, int id, int build, String date){
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.id = id;
|
||||
this.build = build;
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -63,7 +63,7 @@ public class ChangelogDialog extends FloatingDialog{
|
||||
Table in = new Table("clear");
|
||||
in.top().left().margin(10);
|
||||
|
||||
in.add("[accent]" + info.name);
|
||||
in.add("[accent]" + info.name + "[LIGHT_GRAY] | " + info.date);
|
||||
if(info.build == Version.build){
|
||||
in.row();
|
||||
in.add("$text.changelog.current");
|
||||
|
||||
Reference in New Issue
Block a user