diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 1301009bd6..8da18c55f6 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io page with PC downloads link.google-play.description = Google Play store listing link.f-droid.description = F-Droid catalogue listing link.wiki.description = Official Mindustry wiki -link.feathub.description = Suggest new features +link.suggestions.description = Suggest new features linkfail = Failed to open link!\nThe URL has been copied to your clipboard. screenshot = Screenshot saved to {0} screenshot.invalid = Map too large, potentially not enough memory for screenshot. diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index fc75aeb3ec..7e64018c45 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -12,7 +12,7 @@ link.itch.io.description = Старонка itch.io з загрузкамi гу link.google-play.description = Спампаваць для Android з Google Play link.f-droid.description = Спампаваць для Android з F-Droid link.wiki.description = Афіцыйная вікі -link.feathub.description = Прапанаваць новыя функцыі +link.suggestions.description = Прапанаваць новыя функцыі linkfail = Не атрымалася адкрыць спасылку!\nURL-адрэс быў скапіяваны ў буфер абмена. screenshot = Cкрыншот захаваны ў {0} screenshot.invalid = Карта занадта вялікая, магчыма, не хапае памяці для скрыншота. diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 959f66b735..d2bcda5623 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -12,7 +12,7 @@ link.itch.io.description = Stránka na itch.io s odkazy na stažení hry link.google-play.description = Obchod Google Play link.f-droid.description = Katalog F-Droid link.wiki.description = Oficiální Wiki Mindustry -link.feathub.description = Navrhni něco nového do hry! +link.suggestions.description = Navrhni něco nového do hry! linkfail = Nepodařilo se otevřít odkaz!\nAdresa URL byla zkopírována do schránky. screenshot = Snímek obrazovky uložen {0} screenshot.invalid = Mapa je moc velká, nemusí být dost paměti pro získání snímku obrazovky. diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index 7ac559817d..cf07fd28fa 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io side med PC downloads link.google-play.description = Google Play store link.f-droid.description = F-Droid katalog link.wiki.description = Det officielle Mindustry wiki -link.feathub.description = Foreslå nye ændringer +link.suggestions.description = Foreslå nye ændringer linkfail = Kunne ikke åbne link!\n Linkets URL er kopieret til din udklipsholder. screenshot = Screenshot gemt i {0} screenshot.invalid = Banen er for stor, der er ikke nok hukommelse til screenshot. diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 4bf8361aeb..2e09d13cee 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io-Seite mit Downloads und der Web-Version des S link.google-play.description = Google Play Store-Seite link.f-droid.description = F-Droid-Seite link.wiki.description = Offizelles Mindustry-Wiki -link.feathub.description = Neue Ideen einbringen +link.suggestions.description = Neue Ideen einbringen linkfail = Fehler beim Öffnen des Links!\nDie URL wurde in die Zwischenablage kopiert. screenshot = Screenshot gespeichert unter {0} screenshot.invalid = Karte zu groß! Eventuell nicht ausreichend Arbeitsspeicher für Screenshot. diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index b061170ff0..7d20286d0f 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io es la página donde podes descargar las versi link.google-play.description = Ficha en la Google Play Store link.f-droid.description = Página de F-Droid del juego link.wiki.description = Wiki oficial de Mindustry -link.feathub.description = Sugerir nuevas funciones +link.suggestions.description = Sugerir nuevas funciones linkfail = ¡Error al abrir el enlace!\nLa URL ha sido copiada a su portapapeles. screenshot = Captura de pantalla guardada en {0} screenshot.invalid = Mapa demasiado grande, no hay suficiente memoria para la captura de pantalla. diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index c130ccfb3a..8dc981c19c 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -12,7 +12,7 @@ link.itch.io.description = Kõik PC-platvormide versioonid link.google-play.description = Androidi versioon Google Play poes link.f-droid.description = F-Droid catalogue listing link.wiki.description = Mängu ametlik viki -link.feathub.description = Suggest new features +link.suggestions.description = Suggest new features linkfail = Lingi avamine ebaõnnestus!\nVeebiaadress kopeeriti. screenshot = Kuvatõmmis salvestati: {0} screenshot.invalid = Maailm on liiga suur: kuvatõmmise salvestamiseks ei pruugi olla piisavalt mälu. diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 20176a6c99..2c5d3b7c4b 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -12,7 +12,7 @@ link.itch.io.description = PC deskargen itch.io orria link.google-play.description = Google Play dendako sarrera link.f-droid.description = F-Droid catalogue listing link.wiki.description = Mindustry wiki ofiziala -link.feathub.description = Suggest new features +link.suggestions.description = Suggest new features linkfail = Huts egin du esteka irekitzean!\nURL-a zure arbelera kopiatu da. screenshot = Pantaila-argazkia {0} helbidean gorde da screenshot.invalid = Mapa handiegia, baliteke pantaila-argazkirako memoria nahiko ez egotea. diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index 1b56ef29c1..985cea08a4 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io -sivu tietokoneversion latausten kanssa link.google-play.description = Google Play Kauppa -sivu link.f-droid.description = F-Droid catalogue listing link.wiki.description = Virallinen Mindustry wiki -link.feathub.description = Ehdota uusia ominaisuuksia +link.suggestions.description = Ehdota uusia ominaisuuksia linkfail = Linkin avaaminen epäonnistui!\nOsoite on kopioitu leikepöydällesi. screenshot = Kuvankaappaus tallennettu sijaintiin {0} screenshot.invalid = Kartta liian laaja, kuvankaappaukselle ei mahdollisesti ole tarpeeksi tilaa. diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 2bfd4b724f..fb20242768 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -12,7 +12,7 @@ link.itch.io.description = Page itch.io avec lien de téléchargement pour PC link.google-play.description = Google Play Store link.f-droid.description = Catalogue F-Droid link.wiki.description = Le wiki officiel de Mindustry -link.feathub.description = Suggérer de nouvelles fonctionnalités +link.suggestions.description = Suggérer de nouvelles fonctionnalités linkfail = Erreur lors de l'ouverture du lien !\nL'URL a été copiée dans votre presse-papier. screenshot = Capture d'écran sauvegardée à {0} screenshot.invalid = La carte est trop large, il n'y a potentiellement pas assez de mémoire pour la capture d'écran. diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index bda89263ec..1c724123bc 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -12,7 +12,7 @@ link.itch.io.description = Site itch.io avec les versions téléchargeables pour link.google-play.description = Page Google Play du jeu link.f-droid.description = F-Droid catalogue listing link.wiki.description = Wiki officiel de Mindustry -link.feathub.description = Suggest new features +link.suggestions.description = Suggest new features linkfail = L'ouverture du lien a échoué!\nL'URL a été copiée dans votre presse-papier. screenshot = Capture d'écran enregistrée sur {0} screenshot.invalid = Carte trop grande, potentiellement pas assez de mémoire pour la capture d'écran. diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index a13a0e41a8..9311c27ac7 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io oldal PC letöltésekkel link.google-play.description = Google Play áruház listázás link.f-droid.description = F-Droid katalógus listázás link.wiki.description = Hivatalos Mindustry wiki -link.feathub.description = Új funkciók ajánlása +link.suggestions.description = Új funkciók ajánlása linkfail = Nem sikerült megnyitni a linket!\nAz URL a vágólapra lett másolva. screenshot = Képernyőkép mentve ide: {0} screenshot.invalid = Túl nagy a térkép, nincsen elég memória a képernyőképhez. diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 03062e6418..15bdaa0cf0 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -12,7 +12,7 @@ link.itch.io.description = Halaman itch.io dengan unduhan PC dan versi situs jar link.google-play.description = Google Play Store link.f-droid.description = Daftar katalog F-Droid link.wiki.description = Wiki Mindustry resmi -link.feathub.description = Saran fitur baru +link.suggestions.description = Saran fitur baru linkfail = Gagal membuka tautan!\nURL disalin ke papan ke papan klip. screenshot = Tangkapan layar disimpan di {0} screenshot.invalid = Peta terlalu besar, tidak cukup memori untuk menangkap layar. diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 15a2bcce0f..81781a53f3 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -12,7 +12,7 @@ link.itch.io.description = Pagina di itch.io con download per PC e versione web link.google-play.description = Elenco di Google Play Store link.f-droid.description = Catalogo F-Droid link.wiki.description = Wiki ufficiale di Mindustry -link.feathub.description = Suggerisci nuove funzionalità +link.suggestions.description = Suggerisci nuove funzionalità linkfail = Impossibile aprire il link! L'URL è stato copiato negli appunti. screenshot = Screenshot salvato a {0} screenshot.invalid = Mappa troppo pesante, probabilmente non c'è abbastanza spazio sul disco. diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index a6d4930e01..65a34244fc 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io でゲームをダウンロード link.google-play.description = Google Play ストアを開く link.f-droid.description = F-Droid を開く link.wiki.description = 公式 Mindustry Wiki -link.feathub.description = 新機能を提案する +link.suggestions.description = 新機能を提案する linkfail = リンクを開けませんでした!\nURLをクリップボードにコピーしました。 screenshot = スクリーンショットを {0} に保存しました。 screenshot.invalid = マップが広すぎます。スクリーンショットに必要なメモリが足りない可能性があります。 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 1e31628fdf..6a7fd649e2 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -12,7 +12,7 @@ link.itch.io.description = PC 다운로드가 있는 itch.io 페이지 link.google-play.description = Google Play 스토어 목록 link.f-droid.description = F-Droid 카탈로그 목록 link.wiki.description = 공식 Mindustry 위키 -link.feathub.description = 새로운 기능 제안 +link.suggestions.description = 새로운 기능 제안 linkfail = 링크를 열지 못했습니다!\nURL이 클립보드에 복사되었습니다. screenshot = 스크린 샷이 {0} 에 저장되었습니다. screenshot.invalid = 맵이 너무 커서 스크린샷을 할 메모리가 부족할 수 있습니다. diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index deeab3248a..338a12c5dd 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io puslapis su PC atsisiuntimu link.google-play.description = Google Play parduotuvės elementas link.f-droid.description = F-Droid katalogo elementas link.wiki.description = Oficialus Mindustry wiki -link.feathub.description = Pasiūlykite naujas funkcijas +link.suggestions.description = Pasiūlykite naujas funkcijas linkfail = Nepavyko atidaryti nuorodos!\nURL nukopijuotas į jūsų iškarpinę. screenshot = Ekrano kopija išsaugota į {0} screenshot.invalid = Žemėlapis yra per didelis, potencialiai nepakanka vietos išsaugoti ekrano kopiją. diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 2c2ea97609..a55f78e081 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io pagina met pc-downloads link.google-play.description = Google Play store vermelding link.f-droid.description = F-Droid catalogus vermelding link.wiki.description = Officiële Mindustry wiki -link.feathub.description = Stel iets voor +link.suggestions.description = Stel iets voor linkfail = Kan link niet openen!\nDe URL is gekopieerd naar je klembord screenshot = Schermafbeeling opgeslagen in {0} screenshot.invalid = Map is te groot, Mogelijk niet genoeg geheugen beschikbaar voor een schermafbeelding. diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 8273935b23..4afde54148 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -12,7 +12,7 @@ link.itch.io.description = Itch.io pagina met de PC downloads en online versie link.google-play.description = Mindustry op Google Play link.f-droid.description = F-Droid catalogus link.wiki.description = Officiële Mindustry-wiki -link.feathub.description = Suggest new features +link.suggestions.description = Suggest new features linkfail = Openen van link mislukt!\nDe link is gekopiëerd naar je klembord. screenshot = Locatie screenshot: {0} screenshot.invalid = Kaart te groot, mogelijks te weinig geheugen voor een screenshot te kunnen maken. diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index e2893e1ebb..4361222424 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -12,7 +12,7 @@ link.itch.io.description = Strona itch.io z oficjanymi wersjami do pobrania link.google-play.description = Strona w sklepie Google Play link.f-droid.description = F-Droid catalogue listing link.wiki.description = Oficjana Wiki Mindustry -link.feathub.description = Zaproponuj nowe funkcje +link.suggestions.description = Zaproponuj nowe funkcje linkfail = Nie udało się otworzyć linku!\nURL został skopiowany. screenshot = Zapisano zdjęcie w {0} screenshot.invalid = Zrzut ekranu jest zbyt duży. Najprawdopodobniej brakuje miejsca w pamięci urządzenia. diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 503c33f65f..755622fa29 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -12,7 +12,7 @@ link.itch.io.description = Página do Itch.io com os downloads link.google-play.description = Página da Google Play store link.f-droid.description = Listamento de catalogo do F-Droid link.wiki.description = Wiki oficial do Mindustry -link.feathub.description = Sugira novos conteúdos +link.suggestions.description = Sugira novos conteúdos linkfail = Falha ao abrir o link\nO Url foi copiado para a área de transferência. screenshot = Screenshot salvo para {0} screenshot.invalid = Este mapa é grande demais, você pode estar potencialmente sem memória suficiente para captura de tela. diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index 7c99c2617c..6ddd177a4f 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -12,7 +12,7 @@ link.itch.io.description = Pagina da Itch.io com os Descarregamentos link.google-play.description = Listamento do google play store link.f-droid.description = F-Droid catalogue listing link.wiki.description = Wiki oficial do Mindustry -link.feathub.description = Sugerir novas funcionalidades +link.suggestions.description = Sugerir novas funcionalidades linkfail = Falha ao abrir a ligação\nO Url foi copiado screenshot = Screenshot gravado para {0} screenshot.invalid = Mapa grande demais, Potencialmente sem memória suficiente para captura. diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index c912345599..8642a0c26b 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -12,7 +12,7 @@ link.itch.io.description = Страница itch.io с загрузками иг link.google-play.description = Скачать для Android с Google Play link.f-droid.description = Скачать для Android с F-Droid link.wiki.description = Официальная вики -link.feathub.description = Предложить новые возможности +link.suggestions.description = Предложить новые возможности linkfail = Не удалось открыть ссылку!\nURL-адрес был скопирован в буфер обмена. screenshot = Скриншот сохранён в {0} screenshot.invalid = Карта слишком большая, возможно, не хватает памяти для скриншота. diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 10529e8726..6a6ce9d221 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io med nedladdningar link.google-play.description = Mindustry på Google Play link.f-droid.description = F-Droid katalog listning link.wiki.description = Officiell wiki-sida för Mindustry -link.feathub.description = Föreslå nya funktioner +link.suggestions.description = Föreslå nya funktioner linkfail = Kunde inte öppna länken!\nLänken har kopierats till ditt urklipp. screenshot = Skärmdump har sparats till {0} screenshot.invalid = Karta för stor, potentiellt inte tillräckligt minne för skärmdump. diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 5a68d1cbcc..58b1a304c0 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io page with PC downloads link.google-play.description = Google Play store listing link.f-droid.description = F-Droid catalogue listing link.wiki.description = Official Mindustry wiki -link.feathub.description = Suggest new features +link.suggestions.description = Suggest new features linkfail = ไม่สามารถเปิดลิ้งค์ได้\nคัดลอก URL ลงในคลิปบอร์ดแล้ว screenshot = Screenshot บันทึกที่ {0} screenshot.invalid = แมพใหญ่เกินไป, หน่วยความจำอาจจะไม่พอสำหรับ screenshot. diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index a121fbb405..03f22600bb 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -12,7 +12,7 @@ link.itch.io.description = Bilgisayar ve Site versiyonunun bulundugu Site link.google-play.description = Google Play magaza sayfasi link.f-droid.description = F-Droid catalogue listing link.wiki.description = Orjinal Mindustry Bilgilendirme Sayfasi -link.feathub.description = Suggest new features +link.suggestions.description = Suggest new features linkfail = Link Acilamadi!\nLink sizin icin kopyalandi. screenshot = Screenshot saved to {0} screenshot.invalid = Map too large, potentially not enough memory for screenshot. diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 5e8ede7fe8..461f09b534 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io sayfası link.google-play.description = Google Play mağaza sayfası link.f-droid.description = F-Droid kataloğu link.wiki.description = Resmi Mindustry wikisi -link.feathub.description = Yeni özellikler öner +link.suggestions.description = Yeni özellikler öner linkfail = Link açılamadı!\nURL kopyalandı. screenshot = Ekran görüntüsü {0} konumuna kaydedildi screenshot.invalid = Harita çok büyük, muhtemelen ekran görüntüsü için yeterli bellek yok. diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 9771a0bc3d..fa78384973 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -12,7 +12,7 @@ link.itch.io.description = Завантажити гру з Itch.io (окрім link.google-play.description = Завантажити для Android з Google Play link.f-droid.description = Завантажити для Android з F-Droid link.wiki.description = Офіційна ігрова Wiki -link.feathub.description = Запропонувати нові функції +link.suggestions.description = Запропонувати нові функції linkfail = Не вдалося відкрити посилання!\nURL-адреса скопійована в буфер обміну. screenshot = Зняток мапи збережено до {0} screenshot.invalid = Мапа занадто велика, тому, мабуть, не вистачає пам’яті для знятку мапи. diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index f114af7080..50d2e80615 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io 上的 PC 版下载 link.google-play.description = Google Play 页面 link.f-droid.description = F-Droid 页面 link.wiki.description = Mindustry 官方 Wiki -link.feathub.description = 提出新特性的建议 +link.suggestions.description = 提出新特性的建议 linkfail = 打开链接失败!\n网址已复制到您的剪贴板。 screenshot = 屏幕截图已保存到 {0} screenshot.invalid = 地图太大,可能没有足够的内存用于截图。 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 7cf0708df7..23e2ab2467 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -12,7 +12,7 @@ link.itch.io.description = itch.io 電腦版下載網頁 link.google-play.description = Google Play 商店頁面 link.f-droid.description = F-Droid 目錄頁面 link.wiki.description = 官方 Mindustry 維基 -link.feathub.description = 建議新功能 +link.suggestions.description = 建議新功能 linkfail = 無法打開連結!\n我們已將該網址複製到您的剪貼簿。 screenshot = 截圖保存到{0} screenshot.invalid = 地圖太大了,可能沒有足夠的內存用於截圖。 diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 6137edb3c2..02c9fd0318 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -401,6 +401,19 @@ public class TechTree implements ContentList{ }); }); }); + + //TODO research sectors + /* + node(SectorPresets.groundZero, () -> { + node(SectorPresets.nuclearComplex, () -> { + node(SectorPresets.craters, () -> { + node(SectorPresets.saltFlats, () -> { + + }); + }); + }); + }); + */ }); } @@ -458,7 +471,7 @@ public class TechTree implements ContentList{ /** Extra objectives needed to research this. TODO implement */ public Seq objectives = new Seq<>(); /** Time required to research this content, in seconds. */ - public float time = 60; + public float time; /** Nodes that depend on this node. */ public final Seq children = new Seq<>(); /** Research progress, in seconds. */ @@ -474,6 +487,7 @@ public class TechTree implements ContentList{ this.requirements = requirements; this.depth = parent == null ? 0 : parent.depth + 1; this.progress = Core.settings == null ? 0 : Core.settings.getFloat("research-" + content.name, 0f); + this.time = Seq.with(requirements).mapFloat(i -> i.item.cost * i.amount).sum() * 10; //add dependencies as objectives. content.getDependencies(d -> objectives.add(new Research(d))); diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index 604d04059c..a147e6e79e 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -36,10 +36,10 @@ public class ContentLoader{ new UnitTypes(), new Blocks(), new Loadouts(), - new TechTree(), new Weathers(), new Planets(), - new SectorPresets() + new SectorPresets(), + new TechTree(), }; public ContentLoader(){ diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 13a318b383..a0b106e574 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -41,7 +41,7 @@ public class Scripts implements Disposable{ .setModuleScriptProvider(new SoftCachingModuleScriptProvider(new ScriptModuleProvider())) .setSandboxed(true).createRequire(context, scope).install(scope); - if(!run(Core.files.internal("scripts/global.js").readString(), "global.js")){ + if(!run(Core.files.internal("scripts/global.js").readString(), "global.js", false)){ errored = true; } Log.debug("Time to load script engine: @", Time.elapsed()); @@ -82,18 +82,18 @@ public class Scripts implements Disposable{ public void run(LoadedMod mod, Fi file){ currentMod = mod; - run(file.readString(), file.name()); + run(file.readString(), file.name(), true); currentMod = null; } - private boolean run(String script, String file){ + private boolean run(String script, String file, boolean wrap){ try{ if(currentMod != null){ - //inject script info into file (TODO maybe rhino handles this?) + //inject script info into file context.evaluateString(scope, "modName = \"" + currentMod.name + "\"\nscriptName = \"" + file + "\"", "initscript.js", 1, null); } context.evaluateString(scope, - "(function(){\n" + script + "\n})();", + wrap ? "(function(){\n" + script + "\n})();" : script, file, 0, null); return true; }catch(Throwable t){ diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java index 8c1bca2514..d7a5508f20 100644 --- a/core/src/mindustry/type/SectorPreset.java +++ b/core/src/mindustry/type/SectorPreset.java @@ -2,6 +2,7 @@ package mindustry.type; import arc.*; import arc.func.*; +import arc.graphics.g2d.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.ArcAnnotate.*; @@ -9,7 +10,9 @@ import mindustry.ctype.*; import mindustry.game.EventType.*; import mindustry.game.Objectives.*; import mindustry.game.*; +import mindustry.gen.*; import mindustry.maps.generators.*; +import mindustry.ui.*; import static mindustry.Vars.*; @@ -82,6 +85,11 @@ public class SectorPreset extends UnlockableContent{ return true; } + @Override + public TextureRegion icon(Cicon c){ + return Icon.terrain.getRegion(); + } + @Override public boolean isHidden(){ return true; diff --git a/core/src/mindustry/ui/Links.java b/core/src/mindustry/ui/Links.java index ea35192d9c..4f14c746d5 100644 --- a/core/src/mindustry/ui/Links.java +++ b/core/src/mindustry/ui/Links.java @@ -16,7 +16,7 @@ public class Links{ new LinkEntry("changelog", "https://github.com/Anuken/Mindustry/releases", Icon.list, Pal.accent.cpy()), new LinkEntry("trello", "https://trello.com/b/aE2tcUwF", Icon.trello, Color.valueOf("026aa7")), new LinkEntry("wiki", "https://mindustrygame.github.io/wiki/", Icon.book, Color.valueOf("0f142f")), - new LinkEntry("feathub", "https://github.com/Anuken/Mindustry-Suggestions/issues/new/choose/", Icon.add, Color.valueOf("ebebeb")), + new LinkEntry("suggestions", "https://github.com/Anuken/Mindustry-Suggestions/issues/new/choose/", Icon.add, Color.valueOf("ebebeb")), new LinkEntry("reddit", "https://www.reddit.com/r/Mindustry/", Icon.redditAlien, Color.valueOf("ee593b")), new LinkEntry("itch.io", "https://anuke.itch.io/mindustry", Icon.itchio, Color.valueOf("fa5c5c")), new LinkEntry("google-play", "https://play.google.com/store/apps/details?id=io.anuke.mindustry", Icon.googleplay, Color.valueOf("689f38")),