Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-06-02 11:56:13 -04:00
parent 4dd414c22f 38b9027000
commit afee374a66
47 changed files with 386 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+5 -3
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Sort by stars
schematic = Schematic
schematic.add = Save Schematic...
schematics = Schematics
schematic.search = Search schematics...
schematic.replace = A schematic by that name already exists. Replace it?
schematic.exists = A schematic by that name already exists.
schematic.import = Import Schematic...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Share on Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
schematic.saved = Schematic saved.
schematic.delete.confirm = This schematic will be utterly eradicated.
schematic.rename = Rename Schematic
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocks
schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
schematic.tags = Tags:
@@ -78,6 +79,7 @@ schematic.addtag = Add Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Rename Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Delete this tag completely?
schematic.tagexists = That tag already exists.
@@ -463,7 +465,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@@ -1791,7 +1793,7 @@ hint.launch = Once enough resources are collected, you can [accent]Launch[] by s
hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \uE827 [accent]Map[] in the \uE88C [accent]Menu[].
hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
hint.rebuildSelect.mobile = Select the \uE874 copy button, then tap the \uE80F rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
hint.conveyorPathfind.mobile = Enable \uE844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
core/assets/bundles/bundle_be.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Сартаваць па зоркам
schematic = Схема
schematic.add = Захаваць схему...
schematics = Схемы
schematic.search = Search schematics...
schematic.replace = Схема с дадзенай назвай ужо існуе. Замяніць яе?
schematic.exists = Схема с дадзенай назвай ужо існуе.
schematic.import = Імпартаваць схему...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Падзяліцца ў Майстэрні
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Адлюстраваць схему
schematic.saved = Схема захавана.
schematic.delete.confirm = Гэтая схема будзе выдалена.
schematic.rename = Пераназваць схему
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} блокаў
schematic.disabled = [scarlet]Схемы забаронены[]\nВам нельга выкарыстоўваць схемы на гэтай [accent]карце[] альбо [accent]серверы.
schematic.tags = Тэгі:
@@ -77,6 +78,7 @@ schematic.addtag = Дадаць Тэг
schematic.texttag = Тэкставы Тэгу
schematic.icontag = Іконкавы Тэгу
schematic.renametag = Пераназваць Тэг
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Выдаліць гэты тэг цалкам?
schematic.tagexists = Такі тэг ужо ёсць.
stats = Вынікі
@@ -454,7 +456,7 @@ waves.sort.begin = Пачатак
waves.sort.health = Здароўе
waves.sort.type = Тып
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Схаваць Усё
waves.units.show = Паказаць Усё
core/assets/bundles/bundle_bg.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Сортирай по рейтинг
schematic = Схема
schematic.add = Запази Схема...
schematics = Схеми
schematic.search = Search schematics...
schematic.replace = Вече съществува схема с това име. Да бъде ли заместена?
schematic.exists = Вече съществува схема с това име.
schematic.import = Внасяне на Схема...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Сподели в Работилницата
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Обърни Схемата
schematic.saved = Схемате беше запазена.
schematic.delete.confirm = Тази схема ще бъде напълно унищожена.
schematic.rename = Преименуване на схема
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} елемента
schematic.disabled = [scarlet]Схемите не са достъпни[]\nНе ви е позволено да използвате Схеми на тази [accent]карта[] или [accent]сървър[].
schematic.tags = Tags:
@@ -78,6 +79,7 @@ schematic.addtag = Add Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Rename Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Delete this tag completely?
schematic.tagexists = That tag already exists.
@@ -459,7 +461,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_ca.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Ordena per valoració
schematic = Esquema
schematic.add = Desa l’esquema…
schematics = Esquemes
schematic.search = Search schematics...
schematic.replace = Ja hi ha un esquema amb aquest nom. Voleu reemplaçar-lo?
schematic.exists = Ja hi ha un esquema amb aquest nom.
schematic.import = Importa un esquema
@@ -69,7 +70,7 @@ schematic.shareworkshop = Comparteix al Workshop de l’Steam
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Dóna la volta a l’esquema
schematic.saved = L’esquema s’ha desat.
schematic.delete.confirm = Aquest esquema s’esborrarà.
schematic.rename = Reanomena l’esquema
schematic.edit = Edit Schematic
schematic.info = {0}×{1}, {2} blocs
schematic.disabled = [scarlet]Els esquemes s’han desactivat.[]\nNo podeu fer servir esquemes en aquest [accent]mapa[] o [accent]servidor[].
schematic.tags = Etiquetes:
@@ -78,6 +79,7 @@ schematic.addtag = Afegeix una etiqueta
schematic.texttag = Text de l’etiqueta
schematic.icontag = Icona de l’etiqueta
schematic.renametag = Canvia el nom de l’etiqueta
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Voleu esborrar del tot aquesta etiqueta?
schematic.tagexists = Aquesta etiqueta ja existeix.
@@ -459,7 +461,7 @@ waves.sort.begin = Comença
waves.sort.health = Salut
waves.sort.type = Tipus
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Amaga-les totes
waves.units.show = Mostra-les totes
core/assets/bundles/bundle_cs.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Řadit podle hvězd
schematic = Šablona
schematic.add = Uložit šablonu...
schematics = Šablony
schematic.search = Search schematics...
schematic.replace = Šablona s tímto názvem již existuje. Chceš ji nahradit?
schematic.exists = Šablona s tímto názvem již existuje.
schematic.import = Importuji šablonu...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Sdílet skrze Workshop na Steamu
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Převrátit šablonu
schematic.saved = Šablona byla uložena.
schematic.delete.confirm = Šablona bude kompletně vyhlazena.
schematic.rename = Přejmenovat šablonu
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} bloků
schematic.disabled = [scarlet]Šablony jsou zakázány[]\nNa této [accent]mapě[] nebo [accent]serveru[] nemůžeš používat šablony.
schematic.tags = Značky:
@@ -78,6 +79,7 @@ schematic.addtag = Přidat Značku
schematic.texttag = Textová Značka
schematic.icontag = Ikonová Značka
schematic.renametag = Přejmenovat Značku
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Smazat tuto značku?
schematic.tagexists = Tato značka již existuje.
@@ -459,7 +461,7 @@ waves.sort.begin = Začít
waves.sort.health = Životy
waves.sort.type = Typ
waves.search = Hledat vlny...
waves.filter.unit = Filtr Jednotky
waves.filter = Unit Filter
waves.units.hide = Schovat vše
waves.units.show = Zobrazit vše
core/assets/bundles/bundle_da.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Sort by stars
schematic = Skabelon
schematic.add = Gem skabelon...
schematics = Skabeloner
schematic.search = Search schematics...
schematic.replace = En skabelon med det navn eksisterer allerede - vil du erstatte denne?
schematic.exists = En skabelon med det navn eksisterer allerede.
schematic.import = Importer skabelon ...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Del på Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Vend skabelon
schematic.saved = Skabelon gemt.
schematic.delete.confirm = Denne skabelon vil være væk for altid.
schematic.rename = Omdøb skabelon
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blokke
schematic.disabled = [scarlet]Skabeloner er slået fra.[]\nDu har ikke lov til at bruge skabeloner på denne [accent]bane[] eller [accent]server.
schematic.tags = Tags:
@@ -77,6 +78,7 @@ schematic.addtag = Add Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Rename Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Delete this tag completely?
schematic.tagexists = That tag already exists.
stats = Stats
@@ -455,7 +457,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_de.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Nach Sternen sortieren
schematic = Entwurf
schematic.add = Entwurf speichern...
schematics = Entwürfe
schematic.search = Search schematics...
schematic.replace = Es gibt bereits einen Entwurf mit diesem Namen. Diesen ersetzen?
schematic.exists = Es gibt schon einen Entwurf mit diesem Namen.
schematic.import = Entwurf importieren...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Im Workshop teilen
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Entwurf umkehren
schematic.saved = Entwurf gespeichert.
schematic.delete.confirm = Dieser Entwurf wird vollständig vernichtet.
schematic.rename = Entwurf umbenennen
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} Blöcke
schematic.disabled = [scarlet]Entwürfe deaktiviert[]\nAuf dieser [accent]Karte[] oder [accent]Server[] dürfen keine Entwürfe verwendet werden.
schematic.tags = Tags:
@@ -78,6 +79,7 @@ schematic.addtag = Tag hinzufügen
schematic.texttag = Text-Tag
schematic.icontag = Bild-Tag
schematic.renametag = Tag umbenennen
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Dieses Tag wirklich löschen?
schematic.tagexists = Dieses Tag gibt es schon.
@@ -462,7 +464,7 @@ waves.sort.begin = Anfang
waves.sort.health = Lebenspunkte
waves.sort.type = Sorte
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Alle verstecken
waves.units.show = Alle anzeigen
core/assets/bundles/bundle_es.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Mejor valorados
schematic = Esquema
schematic.add = Guardar esquema...
schematics = Esquemas
schematic.search = Search schematics...
schematic.replace = Ya existe un esquema con ese nombre. ¿Quieres reemplazarlo?
schematic.exists = Ya existe un esquema con ese nombre.
schematic.import = Importar esquema...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Compartir en Steam Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Invertir esquema
schematic.saved = Esquema guardado.
schematic.delete.confirm = Este esquema será absolutamente erradicado.
schematic.rename = Renombrar esquema
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} bloques
schematic.disabled = [scarlet]Esquemas desactivados.[]\nNo está permitido usar esquemas en este [accent]mapa[] o [accent]servidor.
schematic.tags = Etiquetas:
@@ -78,6 +79,7 @@ schematic.addtag = Añadir etiqueta
schematic.texttag = Texto de etiqueta
schematic.icontag = Icono de etiqueta
schematic.renametag = Renombrar etiqueta
schematic.tagged = {0} tagged
schematic.tagdelconfirm = ¿Eliminar completamente esta etiqueta?
schematic.tagexists = Esa etiqueta ya existe.
@@ -459,7 +461,7 @@ waves.sort.begin = Inicio
waves.sort.health = Vida
waves.sort.type = Tipo
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Ocultar todo
waves.units.show = Mostrar todo
core/assets/bundles/bundle_et.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Sort by stars
schematic = Schematic
schematic.add = Save Schematic...
schematics = Schematics
schematic.search = Search schematics...
schematic.replace = A schematic by that name already exists. Replace it?
schematic.exists = A schematic by that name already exists.
schematic.import = Import Schematic...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Share on Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
schematic.saved = Schematic saved.
schematic.delete.confirm = This schematic will be utterly eradicated.
schematic.rename = Rename Schematic
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocks
schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
schematic.tags = Tags:
@@ -77,6 +78,7 @@ schematic.addtag = Add Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Rename Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Delete this tag completely?
schematic.tagexists = That tag already exists.
stats = Stats
@@ -455,7 +457,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_eu.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Ordenatu izarren arabera
schematic = Eskema
schematic.add = Gorde eskema...
schematics = Eskemak
schematic.search = Search schematics...
schematic.replace = Badago izen bereko eskema bat. Ordeztu nahi duzu?
schematic.exists = Badago izen bereko eskema bat.
schematic.import = Inportatu eskema...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Partekatu tailerrean
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: itzulbiratu eskema
schematic.saved = Eskema gordeta.
schematic.delete.confirm = Eskema hau behin betiko suntsituko da.
schematic.rename = Aldatu izena eskemari
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} bloke
schematic.disabled = [scarlet]Eskemak desgaituta[]\nEz duzu eskemak erabiltzeko baimenik [accent]mapa[] edo [accent]zerbitzari[] honetan.
schematic.tags = Etiketak:
@@ -77,6 +78,7 @@ schematic.addtag = Gehitu etiketa
schematic.texttag = Etiketaren testua
schematic.icontag = Etiketaren ikonoa
schematic.renametag = Aldatu etiketaren izena
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Ezabatu etiketa hau erabat?
schematic.tagexists = Etiketa badago aurretik.
stats = Estatistikak
@@ -457,7 +459,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_fi.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Järjestä tähtien määrän perusteella
schematic = Kaavio
schematic.add = Tallenna kaavio...
schematics = Kaaviot
schematic.search = Search schematics...
schematic.replace = Kaavio tällä nimellä on jo olemassa. Haluatko korvata sen?
schematic.exists = Kaavio tällä nimellä on jo olemassa.
schematic.import = Tuo kaavio...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Jaa Workshoppiin
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Käännä Kaavio
schematic.saved = Kaavio tallennettu.
schematic.delete.confirm = Tämä kaavio poistetaan.
schematic.rename = Nimeä kaavio uudelleen
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} palikkaa
schematic.disabled = [scarlet]Kaaviot poistettu käytöstä[]\nEt pysty käyttämään kaavioita tällä [accent]kartalla[] tai [accent]palvelimella.
schematic.tags = Tunnisteet:
@@ -77,6 +78,7 @@ schematic.addtag = Lisää tunniste
schematic.texttag = Tekstitunniste
schematic.icontag = Kuvatunniste
schematic.renametag = Nimeä tunniste uudelleen
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Poista tunniste pysyvästi?
schematic.tagexists = Samanlainen tunniste on jo olemassa.
stats = Tilastot
@@ -455,7 +457,7 @@ waves.sort.begin = Alkutaso
waves.sort.health = Elämäpisteet
waves.sort.type = Tyyppi
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Piilota kaikki
waves.units.show = Näytä kaikki
core/assets/bundles/bundle_fil.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Sort by stars
schematic = Schematic
schematic.add = I-adya ang Schematic...
schematics = Mga Schematic
schematic.search = Search schematics...
schematic.replace = Ang schematic na ito ay magkaparehas ang pangalan. Gusto mo bang palitan ito?
schematic.exists = Ang schematic na ito ay magkaparehas ang pangalan.
schematic.import = I-angkat ang Schematic...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Ibahagi sa Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Baligtarin ang Schematic
schematic.saved = Na-i-adya na ang schematic.
schematic.delete.confirm = Ang schematic na'to ay tuluyang mawawala.
schematic.rename = Palitan Ang Pangalan ng Schematic
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocks
schematic.disabled = [scarlet]Ang mga schematics ay pinagbabawalan.[]\nBawal ka gumamit gang schematics sa [accent]mapa[] or [accent]server[] na ito.
schematic.tags = Mga Tag:
@@ -77,6 +78,7 @@ schematic.addtag = Mag-dagdag ng Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Palitan ang pangalan ng Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = I-delete itong tag?
schematic.tagexists = Meron nang tag na ganito.
stats = Mga Statistiko
@@ -455,7 +457,7 @@ waves.sort.begin = Simula
waves.sort.health = Health
waves.sort.type = Uri
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Itago lahat
waves.units.show = Ipakita lahat
core/assets/bundles/bundle_fr.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Classer par étoiles
schematic = Schéma
schematic.add = Enregistrer le Schéma
schematics = Schémas
schematic.search = Search schematics...
schematic.replace = Un schéma avec ce nom existe déjà. Voulez-vous le remplacer ?
schematic.exists = Un schéma avec ce nom existe déjà.
schematic.import = Importer un schéma
@@ -69,7 +70,7 @@ schematic.shareworkshop = Partager sur le Steam Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Retourner le schéma
schematic.saved = Schéma enregistré.
schematic.delete.confirm = Ce schéma sera supprimé définitivement !
schematic.rename = Renommer le schéma
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocs
schematic.disabled = [scarlet]Schémas désactivés ![]\nVous n'êtes pas autorisés à utiliser des schémas sur cette [accent]carte[] ou dans ce [accent]serveur.
schematic.tags = Étiquettes :
@@ -78,6 +79,7 @@ schematic.addtag = Ajouter une étiquette
schematic.texttag = Mot
schematic.icontag = Icône
schematic.renametag = Renommer l'étiquette
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Voulez-vous supprimer cette étiquette définitivement ?
schematic.tagexists = Cette étiquette existe déjà.
@@ -463,7 +465,7 @@ waves.sort.begin = Vague
waves.sort.health = Santé
waves.sort.type = Type
waves.search = Rechercher des vagues...
waves.filter.unit = Filtre d'Unité
waves.filter = Unit Filter
waves.units.hide = Masquer tout
waves.units.show = Afficher tout
core/assets/bundles/bundle_hu.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Rendezés értékelés szerint
schematic = Schematic
schematic.add = Schematic mentése...
schematics = Schematic-ok
schematic.search = Search schematics...
schematic.replace = Már van ilyen nevű schematic. Lecseréled?
schematic.exists = Már van ilyen nevű schematic.
schematic.import = Schematic importálása...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Megosztás a Workshopon
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Schematic tükrözése
schematic.saved = Schematic mentve.
schematic.delete.confirm = Ez a Schematic törölve lesz.
schematic.rename = Schematic átnevezése
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blokk
schematic.disabled = [scarlet]Schematicok letiltva[]\nNem használhat Schematicot ezen a [accent]mapon[] vagy [accent] szerveren.
schematic.tags = Címkék:
@@ -78,6 +79,7 @@ schematic.addtag = Címke hozzáadása
schematic.texttag = Következő címke
schematic.icontag = Icon címke
schematic.renametag = Címke átnevezése
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Teljesen törlöd ezt a címkét?
schematic.tagexists = Ez a címke már létezik.
@@ -458,7 +460,7 @@ waves.sort.begin = Begin
waves.sort.health = Élet
waves.sort.type = Típus
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_id_ID.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Urut berdasarkan bintang
schematic = Bagan
schematic.add = Menyimpan bagan...
schematics = Kumpulan bagan
schematic.search = Search schematics...
schematic.replace = Bagan dengan nama tersebut sudah ada. Ganti dengan yang baru?
schematic.exists = Sebuah bagan dengan nama tersebut sudah ada.
schematic.import = Mengimpor bagan...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Bagikan di Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Balik Bagan
schematic.saved = Bagan telah disimpan.
schematic.delete.confirm = Bagan ini akan benar-benar dihapus.
schematic.rename = Ganti Nama Bagan
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blok
schematic.disabled = [scarlet]Bagan dilarang[]\nAnda tidak diperbolehkan untuk menggunakan bagan di [accent]peta[] atau [accent]server ini.
schematic.tags = Tanda:
@@ -78,6 +79,7 @@ schematic.addtag = Tambah Tanda
schematic.texttag = Teks Tanda
schematic.icontag = Ikon Tanda
schematic.renametag = Ubah Nama Tanda
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Hapus tanda ini sepenuhnya?
schematic.tagexists = Tanda tersebut sudah ada.
@@ -459,7 +461,7 @@ waves.sort.begin = Mulai
waves.sort.health = Darah
waves.sort.type = Tipe
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Sembunyikan Semua
waves.units.show = Lihat Semua
core/assets/bundles/bundle_it.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Ordinato per stelle
schematic = Schematica
schematic.add = Salva Schematica...
schematics = Schematiche
schematic.search = Search schematics...
schematic.replace = Esiste già una schematica con questo nome. Sostituirla?
schematic.exists = Esiste già una schematica con questo nome.
schematic.import = Importa schematica
@@ -68,7 +69,7 @@ schematic.shareworkshop = Condividi nel Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Ruota Schematica
schematic.saved = Schematica salvata.
schematic.delete.confirm = Questa schematica sarà cancellata definitivamente.
schematic.rename = Rinomina Schematica
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocchi
schematic.disabled = [scarlet]Schematiche disabilitate[]\nNon hai il permesso di usare schematiche in questa [accent]mappa[] o [accent]server.
schematic.tags = Tags:
@@ -77,6 +78,7 @@ schematic.addtag = Aggiungi Tag
schematic.texttag = Tag di testo
schematic.icontag = Tag immagine
schematic.renametag = Rinomina Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Eliminare il tag definitivamente?
schematic.tagexists = Tag già esistente.
@@ -457,7 +459,7 @@ waves.sort.begin = Inizia
waves.sort.health = Salute
waves.sort.type = Tipo
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Nascondi tutto
waves.units.show = Mostra tutto
core/assets/bundles/bundle_ja.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = お気に入り数で並べる
schematic = 設計図
schematic.add = 設計図を保存
schematics = 設計図一覧
schematic.search = Search schematics...
schematic.replace = その名前の設計図は既に存在しています。上書きしますか？
schematic.exists = その名前の設計図は既に存在しています。
schematic.import = 設計図をインポート
@@ -69,7 +70,7 @@ schematic.shareworkshop = ワークショップで共有する
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: 反転
schematic.saved = 設計図を保存しました。
schematic.delete.confirm = この設計図は完全に削除されます。よろしいですか
schematic.rename = 設計図の名前を変更する。
schematic.edit = Edit Schematic
schematic.info = {1}x{0}, {2} ブロック
schematic.disabled = [scarlet]設計図使用不可[]\nこの[accent]マップ[]、[accent]サーバー[]では設計図の使用は許可されていません。
schematic.tags = タグ:
@@ -78,6 +79,7 @@ schematic.addtag = タグを追加
schematic.texttag = テキストタグ
schematic.icontag = アイコンタグ
schematic.renametag = タグの名前変更
schematic.tagged = {0} tagged
schematic.tagdelconfirm = このタグをすべて削除しますか？
schematic.tagexists = このタグはすでに存在します。
@@ -459,7 +461,7 @@ waves.sort.begin = 開始
waves.sort.health = 体力
waves.sort.type = タイプ
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = すべて非表示
waves.units.show = すべて表示
core/assets/bundles/bundle_ko.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = 추천(스타) 수
schematic = 설계도
schematic.add = 설계도 저장하기
schematics = 설계도
schematic.search = Search schematics...
schematic.replace = 해당 이름의 설계도가 이미 존재합니다. 교체하시겠습니까?
schematic.exists = 해당 이름의 설계도가 이미 존재합니다.
schematic.import = 설계도 가져오기
@@ -69,7 +70,7 @@ schematic.shareworkshop = 창작마당에 공유
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: 설계도 뒤집기
schematic.saved = 설계도 저장됨
schematic.delete.confirm = 이 설계도는 완전히 삭제될 것입니다.
schematic.rename = 설계도 이름 바꾸기
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} 블록
schematic.disabled = [scarlet]설계도 비활성화됨[]\n이 [accent]맵[] 또는 [accent]서버[] 에서는 설계도를 사용할 수 없습니다.
schematic.tags = 태그:
@@ -78,6 +79,7 @@ schematic.addtag = 태그 추가하기
schematic.texttag = 텍스트 태그
schematic.icontag = 아이콘 태그
schematic.renametag = 태그 이름바꾸기
schematic.tagged = {0} tagged
schematic.tagdelconfirm = 이 태그를 완전히 삭제하시겠습니까?
schematic.tagexists = 이 태그는 이미 존재합니다.
@@ -458,7 +460,7 @@ waves.sort.begin = 시작 단계
waves.sort.health = 체력
waves.sort.type = 기체 유형
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = 모두 숨기기
waves.units.show = 모두 보이기
core/assets/bundles/bundle_lt.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Sort by stars
schematic = Schema
schematic.add = Išsaugoti schemą...
schematics = Schemos
schematic.search = Search schematics...
schematic.replace = Schema šiuo pavadinimu jau egzistuoja. Pakeisti?
schematic.exists = Schema šiuo pavadinimu jau egzistuoja.
schematic.import = Importuoti schemą...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Dalintis Dirbtuvėje
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Apversti schemą
schematic.saved = Schema išsaugota.
schematic.delete.confirm = Ši schema bus negrįžtamai pašalinta.
schematic.rename = Pervadinti schemą
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blokai
schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
schematic.tags = Tags:
@@ -77,6 +78,7 @@ schematic.addtag = Add Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Rename Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Delete this tag completely?
schematic.tagexists = That tag already exists.
stats = Stats
@@ -455,7 +457,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_nl.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Sorteer op sterren
schematic = Ontwerp
schematic.add = Bewaar ontwerp...
schematics = Ontwerpen
schematic.search = Search schematics...
schematic.replace = Er bestaat al een ontwerp met die naam. Overschrijven?
schematic.exists = Een ontwerp met die naam bestaat al.
schematic.import = Importeer ontwerp...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Delen op de Werkplaats
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Spiegel ontwerp
schematic.saved = Ontwerp bewaard.
schematic.delete.confirm = Dit ontwerp zal in een zwart gat verdwijnen.
schematic.rename = Hernoem ontwerp
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blokken
schematic.disabled = [scarlet]Ontwerpen uitgeschakeld[]\nJe hebt geen toestemming om ontwerpen te gebruiken op deze [accent]map[] of [accent]server.
schematic.tags = Tags:
@@ -78,6 +79,7 @@ schematic.addtag = Voeg Tag toe
schematic.texttag = Tekst Tag
schematic.icontag = Icoon Tag
schematic.renametag = Hernoem Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Deze tag compleet verwijderen?
schematic.tagexists = Die tag bestaat al.
@@ -463,7 +465,7 @@ waves.sort.begin = Begin
waves.sort.health = Levenspunten
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Verberg Alle
waves.units.show = Toon Alle
core/assets/bundles/bundle_nl_BE.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Sort by stars
schematic = Blauwdruk
schematic.add = Blauwdruk Opslaan...
schematics = Blauwdrukken
schematic.search = Search schematics...
schematic.replace = Er bestaat al een blaudruk met deze naam. Vervangen?
schematic.exists = A schematic by that name already exists.
schematic.import = Importeer Blauwdruk...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Deel op Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
schematic.saved = Blauwdruk opgeslagen.
schematic.delete.confirm = This schematic will be utterly eradicated.
schematic.rename = Blauwdruk Hernoemen
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blokken
schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
schematic.tags = Tags:
@@ -77,6 +78,7 @@ schematic.addtag = Add Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Rename Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Delete this tag completely?
schematic.tagexists = That tag already exists.
stats = Stats
@@ -455,7 +457,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_pl.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Sortuj wg gwiazdek
schematic = Schemat
schematic.add = Zapisz schemat...
schematics = Schematy
schematic.search = Search schematics...
schematic.replace = Schemat o tej nazwie już istnieje. Czy chcesz go zastąpić?
schematic.exists = Schemat o tej nazwie już istnieje.
schematic.import = Importuj Schemat...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Podziel się na Warsztacie
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Odwróć schemat
schematic.saved = Schemat zapisany.
schematic.delete.confirm = Ten schemat zostanie usunięty.
schematic.rename = Zmień nazwę schematu
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} bloków
schematic.disabled = [scarlet]Schematy są wyłączone[]\nNie możesz używać schematów na tej [accent]mapie[] lub [accent]serwerze.
schematic.tags = Tagi:
@@ -78,6 +79,7 @@ schematic.addtag = Dodaj Znacznik
schematic.texttag = Tekst Znacznika
schematic.icontag = Ikona Znacznika
schematic.renametag = Zmień Nazwę Znacznika
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Czy kompletnie usunąć znacznik?
schematic.tagexists = Taki znacznik już istnieje.
@@ -459,7 +461,7 @@ waves.sort.begin = Rozpocznij
waves.sort.health = Zdrowie
waves.sort.type = Typ
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Schowaj Wszystkie
waves.units.show = Pokaż Wszystkie
core/assets/bundles/bundle_pt_BR.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Ordenar por estrelas
schematic = Esquema
schematic.add = Salvar esquema
schematics = Esquemas
schematic.search = Search schematics...
schematic.replace = Um esquema com esse nome já existe. Substituí-lo?
schematic.exists = Um esquema com esse nome já existe.
schematic.import = Importar esquema...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Compartilhar na Oficina
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Virar o esquema
schematic.saved = Esquema salvo.
schematic.delete.confirm = Esse esquema será apagado. Tem certeza?
schematic.rename = Renomear esquema
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocos
schematic.disabled = [scarlet]Esquemas desativados[]\nVocê não tem permissão para usar esquemas nesse [accent]mapa[] ou [accent]servidor.
schematic.tags = Tags:
@@ -78,6 +79,7 @@ schematic.addtag = Adicionar Tag
schematic.texttag = Tag de Texto
schematic.icontag = Tag de Ícone
schematic.renametag = Renomear Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Deletar essa tag completamente?
schematic.tagexists = Essa tag já existe.
@@ -459,7 +461,7 @@ waves.sort.begin = Começar
waves.sort.health = Vida
waves.sort.type = Tipo
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Esconder tudo
waves.units.show = Mostrar tudo
core/assets/bundles/bundle_pt_PT.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Sort by stars
schematic = Esquema
schematic.add = Gravar Esquema...
schematics = Esquemas
schematic.search = Search schematics...
schematic.replace = Um esquema com esse nome já existe. Deseja substituí-lo?
schematic.exists = A schematic by that name already exists.
schematic.import = Importar Esquema...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Partilhar na Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Rodar Esquema
schematic.saved = Esquema gravado.
schematic.delete.confirm = Este esquema irá ser completamente apagado.
schematic.rename = Renomear Esquema
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocos
schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
schematic.tags = Tags:
@@ -77,6 +78,7 @@ schematic.addtag = Add Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Rename Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Delete this tag completely?
schematic.tagexists = That tag already exists.
stats = Stats
@@ -455,7 +457,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_ro.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Cele mai multe stele
schematic = Schemă
schematic.add = Salvează Schema...
schematics = Scheme
schematic.search = Search schematics...
schematic.replace = O schemă cu acel nume există deja. O înlocuiți?
schematic.exists = O schemă cu acel nume există deja.
schematic.import = Importă Schema...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Partajează pe Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Întoarce Schema
schematic.saved = Schemă salvată.
schematic.delete.confirm = Schema această va fi ștearsă permanent.
schematic.rename = Redenumește Schema
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocuri
schematic.disabled = [scarlet]Schemele sunt dezactivate[]\nNu ai voie să folosești scheme pe această [accent]hartă[] sau [accent]server.
schematic.tags = Etichete:
@@ -78,6 +79,7 @@ schematic.addtag = Adaugă Etichetă
schematic.texttag = Etichetă Text
schematic.icontag = Etichetă Iconiță
schematic.renametag = Redenumește Eticheta
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Vrei să ștergi permanent eticheta?
schematic.tagexists = Acea etichetă există deja.
@@ -459,7 +461,7 @@ waves.sort.begin = Început
waves.sort.health = Viață
waves.sort.type = Tip
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Ascunde
waves.units.show = Vezi Tot
core/assets/bundles/bundle_ru.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Сортировка по количеству звёз
schematic = Схема
schematic.add = Сохранить схему…
schematics = Схемы
schematic.search = Search schematics...
schematic.replace = Схема с таким названием уже существует. Заменить её?
schematic.exists = Схема с таким названием уже существует.
schematic.import = Импортировать схему…
@@ -69,7 +70,7 @@ schematic.shareworkshop = Поделиться в Мастерской
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Отразить схему
schematic.saved = Схема сохранена.
schematic.delete.confirm = Эта схема будет поджарена Испепелителем.
schematic.rename = Переименовать схему
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} блоков
schematic.disabled = [scarlet]Схемы отключены[]\nНа этой [accent]карте[] или [accent]сервере[] запрещено использование схем.
schematic.tags = Теги:
@@ -78,6 +79,7 @@ schematic.addtag = Добавить тег
schematic.texttag = Текстовый тег
schematic.icontag = Символьный тег
schematic.renametag = Переименовать тег
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Удалить этот тег навсегда?
schematic.tagexists = Такой тег уже существует.
@@ -459,7 +461,7 @@ waves.sort.begin = Начало
waves.sort.health = Здоровье
waves.sort.type = Тип
waves.search = Поиск волн...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Скрыть все
waves.units.show = Показать все
core/assets/bundles/bundle_sr.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Sortiraj po broju "zvezdica"
schematic = Šeme
schematic.add = Snimi šemu
schematics = Šeme
schematic.search = Search schematics...
schematic.replace = Već postoji šema pod ovim imenom. Zameniti?
schematic.exists = Šema sa ovimn imenom već postoji.
schematic.import = Uvezi šemu.
@@ -69,7 +70,7 @@ schematic.shareworkshop = Podeli na radionici
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Prevrni šemu.
schematic.saved = Šema snimljena.
schematic.delete.confirm = Šema će biti potpuno uništena.
schematic.rename = Preimenuj šemu
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blokova
schematic.disabled = [scarlet]Šema onemogućena.[]\nZabranjena je upotreba šema na ovoj [accent]mapi[] ili na ovom [accent]serveru.
schematic.tags = Oznake:
@@ -78,6 +79,7 @@ schematic.addtag = Dodaj Oznaku
schematic.texttag = Tekstualna Oznaka
schematic.icontag = Slikovna Oznaka
schematic.renametag = Preimenuj Oznaku
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Potpuno izbriši oznaku?
schematic.tagexists = Ova oznaka već postoji.
@@ -459,7 +461,7 @@ waves.sort.begin = Početak
waves.sort.health = Snaga
waves.sort.type = Tip
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Sakrij Sve
waves.units.show = Pokaži Sve
core/assets/bundles/bundle_sv.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Sortera efter stjärnor
schematic = Schematic
schematic.add = Spara Schematic...
schematics = Schematics
schematic.search = Search schematics...
schematic.replace = En schematic med det namnet finns redan. Byt ut den?
schematic.exists = En schematic med det namnet finns redan.
schematic.import = Importera Schematic...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Dela på Workshoppen
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Vänd Schematic
schematic.saved = Schematic sparad.
schematic.delete.confirm = Den här schematicen kommer bli ytterst borttagen.
schematic.rename = Döp om Schematic
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} block
schematic.disabled = [scarlet]Schematics inaktiverade[]\nDu får inte använda schematics på denna [accent]kartan[] eller [accent]servern.
schematic.tags = Taggar:
@@ -77,6 +78,7 @@ schematic.addtag = Lägg till Taggar
schematic.texttag = Text Tagg
schematic.icontag = Ikon Tagg
schematic.renametag = Döp om Tagg
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Radera denna tagg fullständigt?
schematic.tagexists = Den taggen finns redan.
stats = Statistik
@@ -455,7 +457,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_th.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = เรียงตามคะแนนดาว
schematic = แผนผัง
schematic.add = บันทึกแผนผัง...
schematics = แผนผัง
schematic.search = Search schematics...
schematic.replace = มีแผนผังที่ใช้ชื่อนี้แล้ว แทนที่เลยไหม?
schematic.exists = มีแผนผังในชื่อนั้นอยู่แล้ว
schematic.import = นำเข้าแผนผัง...
@@ -69,7 +70,7 @@ schematic.shareworkshop = แชร์บนเวิร์กช็อป
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: กลับแผนผัง
schematic.saved = บันทึกแผนผังแล้ว
schematic.delete.confirm = แผนผังนี้จะถูกกำจัดให้หมดสิ้นไม่เหลือซาก
schematic.rename = เปลี่ยนชื่อแผนผัง
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} บล็อก
schematic.disabled = [scarlet]การใช้แผนผังถูกปิดไว้[]\nคุณไม่สามารถใช้แผนผังได้ใน[accent]แมพ[]หรือ[accent]เซิร์ฟเวอร์[]นี้
schematic.tags = แท็ก:
@@ -78,6 +79,7 @@ schematic.addtag = เพิ่มแท็ก
schematic.texttag = แท็กข้อความ
schematic.icontag = แท็กไอคอน
schematic.renametag = เปลี่ยนชื่อแท็ก
schematic.tagged = {0} tagged
schematic.tagdelconfirm = จะลบแท็กนี้ทั่วทั้งหมดเลยใช่ไหม?
schematic.tagexists = แท็กนี้มีอยู่แล้ว
@@ -459,7 +461,7 @@ waves.sort.begin = เริ่มต้น
waves.sort.health = พลังชีวิต
waves.sort.type = ชนิด
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = ซ่อนทั้งหมด
waves.units.show = แสดงทั้งหมด
core/assets/bundles/bundle_tk.properties
+4 -2
View File
@@ -56,6 +56,7 @@ mods.browser.sortstars = Sort by stars
schematic = Schematic
schematic.add = Save Schematic...
schematics = Schematics
schematic.search = Search schematics...
schematic.replace = A schematic by that name already exists. Replace it?
schematic.exists = A schematic by that name already exists.
schematic.import = Import Schematic...
@@ -68,7 +69,7 @@ schematic.shareworkshop = Share on Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
schematic.saved = Schematic saved.
schematic.delete.confirm = This schematic will be utterly eradicated.
schematic.rename = Rename Schematic
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blocks
schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
schematic.tags = Tags:
@@ -77,6 +78,7 @@ schematic.addtag = Add Tag
schematic.texttag = Text Tag
schematic.icontag = Icon Tag
schematic.renametag = Rename Tag
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Delete this tag completely?
schematic.tagexists = That tag already exists.
stats = Stats
@@ -455,7 +457,7 @@ waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
core/assets/bundles/bundle_tr.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Yıldıza göre Sırala
schematic = Şema
schematic.add = Şemayı Kaydet...
schematics = Şemalar
schematic.search = Search schematics...
schematic.replace = Aynı isimde bir şema zaten var. Üzerine yazılsın mı?
schematic.exists = Aynı isimde bir şema zaten var.
schematic.import = Şemayı İçeri Aktar
@@ -69,7 +70,7 @@ schematic.shareworkshop = Atölyede paylaş
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Şemayı döndür
schematic.saved = Şema Kaydedildi.
schematic.delete.confirm = Bu şema tamamen silinecek.
schematic.rename = Şemayı yeniden adlandır
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} blok
schematic.disabled = [scarlet]Şema devre dışı bırakıldı[]\nBu şemayı [accent]bu haritada[] veya [accent]server'da kullanma iznin yok.
schematic.tags = Etiketler:
@@ -78,6 +79,7 @@ schematic.addtag = Etiket Ekle
schematic.texttag = Yazı Etiketi
schematic.icontag = İkon Etiketi
schematic.renametag = Etiketi Yeniden Adlandır
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Bu Etiketi Silmek istediğine emin misin?
schematic.tagexists = Böyle bir Etiket zaten var.
@@ -459,7 +461,7 @@ waves.sort.begin = Başla
waves.sort.health = Can
waves.sort.type = Tür
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Hepsini Gizle
waves.units.show = Hepsini Göster
core/assets/bundles/bundle_uk_UA.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Сортувати за популярністю
schematic = Схема
schematic.add = Зберегти схему…
schematics = Схеми
schematic.search = Search schematics...
schematic.replace = Схема з такою назвою вже є. Замінити її?
schematic.exists = Схема з такою назвою вже є.
schematic.import = Імпортувати схему…
@@ -69,7 +70,7 @@ schematic.shareworkshop = Поширити в Майстерню
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Обернути схему
schematic.saved = Схема збережена.
schematic.delete.confirm = Ви справді хочете видалити цю схему?
schematic.rename = Перейменувати схему
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, блоків: {2}
schematic.disabled = [scarlet]Схеми вимкнено[]\nВам не дозволяється використовувати схеми на цій [accent]мапі[] чи [accent]сервері.
schematic.tags = Мітки:
@@ -78,6 +79,7 @@ schematic.addtag = Додати мітку
schematic.texttag = Текстова мітка
schematic.icontag = Мітка із значком
schematic.renametag = Перейменувати мітку
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Видалити цю мітку повністю?
schematic.tagexists = Схожа мітка вже існує.
@@ -461,7 +463,7 @@ waves.sort.begin = Хвилями
waves.sort.health = Здоров’ям
waves.sort.type = Типом
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Сховати все
waves.units.show = Показати все
core/assets/bundles/bundle_vi.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = Sắp xếp theo sao
schematic = Bản thiết kế
schematic.add = Lưu bản thiết kế...
schematics = Các bản thiết kế
schematic.search = Search schematics...
schematic.replace = Bản thiết kế có tên đó đã tồn tại. Thay thế nó?
schematic.exists = Bản thiết kế có tên đó đã tồn tại.
schematic.import = Nhập Bản thiết kế...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Chia sẻ từ Workshop
schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Lật bản thiết kế
schematic.saved = Đã lưu bản thiết kế.
schematic.delete.confirm = Bản thiết kế này sẽ bị xóa hoàn toàn.
schematic.rename = Đổi tên bản thiết kế
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2} khối
schematic.disabled = [scarlet]Tính năng bản thiết kế đã bị tắt[]\nBạn không được sử dụng bản thiết kế trong [accent]bản đồ[] hoặc [accent]máy chủ.
schematic.tags = Thẻ:
@@ -78,6 +79,7 @@ schematic.addtag = Thêm thẻ
schematic.texttag = Thẻ văn bản
schematic.icontag = Thẻ icon
schematic.renametag = Đổi tên thẻ
schematic.tagged = {0} tagged
schematic.tagdelconfirm = Xóa thẻ này?
schematic.tagexists = Thẻ đã tồn tại.
@@ -460,7 +462,7 @@ waves.sort.begin = Bắt đầu
waves.sort.health = Máu
waves.sort.type = Thể loại
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = Ẩn tất cả
waves.units.show = Hiện tất cả
core/assets/bundles/bundle_zh_CN.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = 按星数排序
schematic = 蓝图
schematic.add = 保存蓝图…
schematics = 蓝图
schematic.search = Search schematics...
schematic.replace = 存在同名蓝图，是否覆盖？
schematic.exists = 存在同名蓝图。
schematic.import = 导入蓝图…
@@ -69,7 +70,7 @@ schematic.shareworkshop = 在创意工坊上分享
schematic.flip = [accent][[{0}][]/[accent][[{1}][]：翻转蓝图
schematic.saved = 蓝图已保存。
schematic.delete.confirm = 确定删除蓝图？
schematic.rename = 重命名蓝图
schematic.edit = Edit Schematic
schematic.info = {0}x{1}，{2} 个建筑
schematic.disabled = [scarlet]蓝图已禁用！[]\n您不能在此[accent]地图[]或[accent]服务器[]上使用蓝图。
schematic.tags = 标签：
@@ -78,6 +79,7 @@ schematic.addtag = 添加新标签
schematic.texttag = 文字标签
schematic.icontag = 图标标签
schematic.renametag = 重命名标签
schematic.tagged = {0} tagged
schematic.tagdelconfirm = 确定要完全删除这个标签吗？
schematic.tagexists = 此标签已经存在。
@@ -462,7 +464,7 @@ waves.sort.begin = 出场顺序
waves.sort.health = 生命值
waves.sort.type = 类型
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = 全部隐藏
waves.units.show = 全部显示
core/assets/bundles/bundle_zh_TW.properties
+4 -2
View File
@@ -57,6 +57,7 @@ mods.browser.sortstars = 以星數篩選
schematic = 藍圖
schematic.add = 儲存藍圖……
schematics = 藍圖
schematic.search = Search schematics...
schematic.replace = 相同名稱的藍圖已經存在。是否取代它？
schematic.exists = 相同名稱的藍圖已經存在。
schematic.import = 匯入藍圖……
@@ -69,7 +70,7 @@ schematic.shareworkshop = 分享到工作坊
schematic.flip = [accent][[{0}][]/[accent][[{1}][]:翻轉藍圖
schematic.saved = 藍圖已儲存。
schematic.delete.confirm = 該藍圖將被完全清除。
schematic.rename = 重新命名藍圖
schematic.edit = Edit Schematic
schematic.info = {0}x{1}, {2}方塊
schematic.disabled = [scarlet]藍圖被進用[]\n你不能在這個[accent]地圖[] 或 [accent]伺服器中使用藍圖.
schematic.tags = 標籤：
@@ -78,6 +79,7 @@ schematic.addtag = 新增標籤
schematic.texttag = 文字標籤
schematic.icontag = 圖像標籤
schematic.renametag = 重新命名
schematic.tagged = {0} tagged
schematic.tagdelconfirm = 確認刪除此標籤？
schematic.tagexists = 該標籤已存在。
@@ -459,7 +461,7 @@ waves.sort.begin = 開始
waves.sort.health = 血量
waves.sort.type = 兵種
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.filter = Unit Filter
waves.units.hide = 全部隱藏
waves.units.show = 全部顯示
core/src/mindustry/core/World.java
+1
View File
@@ -320,6 +320,7 @@ public class World{
state.rules.cloudColor = sector.planet.landCloudColor;
state.rules.env = sector.planet.defaultEnv;
state.rules.planet = sector.planet;
state.rules.hiddenBuildItems.clear();
state.rules.hiddenBuildItems.addAll(sector.planet.hiddenItems);
sector.planet.applyRules(state.rules);
core/src/mindustry/editor/MapEditorDialog.java
+1 -1
View File
@@ -803,7 +803,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
}
if(i == 0){
blockSelection.add("@none.found").color(Color.lightGray).padLeft(54f).padTop(10f);
blockSelection.add("@none.found").padLeft(54f).padTop(10f);
}
}
}
core/src/mindustry/editor/MapLoadDialog.java
+24 -27
View File
@@ -1,9 +1,11 @@
package mindustry.editor;
import arc.*;
import arc.func.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import mindustry.gen.*;
import mindustry.maps.*;
import mindustry.ui.*;
import mindustry.ui.dialogs.*;
@@ -11,65 +13,60 @@ import mindustry.ui.dialogs.*;
import static mindustry.Vars.*;
public class MapLoadDialog extends BaseDialog{
private Map selected = null;
private @Nullable Map selected = null;
public MapLoadDialog(Cons<Map> loader){
super("@editor.loadmap");
shown(this::rebuild);
hidden(() -> selected = null);
onResize(this::rebuild);
TextButton button = new TextButton("@load");
button.setDisabled(() -> selected == null);
button.clicked(() -> {
buttons.defaults().size(210f, 64f);
buttons.button("@cancel", Icon.cancel, this::hide);
buttons.button("@load", Icon.ok, () -> {
if(selected != null){
loader.get(selected);
hide();
}
});
buttons.defaults().size(200f, 50f);
buttons.button("@cancel", this::hide);
buttons.add(button);
}).disabled(b -> selected == null);
addCloseListener();
makeButtonOverlay();
}
public void rebuild(){
cont.clear();
if(maps.all().size > 0){
selected = maps.all().first();
}
ButtonGroup<TextButton> group = new ButtonGroup<>();
int maxcol = 3;
ButtonGroup<Button> group = new ButtonGroup<>();
int i = 0;
int cols = Math.max((int)(Core.graphics.getWidth() / Scl.scl(250f)), 1);
Table table = new Table();
table.defaults().size(200f, 90f).pad(4f);
table.defaults().size(250f, 90f).pad(4f);
table.margin(10f);
ScrollPane pane = new ScrollPane(table);
pane.setFadeScrollBars(false);
pane.setScrollingDisabledX(true);
for(Map map : maps.all()){
table.button(b -> {
b.add(new BorderImage(map.safeTexture(), 2f).setScaling(Scaling.fit)).padLeft(5f).size(16 * 4f);
b.add(map.name()).wrap().grow().labelAlign(Align.center).padLeft(5f);
}, Styles.squareTogglet, () -> selected = map).group(group).checked(b -> selected == map);
TextButton button = new TextButton(map.name(), Styles.flatTogglet);
button.add(new BorderImage(map.safeTexture(), 2f).setScaling(Scaling.fit)).padLeft(5f).size(16 * 4f);
button.getCells().reverse();
button.clicked(() -> selected = map);
button.getLabelCell().grow().left().padLeft(5f);
group.add(button);
table.add(button);
if(++i % maxcol == 0) table.row();
if(++i % cols == 0) table.row();
}
group.uncheckAll();
if(maps.all().isEmpty()){
table.add("@maps.none").center();
}else{
cont.add("@editor.selectmap");
}
cont.row();
cont.add(pane).growX();
cont.add(pane);
}
}
core/src/mindustry/editor/WaveInfoDialog.java
+24 -34
View File
@@ -33,7 +33,6 @@ public class WaveInfoDialog extends BaseDialog{
private Table table;
private int search = -1;
private UnitType lastType = UnitTypes.dagger;
private @Nullable UnitType filterType;
private Sort sort = Sort.begin;
private boolean reverseSort = false;
@@ -160,7 +159,7 @@ public class WaveInfoDialog extends BaseDialog{
start = Math.max(search - (displayed / 2) - (displayed % 2), 0);
buildGroups();
}).growX().maxTextLength(8).get().setMessageText("@waves.search");
s.button(Icon.units, Styles.emptyi, () -> showUnits(type -> filterType = type, true)).size(46f).tooltip("@waves.filter.unit")
s.button(Icon.units, Styles.emptyi, () -> showUnits(type -> filterType = type, true)).size(46f).tooltip("@waves.filter")
.update(b -> b.getStyle().imageUp = filterType != null ? new TextureRegionDrawable(filterType.uiIcon) : Icon.filter);
}).growX().pad(6f).row();
@@ -168,10 +167,7 @@ public class WaveInfoDialog extends BaseDialog{
main.table(t -> {
t.button("@add", () -> {
SpawnGroup newGroup = new SpawnGroup(lastType);
groups.add(newGroup);
expandedGroup = newGroup;
showUnits(type -> newGroup.type = lastType = type, false);
showUnits(type -> groups.add(expandedGroup = new SpawnGroup(type)), false);
buildGroups();
}).growX().height(70f);
@@ -233,9 +229,7 @@ public class WaveInfoDialog extends BaseDialog{
b.label(() -> (group.begin + 1) + "").color(Color.lightGray).minWidth(45f).labelAlign(Align.left).left();
b.button(Icon.copySmall, Styles.emptyi, () -> {
SpawnGroup copy = group.copy();
expandedGroup = copy;
groups.insert(groups.indexOf(group) + 1, copy);
groups.insert(groups.indexOf(group) + 1, expandedGroup = group.copy());
buildGroups();
}).pad(-6).size(46f).tooltip("@editor.copy");
@@ -244,7 +238,7 @@ public class WaveInfoDialog extends BaseDialog{
Icon.logicSmall,
Styles.emptyi, () -> showEffects(group)).pad(-6).size(46f).scaling(Scaling.fit).tooltip(group.effect != null ? group.effect.localizedName : "@none");
b.button(Icon.unitsSmall, Styles.emptyi, () -> showUnits(type -> group.type = lastType = type, false)).pad(-6).size(46f).tooltip("@stat.unittype");
b.button(Icon.unitsSmall, Styles.emptyi, () -> showUnits(type -> group.type = type, false)).pad(-6).size(46f).tooltip("@stat.unittype");
b.button(Icon.cancel, Styles.emptyi, () -> {
groups.remove(group);
if(expandedGroup == group) expandedGroup = null;
@@ -253,9 +247,7 @@ public class WaveInfoDialog extends BaseDialog{
buildGroups();
}).pad(-6).size(46f).padRight(-12f).tooltip("@waves.remove");
b.clicked(KeyCode.mouseMiddle, () -> {
SpawnGroup copy = group.copy();
groups.insert(groups.indexOf(group) + 1, copy);
expandedGroup = copy;
groups.insert(groups.indexOf(group) + 1, expandedGroup = group.copy());
buildGroups();
});
}, () -> {
@@ -415,8 +407,7 @@ public class WaveInfoDialog extends BaseDialog{
}
void showUnits(Cons<UnitType> cons, boolean reset){
BaseDialog dialog = new BaseDialog("");
dialog.setFillParent(true);
BaseDialog dialog = new BaseDialog(reset ? "@waves.filter" : "");
dialog.cont.pane(p -> {
p.defaults().pad(2).fillX();
if(reset){
@@ -444,40 +435,39 @@ public class WaveInfoDialog extends BaseDialog{
}).margin(12f);
if(++i % 3 == 0) p.row();
}
}).growX().scrollX(false);
}).scrollX(false);
dialog.addCloseButton();
dialog.show();
}
void showEffects(SpawnGroup group){
BaseDialog dialog = new BaseDialog("");
dialog.setFillParent(true);
dialog.cont.pane(p -> {
int i = 0;
p.defaults().pad(2).fillX();
p.button(t -> {
t.left();
t.image(Icon.none).size(8 * 4).scaling(Scaling.fit).padRight(2f);
t.add("@settings.resetKey");
}, () -> {
group.effect = null;
dialog.hide();
buildGroups();
}).margin(12f);
int i = 1;
for(StatusEffect effect : content.statusEffects()){
if(effect != StatusEffects.none && (effect.isHidden() || effect.reactive)) continue;
if(effect.isHidden() || effect.reactive) continue;
p.button(t -> {
t.left();
if(effect.uiIcon != null && effect != StatusEffects.none){
t.image(effect.uiIcon).size(8 * 4).scaling(Scaling.fit).padRight(2f);
}else{
t.image(Icon.none).size(8 * 4).scaling(Scaling.fit).padRight(2f);
}
if(effect != StatusEffects.none){
t.add(effect.localizedName);
}else{
t.add("@settings.resetKey");
}
t.image(effect.uiIcon).size(8 * 4).scaling(Scaling.fit).padRight(2f);
t.add(effect.localizedName);
}, () -> {
group.effect = effect != StatusEffects.none ? effect : null;
group.effect = effect;
dialog.hide();
buildGroups();
}).pad(2).margin(12f).fillX();
}).margin(12f);
if(++i % 3 == 0) p.row();
}
}).growX().scrollX(false);
}).scrollX(false);
dialog.addCloseButton();
dialog.show();
}
core/src/mindustry/game/Rules.java
+2
View File
@@ -191,6 +191,8 @@ public class Rules{
public float backgroundOffsetX = 0.1f, backgroundOffsetY = 0.1f;
/** Parameters for planet rendered in the background. Cannot be changed once a map is loaded. */
public @Nullable PlanetParams planetBackground;
/** Rules from this planet are applied. If it's {@code sun}, mixed tech is enabled. */
public Planet planet = Planets.serpulo;
/** Copies this ruleset exactly. Not efficient at all, do not use often. */
public Rules copy(){
core/src/mindustry/maps/filters/FilterOption.java
+1 -3
View File
@@ -10,7 +10,6 @@ import arc.scene.style.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.ui.*;
@@ -108,9 +107,8 @@ public abstract class FilterOption{
.setRegion(supplier.get() == Blocks.air ? Icon.none.getRegion() : supplier.get().uiIcon)).size(iconSmall), () -> {
BaseDialog dialog = new BaseDialog("@filter.option." + name);
dialog.cont.pane(t -> {
t.margin(14f);
int i = 0;
for(Block block : Vars.content.blocks()){
for(Block block : content.blocks()){
if(!filter.get(block)) continue;
t.image(block == Blocks.air ? Icon.none.getRegion() : block.uiIcon).size(iconMed).pad(3).tooltip(block == Blocks.air ? "@none" : block.localizedName).get().clicked(() -> {
core/src/mindustry/net/Administration.java
+2 -2
View File
@@ -26,8 +26,8 @@ public class Administration{
private boolean modified, loaded;
/** All player info. Maps UUIDs to info. This persists throughout restarts. Do not access directly. */
private ObjectMap<String, PlayerInfo> playerInfo = new ObjectMap<>();
/** All player info. Maps UUIDs to info. This persists throughout restarts. Do not modify directly. */
public ObjectMap<String, PlayerInfo> playerInfo = new ObjectMap<>();
public Administration(){
load();
core/src/mindustry/type/Planet.java
+1
View File
@@ -211,6 +211,7 @@ public class Planet extends UnlockableContent{
rules.attributes.clear();
rules.attributes.add(defaultAttributes);
rules.env = defaultEnv;
rules.planet = this;
rules.hiddenBuildItems.clear();
rules.hiddenBuildItems.addAll(hiddenItems);
}
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+9 -9
View File
@@ -249,15 +249,14 @@ public class CustomRulesDialog extends BaseDialog{
t.defaults().size(140f, 50f);
//TODO dynamic selection of planets
for(Planet planet : new Planet[]{Planets.serpulo, Planets.erekir}){
for(Planet planet : content.planets().select(p -> p.accessible && p.visible && p.isLandable())){
t.button(planet.localizedName, style, () -> {
rules.env = planet.defaultEnv;
rules.attributes.clear();
rules.attributes.add(planet.defaultAttributes);
rules.hiddenBuildItems.clear();
rules.hiddenBuildItems.addAll(planet.hiddenItems);
}).group(group).checked(b -> rules.env == planet.defaultEnv);
planet.applyRules(rules);
}).group(group).checked(b -> rules.planet == planet);
if(t.getChildren().size % 3 == 0){
t.row();
}
}
t.button("@rules.anyenv", style, () -> {
@@ -267,8 +266,9 @@ public class CustomRulesDialog extends BaseDialog{
}else{
rules.env = Vars.defaultEnv;
rules.hiddenBuildItems.clear();
rules.planet = Planets.sun;
}
}).group(group).checked(b -> rules.hiddenBuildItems.size == 0);
}).group(group).checked(b -> rules.planet == Planets.sun);
}).left().fill(false).expand(false, false).row();
title("@rules.title.teams");
core/src/mindustry/ui/dialogs/SchematicsDialog.java
+176 -136
View File
@@ -15,7 +15,6 @@ import arc.scene.ui.layout.*;
import arc.scene.utils.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.ctype.*;
import mindustry.game.*;
import mindustry.gen.*;
@@ -48,6 +47,7 @@ public class SchematicsDialog extends BaseDialog{
shouldPause = true;
addCloseButton();
buttons.button("@schematic.import", Icon.download, this::showImport);
makeButtonOverlay();
shown(this::setup);
onResize(this::setup);
}
@@ -70,6 +70,7 @@ public class SchematicsDialog extends BaseDialog{
search = res;
rebuildPane.run();
}).growX().get();
searchField.setMessageText("@schematic.search");
}).fillX().padBottom(4);
cont.row();
@@ -99,9 +100,7 @@ public class SchematicsDialog extends BaseDialog{
rebuildTags.run();
}).fillX().height(tagh).scrollY(false);
in.button(Icon.pencilSmall, () -> {
showAllTags();
}).size(tagh).pad(2).tooltip("@schematic.edittags");
in.button(Icon.pencilSmall, this::showAllTags).size(tagh).pad(2).tooltip("@schematic.edittags");
}).height(tagh).fillX();
cont.row();
@@ -111,7 +110,7 @@ public class SchematicsDialog extends BaseDialog{
t.update(() -> {
if(Core.input.keyTap(Binding.chat) && Core.scene.getKeyboardFocus() == searchField && firstSchematic != null){
if(!Vars.state.rules.schematicsAllowed){
if(!state.rules.schematicsAllowed){
ui.showInfo("@schematic.disabled");
}else{
control.input.useSchematic(firstSchematic);
@@ -144,58 +143,14 @@ public class SchematicsDialog extends BaseDialog{
buttons.left();
buttons.defaults().size(50f);
ImageButtonStyle style = Styles.clearNonei;
ImageButtonStyle style = Styles.emptyi;
buttons.button(Icon.info, style, () -> {
showInfo(s);
});
buttons.button(Icon.upload, style, () -> {
showExport(s);
});
buttons.button(Icon.pencil, style, () -> {
new BaseDialog("@schematic.rename"){{
setFillParent(true);
cont.margin(30);
cont.add("@schematic.tags").padRight(6f);
cont.table(tags -> buildTags(s, tags, false)).maxWidth(400f).fillX().left().row();
cont.margin(30).add("@name").padRight(6f);
TextField nameField = cont.field(s.name(), null).size(400f, 55f).left().get();
cont.row();
cont.margin(30).add("@editor.description").padRight(6f);
TextField descField = cont.area(s.description(), Styles.areaField, t -> {}).size(400f, 140f).left().get();
Runnable accept = () -> {
s.tags.put("name", nameField.getText());
s.tags.put("description", descField.getText());
s.save();
hide();
rebuildPane.run();
};
buttons.defaults().size(120, 54).pad(4);
buttons.button("@ok", accept).disabled(b -> nameField.getText().isEmpty());
buttons.button("@cancel", this::hide);
keyDown(KeyCode.enter, () -> {
if(!nameField.getText().isEmpty() && Core.scene.getKeyboardFocus() != descField){
accept.run();
}
});
keyDown(KeyCode.escape, this::hide);
keyDown(KeyCode.back, this::hide);
show();
}};
});
buttons.button(Icon.info, style, () -> showInfo(s)).tooltip("@info.title");
buttons.button(Icon.upload, style, () -> showExport(s)).tooltip("@editor.export");
buttons.button(Icon.pencil, style, () -> showEdit(s)).tooltip("@schematic.edit");
if(s.hasSteamID()){
buttons.button(Icon.link, style, () -> platform.viewListing(s));
buttons.button(Icon.link, style, () -> platform.viewListing(s)).tooltip("@view.workshop");
}else{
buttons.button(Icon.trash, style, () -> {
if(s.mod != null){
@@ -206,9 +161,8 @@ public class SchematicsDialog extends BaseDialog{
rebuildPane.run();
});
}
});
}).tooltip("@save.delete");
}
}).growX().height(50f);
b.row();
b.stack(new SchematicImage(s).setScaling(Scaling.fit), new Table(n -> {
@@ -224,7 +178,7 @@ public class SchematicsDialog extends BaseDialog{
if(state.isMenu()){
showInfo(s);
}else{
if(!Vars.state.rules.schematicsAllowed){
if(!state.rules.schematicsAllowed){
ui.showInfo("@schematic.disabled");
}else{
control.input.useSchematic(s);
@@ -241,7 +195,11 @@ public class SchematicsDialog extends BaseDialog{
}
if(firstSchematic == null){
t.add("@none");
if(!searchString.isEmpty() || selectedTags.any()){
t.add("@none.found");
}else{
t.add("@none").color(Color.lightGray);
}
}
};
@@ -254,7 +212,7 @@ public class SchematicsDialog extends BaseDialog{
}
public void showImport(){
BaseDialog dialog = new BaseDialog("@editor.export");
BaseDialog dialog = new BaseDialog("@editor.import");
dialog.cont.pane(p -> {
p.margin(10f);
p.table(Tex.button, t -> {
@@ -307,9 +265,9 @@ public class SchematicsDialog extends BaseDialog{
public void showExport(Schematic s){
BaseDialog dialog = new BaseDialog("@editor.export");
dialog.cont.pane(p -> {
p.margin(10f);
p.table(Tex.button, t -> {
TextButtonStyle style = Styles.flatt;
p.margin(10f);
p.table(Tex.button, t -> {
TextButtonStyle style = Styles.flatt;
t.defaults().size(280f, 60f).left();
if(steam && !s.hasSteamID()){
t.button("@schematic.shareworkshop", Icon.book, style,
@@ -334,6 +292,43 @@ public class SchematicsDialog extends BaseDialog{
dialog.show();
}
public void showEdit(Schematic s){
new BaseDialog("@schematic.edit"){{
setFillParent(true);
addCloseListener();
cont.margin(30);
cont.add("@schematic.tags").padRight(6f);
cont.table(tags -> buildTags(s, tags, false)).maxWidth(400f).fillX().left().row();
cont.margin(30).add("@name").padRight(6f);
TextField nameField = cont.field(s.name(), null).size(400f, 55f).left().get();
cont.row();
cont.margin(30).add("@editor.description").padRight(6f);
TextField descField = cont.area(s.description(), Styles.areaField, t -> {}).size(400f, 140f).left().get();
Runnable accept = () -> {
s.tags.put("name", nameField.getText());
s.tags.put("description", descField.getText());
s.save();
hide();
rebuildPane.run();
};
buttons.defaults().size(210f, 64f).pad(4);
buttons.button("@ok", Icon.ok, accept).disabled(b -> nameField.getText().isEmpty());
buttons.button("@cancel", Icon.cancel, this::hide);
keyDown(KeyCode.enter, () -> {
if(!nameField.getText().isEmpty() && Core.scene.getKeyboardFocus() != descField){
accept.run();
}
});
}}.show();
}
//adds all new tags to the global list of tags
//alternatively, unknown tags could be discarded on import?
@@ -406,35 +401,51 @@ public class SchematicsDialog extends BaseDialog{
cont.pane(t -> {
resized(true, () -> {
t.clearChildren();
t.marginRight(19f);
t.marginRight(19f).marginLeft(12f);
t.defaults().size(48f);
int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f));
int i = 0;
for(String icon : PlanetDialog.defaultIcons){
String out = (char)Iconc.codes.get(icon) + "";
if(tags.contains(out)) continue;
t.button(Icon.icons.get(icon), Styles.flati, iconMed, () -> {
tags.add(out);
tagsChanged();
cons.get(out);
hide();
});
if(++i % cols == 0) t.row();
}
for(ContentType ctype : defaultContentIcons){
var all = content.getBy(ctype).<UnlockableContent>as().filter(u -> !u.isHidden() && u.unlockedNow() && u.hasEmoji());
t.row();
t.image().colspan(cols).growX().width(Float.NEGATIVE_INFINITY).height(3f).color(Pal.accent);
if(all.count(u -> !tags.contains(u.emoji())) > 0) t.image().colspan(cols).growX().width(Float.NEGATIVE_INFINITY).height(3f).color(Pal.accent);
t.row();
int i = 0;
for(UnlockableContent u : content.getBy(ctype).<UnlockableContent>as()){
if(!u.isHidden() && u.unlockedNow() && u.hasEmoji() && !tags.contains(u.emoji())){
t.button(new TextureRegionDrawable(u.uiIcon), Styles.flati, iconMed, () -> {
String out = u.emoji() + "";
i = 0;
for(UnlockableContent u : all){
if(tags.contains(u.emoji())) continue;
t.button(new TextureRegionDrawable(u.uiIcon), Styles.flati, iconMed, () -> {
String out = u.emoji() + "";
tags.add(out);
tagsChanged();
cons.get(out);
tags.add(out);
tagsChanged();
cons.get(out);
hide();
});
hide();
}).tooltip(u.localizedName);
if(++i % cols == 0) t.row();
}
if(++i % cols == 0) t.row();
}
}
});
});
}).scrollX(false);
buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
}}.show();
}
@@ -446,66 +457,91 @@ public class SchematicsDialog extends BaseDialog{
dialog.cont.pane(p -> {
rebuild[0] = () -> {
p.clearChildren();
p.defaults().fillX().left();
p.margin(12f).defaults().fillX().left();
float sum = 0f;
Table current = new Table().left();
for(var tag : tags){
var next = new Table(Tex.button, n -> {
n.add(tag).padRight(4);
var next = new Table(n -> {
n.table(Tex.pane, move -> {
move.margin(2);
n.add().growX();
n.defaults().size(30f);
//delete
n.button(Icon.cancelSmall, Styles.emptyi, () -> {
ui.showConfirm("@schematic.tagdelconfirm", () -> {
for(Schematic s : schematics.all()){
if(s.labels.any()){
s.labels.remove(tag);
s.save();
}
}
selectedTags.remove(tag);
tags.remove(tag);
tagsChanged();
rebuildPane.run();
rebuild[0].run();
});
});
//rename
n.button(Icon.pencilSmall, Styles.emptyi, () -> {
ui.showTextInput("@schematic.renametag", "@name", tag, result -> {
//same tag, nothing was renamed
if(result.equals(tag)) return;
if(tags.contains(result)){
ui.showInfo("@schematic.tagexists");
}else{
for(Schematic s : schematics.all()){
if(s.labels.any()){
s.labels.replace(tag, result);
s.save();
}
}
selectedTags.replace(tag, result);
tags.replace(tag, result);
//move up
move.button(Icon.upOpen, Styles.emptyi, () -> {
int idx = tags.indexOf(tag);
if(idx > 0){
tags.swap(idx, idx - 1);
tagsChanged();
rebuild[0].run();
}
}).tooltip("@editor.moveup").row();
//move down
move.button(Icon.downOpen, Styles.emptyi, () -> {
int idx = tags.indexOf(tag);
if(idx < tags.size - 1){
tags.swap(idx, idx + 1);
tagsChanged();
rebuild[0].run();
}
}).tooltip("@editor.movedown");
}).fillY().margin(6f);
n.table(Tex.whiteui, t -> {
t.setColor(Pal.gray);
t.add(tag).left().row();
t.add(Core.bundle.format("schematic.tagged", schematics.all().count(s -> s.labels.contains(tag)))).left()
.update(b -> b.setColor(b.hasMouse() ? Pal.accent : Color.lightGray)).get().clicked(() -> {
dialog.hide();
selectedTags.clear().add(tag);
rebuildTags.run();
rebuildPane.run();
});
});
//move
n.button(Icon.upSmall, Styles.emptyi, () -> {
int idx = tags.indexOf(tag);
if(idx > 0){
tags.swap(idx, idx - 1);
tagsChanged();
rebuild[0].run();
}
});
}).growX().fillY().margin(8f);
n.table(Tex.pane, b -> {
b.margin(2);
//rename tag
b.button(Icon.pencil, Styles.emptyi, () -> {
ui.showTextInput("@schematic.renametag", "@name", tag, result -> {
//same tag, nothing was renamed
if(result.equals(tag)) return;
if(tags.contains(result)){
ui.showInfo("@schematic.tagexists");
}else{
for(Schematic s : schematics.all()){
if(s.labels.any()){
s.labels.replace(tag, result);
s.save();
}
}
selectedTags.replace(tag, result);
tags.replace(tag, result);
tagsChanged();
rebuild[0].run();
}
});
}).tooltip("@schematic.renametag").row();
//delete tag
b.button(Icon.trash, Styles.emptyi, () -> {
ui.showConfirm("@schematic.tagdelconfirm", () -> {
for(Schematic s : schematics.all()){
if(s.labels.any()){
s.labels.remove(tag);
s.save();
}
}
selectedTags.remove(tag);
tags.remove(tag);
tagsChanged();
rebuildPane.run();
rebuild[0].run();
});
}).tooltip("@save.delete");
}).fillY().margin(6f);
});
next.pack();
@@ -515,10 +551,10 @@ public class SchematicsDialog extends BaseDialog{
p.add(current).row();
current = new Table();
current.left();
current.add(next).height(tagh).pad(2);
current.add(next).minWidth(240).pad(4);
sum = 0;
}else{
current.add(next).height(tagh).pad(2);
current.add(next).minWidth(240).pad(4);
}
sum += w;
@@ -538,7 +574,7 @@ public class SchematicsDialog extends BaseDialog{
};
resized(true, rebuild[0]);
});
}).scrollX(false);
dialog.show();
}
@@ -574,6 +610,7 @@ public class SchematicsDialog extends BaseDialog{
dialog.addCloseButton();
dialog.cont.pane(p -> resized(true, () -> {
p.clearChildren();
p.defaults().fillX().left();
float sum = 0f;
Table current = new Table().left();
@@ -704,19 +741,16 @@ public class SchematicsDialog extends BaseDialog{
SchematicInfoDialog(){
super("");
setFillParent(true);
addCloseButton();
addCloseListener();
}
public void show(Schematic schem){
cont.clear();
title.setText("[[" + Core.bundle.get("schematic") + "] " +schem.name());
cont.add(Core.bundle.format("schematic.info", schem.width, schem.height, schem.tiles.size)).color(Color.lightGray);
cont.row();
cont.add(Core.bundle.format("schematic.info", schem.width, schem.height, schem.tiles.size)).color(Color.lightGray).row();
cont.table(tags -> buildTags(schem, tags)).fillX().left().row();
cont.row();
cont.add(new SchematicImage(schem)).maxSize(800f);
cont.row();
cont.add(new SchematicImage(schem)).maxSize(800f).row();
ItemSeq arr = schem.requirements();
cont.table(r -> {
@@ -755,7 +789,13 @@ public class SchematicsDialog extends BaseDialog{
});
}
buttons.clearChildren();
buttons.defaults().size(210f, 64f);
buttons.button("@back", Icon.left, this::hide);
buttons.button("@editor.export", Icon.upload, () -> showExport(schem));
buttons.button("@schematic.edit", Icon.edit, () -> showEdit(schem));
show();
}
}
}
}
core/src/mindustry/world/blocks/ItemSelection.java
+3 -3
View File
@@ -87,9 +87,9 @@ public class ItemSelection{
if(rowCount > rows * 1.5f){
main.table(s -> {
s.image(Icon.zoom).padLeft(4f);
search = s.field(null, text -> rebuild.run()).width(40 * columns).padBottom(4).left().growX().get();
search = s.field(null, text -> rebuild.run()).padBottom(4).left().growX().get();
search.setMessageText("@players.search");
}).row();
}).fillX().row();
}
ScrollPane pane = new ScrollPane(cont, Styles.smallPane);
@@ -103,7 +103,7 @@ public class ItemSelection{
}
pane.setOverscroll(false, false);
main.add(pane).growX().maxHeight(40 * rows);
main.add(pane).maxHeight(40 * rows);
table.top().add(main);
}
}
servers_v7.json
+1 -1
View File
@@ -134,7 +134,7 @@
},
{
"name": "Sakura",
"address": ["160.16.207.141:22527", "160.16.207.141:23527", "160.16.207.141:24527", "160.16.207.141:25527", "160.16.207.141:26527", "160.16.207.141:27527", "160.16.207.141:28527"]
"address": ["160.16.207.141:20527", "160.16.207.141:21527", "160.16.207.141:22527", "160.16.207.141:23527", "160.16.207.141:24527", "160.16.207.141:25527", "160.16.207.141:26527", "160.16.207.141:27527", "160.16.207.141:28527", "160.16.207.141:29527"]
},
{
"name": "|RussianServers|[]",