From 4b71b4f80a7920e75fff400d74d509e1aadfbf8d Mon Sep 17 00:00:00 2001 From: Antsiferov Andrew Date: Mon, 4 Jan 2021 18:33:43 +0300 Subject: [PATCH 1/3] Make mod browser case insensitive (#4258) --- core/src/mindustry/ui/dialogs/ModsDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 75dbdca5c7..ec704500bb 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -175,7 +175,7 @@ public class ModsDialog extends BaseDialog{ tablebrow.clear(); for(ModListing mod : listings){ - if(mod.hasJava || !searchtxt.isEmpty() && !mod.repo.contains(searchtxt) || (Vars.ios && mod.hasScripts)) continue; + if(mod.hasJava || !searchtxt.isEmpty() && !mod.repo.toLowerCase().contains(searchtxt.toLowerCase()) || (Vars.ios && mod.hasScripts)) continue; tablebrow.button(btn -> { btn.top().left(); From 6bd8f99be3ea9a35dff073b826792a645ba9ea21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=91=9E=E6=9A=84?= Date: Mon, 4 Jan 2021 23:38:18 +0800 Subject: [PATCH 2/3] Updated Search Bar cleanup for zh-TW (#4186) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update bundle_zh_TW.properties Corrected some machine translations. Modified some others for more clear understanding. * Update bundle_zh_TW.properties * Update bundle_zh_TW.properties new translations 1 * Update bundle_zh_TW.properties New translations 2 * Update bundle_zh_TW.properties New translations 3 * New translations 1-3 Removed "zones" from v121.4: "Fixed sectors not auto-unlocking". 衝擊反應堆 -->動能反應爐 * New translations 1-4 * New translations 1-5 * New translations 1-6 up to line 1250 * Indexing finished. Translations 1-7 lines are now matching with English bundle. * update bundle_zh_TW.properties * edit zh_TW * zh-tw * community server disclaimer * Finished sector descriptions, slight modifications up to line 606 * zh-TW * Many translations, include Always-on weather rule * corrected missing character * Update achievements.vdf Oct not translated * Update description.txt * bundle_zh_TW.properties * Bullet stats update, hints finished * added line: public confirm really * contributors * Merging conflicts Almost done... * Synced * Update ammo-stat translation * Update contributors * Unit names * Update bundle_zh_TW.properties * Unit names * Update bundle_zh_TW.properties * Review (#15) * Update bundle_zh_TW.properties * Unit names * Update bundle_zh_TW.properties * Finished Please review * minor correction * minor correction Hopefully there are no more "minor corrections" required. * Review * Close inspection * Revisions, change chat mode * Sapping Correction * Merge down (#16, post 122) * Fixed #4108 * [QoL] Chat modes (#3869) Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n). * add new io server (#4109) soon to be up gamemode * typo (#4110) * Fixed mined item flashing on clients * Block Forge improvements (#4112) * minBlockSize, maxBlockSize, icon * removed fixed size * same line * revert to 3 * I almost forgot * Up-to-date zh-TW translations (#4083) * Update bundle_zh_TW.properties Corrected some machine translations. Modified some others for more clear understanding. * Update bundle_zh_TW.properties * Update bundle_zh_TW.properties new translations 1 * Update bundle_zh_TW.properties New translations 2 * Update bundle_zh_TW.properties New translations 3 * New translations 1-3 Removed "zones" from v121.4: "Fixed sectors not auto-unlocking". 衝擊反應堆 -->動能反應爐 * New translations 1-4 * New translations 1-5 * New translations 1-6 up to line 1250 * Indexing finished. Translations 1-7 lines are now matching with English bundle. * update bundle_zh_TW.properties * edit zh_TW * zh-tw * community server disclaimer * Finished sector descriptions, slight modifications up to line 606 * zh-TW * Many translations, include Always-on weather rule * corrected missing character * Update achievements.vdf Oct not translated * Update description.txt * bundle_zh_TW.properties * Bullet stats update, hints finished * added line: public confirm really * contributors * Merging conflicts Almost done... * Synced * Update ammo-stat translation * Update contributors * Unit names * Update bundle_zh_TW.properties * Unit names * Update bundle_zh_TW.properties * Review (#15) * Update bundle_zh_TW.properties * Unit names * Update bundle_zh_TW.properties * Finished Please review * minor correction * minor correction Hopefully there are no more "minor corrections" required. * Review * Close inspection * Revisions, change chat mode * Sapping Correction Co-authored-by: simba-fs Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com> * Higher power source output * Update servers_v6.json (#4095) * Update servers_v6.json the ip changed to not make users confuse * Update servers_v6.json * Fixed #4120 * Fixed #4121 * Fixed #4122 * Better build beam visuals * Don't render weather in full map screenshots * Building priority fix * Fixed #4128 * SearchBar class - add search bars to mods (#3267) * Create SearchBar and make ModsDialog use it * add search bar to servers * Update core/src/mindustry/ui/SearchBar.java Co-authored-by: Antsiferov Andrew * a * fix mods menu not rowing * remove search bar for remote servers * h * hide searchbar on landscape mobile * anukes feedback * Update core/src/mindustry/ui/SearchBar.java Co-authored-by: Anuken * java dumb Co-authored-by: Antsiferov Andrew Co-authored-by: Anuken * Search bar cleanup * Block (un)loader major improvements (#4127) * make it consider consVaild * make this too * pattern style and max block size * Is there a better way to do this? * Update BlockUnloader.java * do not the /0 * prevent /0 * test 1 * yup it works for enabled Co-authored-by: Anuken Co-authored-by: Antsiferov Andrew Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com> Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com> Co-authored-by: simba-fs Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com> Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com> Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com> * "Search bar cleanup" update * Hope this fixes merge conflict * Delete servers_v6.json * pain * Sync (#21) * Fixed #4108 * [QoL] Chat modes (#3869) Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n). * add new io server (#4109) soon to be up gamemode * typo (#4110) * Fixed mined item flashing on clients * Block Forge improvements (#4112) * minBlockSize, maxBlockSize, icon * removed fixed size * same line * revert to 3 * I almost forgot * Up-to-date zh-TW translations (#4083) * Update bundle_zh_TW.properties Corrected some machine translations. Modified some others for more clear understanding. * Update bundle_zh_TW.properties * Update bundle_zh_TW.properties new translations 1 * Update bundle_zh_TW.properties New translations 2 * Update bundle_zh_TW.properties New translations 3 * New translations 1-3 Removed "zones" from v121.4: "Fixed sectors not auto-unlocking". 衝擊反應堆 -->動能反應爐 * New translations 1-4 * New translations 1-5 * New translations 1-6 up to line 1250 * Indexing finished. Translations 1-7 lines are now matching with English bundle. * update bundle_zh_TW.properties * edit zh_TW * zh-tw * community server disclaimer * Finished sector descriptions, slight modifications up to line 606 * zh-TW * Many translations, include Always-on weather rule * corrected missing character * Update achievements.vdf Oct not translated * Update description.txt * bundle_zh_TW.properties * Bullet stats update, hints finished * added line: public confirm really * contributors * Merging conflicts Almost done... * Synced * Update ammo-stat translation * Update contributors * Unit names * Update bundle_zh_TW.properties * Unit names * Update bundle_zh_TW.properties * Review (#15) * Update bundle_zh_TW.properties * Unit names * Update bundle_zh_TW.properties * Finished Please review * minor correction * minor correction Hopefully there are no more "minor corrections" required. * Review * Close inspection * Revisions, change chat mode * Sapping Correction Co-authored-by: simba-fs Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com> * Higher power source output * Update servers_v6.json (#4095) * Update servers_v6.json the ip changed to not make users confuse * Update servers_v6.json * Fixed #4120 * Fixed #4121 * Fixed #4122 * Better build beam visuals * Don't render weather in full map screenshots * Building priority fix * Fixed #4128 * SearchBar class - add search bars to mods (#3267) * Create SearchBar and make ModsDialog use it * add search bar to servers * Update core/src/mindustry/ui/SearchBar.java Co-authored-by: Antsiferov Andrew * a * fix mods menu not rowing * remove search bar for remote servers * h * hide searchbar on landscape mobile * anukes feedback * Update core/src/mindustry/ui/SearchBar.java Co-authored-by: Anuken * java dumb Co-authored-by: Antsiferov Andrew Co-authored-by: Anuken * Search bar cleanup * Block (un)loader major improvements (#4127) * make it consider consVaild * make this too * pattern style and max block size * Is there a better way to do this? * Update BlockUnloader.java * do not the /0 * prevent /0 * test 1 * yup it works for enabled * bugfixes, call me the mother of the block forge (#4135) (anuke is the father) * Fixed #4141 / Fixed #4136 * Faster power graph reload / Fixed iOS editor margin * Remove 4 square blocks from the accelerator (#4139) * Normalize rule comment line endings Just so i can get a new patch-## branch where i can drag my accelerator sprite on since github isn't smart enough yet to see that as a possible pull request by itself. * Add files via upload * Add files via upload * Use sector preset name for maps if possible * Fixed #4147 * Update servers_v6.json (#4148) changed the port number for our attack server. sorry for the inconvenience, i don't have control over the port number of this "alexmindustryattac.ddns.net" hosted server. * Removed packed sprite section from CONTRIBUTING.md (#4152) * Return large launchpad item costs (#4134) * Return large launchpad item costs hidden -> debugonly * Remove the 4 orange squares from the large launch pad Leaving the lights and launchpod alignments alone since that is campaign only. * Sector damage tweaks * Block loader/unloader progress bar changes (#4138) * Change block loader/unloader progess bar color & bundle ammo -> items * Make block unloader bar go down * Draw reconstructor in region during placement & unconnected (#4143) * Draw reconstructor in region during placement & unconnected * Same as the previous commit, but for block loaders & unloaders * Bugfixes * Fixed #4164 / Fixed #4159 * fix german translation for editor.unsaved (#4169) * update KO bundles (#3956) * Update steam description for 6.0 update * Update achievements.vdf * oops. * Update full_description.txt * Update summary.txt * add recent changelog * Update bundle_ko.properties * last update on this week (well, sunday) * upload android recent change-log * critical fix * [KO] Small fix (#4133) * why * Update bundle_ko.properties * bundle_hu.properties (#4170) I'am continue translating and adding lines to v6. * [Bundle][RO] Translation update (#4115) * [Bundle][RO] Translation update This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft). Changelog: - New strings/changes up to commit 43757a247ef3bd0508d25dce2c4c38846cb1fb1c - Typo fixes & various other improvements * no * yet another in_ID translation update (#4086) * yet another in_ID translation update * more id translate Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> * Cleanup Co-authored-by: Anuken Co-authored-by: Antsiferov Andrew Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com> Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com> Co-authored-by: simba-fs Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com> Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com> Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com> Co-authored-by: Patrick 'Quezler' Mounier Co-authored-by: alex <67626131+alexpvpmindustry@users.noreply.github.com> Co-authored-by: Catchears <57631841+Catchears@users.noreply.github.com> Co-authored-by: Sharlotte <60801210+sharlotte-mobile@users.noreply.github.com> Co-authored-by: Vajda Simon <75036456+VajdaSimon@users.noreply.github.com> Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com> Co-authored-by: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> * Update gradle.properties * Update bundle_zh_TW.properties Co-authored-by: simba-fs Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com> Co-authored-by: Anuken Co-authored-by: Antsiferov Andrew Co-authored-by: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com> Co-authored-by: Sunny Kim <58885089+sk7725@users.noreply.github.com> Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com> Co-authored-by: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com> Co-authored-by: Patrick 'Quezler' Mounier Co-authored-by: alex <67626131+alexpvpmindustry@users.noreply.github.com> Co-authored-by: Catchears <57631841+Catchears@users.noreply.github.com> Co-authored-by: Sharlotte <60801210+sharlotte-mobile@users.noreply.github.com> Co-authored-by: Vajda Simon <75036456+VajdaSimon@users.noreply.github.com> Co-authored-by: YellOw139 <70975516+YellOw139@users.noreply.github.com> Co-authored-by: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> --- core/assets/bundles/bundle_zh_TW.properties | 5 +++-- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 77a37663b1..b8f7cde747 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -89,6 +89,7 @@ joingame = 多人連線 customgame = 自訂遊戲 newgame = 新遊戲 none = 〈沒有〉 +none.found = [lightgray]〈查無結果〉 minimap = 小地圖 position = 位置 close = 關閉 @@ -296,7 +297,7 @@ data.exported = 資料已匯出。 data.invalid = 這不是有效的遊戲資料。 data.import.confirm = 導入外部資料將會覆寫您目前[scarlet]所有的[]遊戲資料，\n[accent]此動作無法復原！[]\n\n匯入資料後，您的遊戲將立刻結束。 quit.confirm = 您確定要結束嗎？ -quit.confirm.tutorial = 您確定您知道自己在做什麼嗎?\n可以在[accent] 設定->遊戲[] 選項中重設教學。 +quit.confirm.tutorial = 您確定您知道自己在做什麼嗎?\n可以在[accent] 設定-遊戲[] 選項中重設教學。 loading = [accent]載入中…… reloading = [accent]模組重新載入中…… saving = [accent]儲存中…… @@ -621,7 +622,7 @@ settings.sound = 音效 settings.graphics = 圖形 settings.cleardata = 清除遊戲資料…… settings.clear.confirm = 您確定要清除資料嗎？\n此動作無法復原！ -settings.clearall.confirm = [scarlet]警告！[]\n這會清除所有資料，包括存檔、地圖、解鎖項目和快捷鍵綁定。\n按「是」後，遊戲將刪除所有資料並自動結束。 +settings.clearall.confirm = [scarlet]警告！[]\n這會清除所有資料，包括存檔、地圖、解鎖項目和快捷鍵綁定。\n按「確定」後，遊戲將刪除所有資料並自動結束。 settings.clearsaves.confirm = 您確定您想要清除所有存檔嗎？ settings.clearsaves = 清除存檔 settings.clearresearch = 清除研究 diff --git a/gradle.properties b/gradle.properties index f42373473e..067e8595ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=5e9176c3feefa5ee2f14b08f82da1f01f790e64a +archash=5e9176c3feefa5ee2f14b08f82da1f01f790e64a \ No newline at end of file From 8cdb4c083179fa54e7f5a01e586cee0b59367c71 Mon Sep 17 00:00:00 2001 From: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> Date: Mon, 4 Jan 2021 22:56:39 +0700 Subject: [PATCH 3/3] Indonesian Gplay Translate (#3708) * Indonesian Gplay Translate * Create 29741.txt --- fastlane/metadata/android/in/full_description.txt | 10 +++++----- .../android/in/https:/github.com/changelogs/29741.txt | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 fastlane/metadata/android/in/https:/github.com/changelogs/29741.txt diff --git a/fastlane/metadata/android/in/full_description.txt b/fastlane/metadata/android/in/full_description.txt index cd5adae89b..de36ab1262 100644 --- a/fastlane/metadata/android/in/full_description.txt +++ b/fastlane/metadata/android/in/full_description.txt @@ -2,13 +2,13 @@ Buat rantai pasokan pengantar berjalan yang rumit untuk memasukkan amunisi ke me Fitur: - 24 peta bawaan -- Kampanye, lengkap dengan pohon teknologi dan area yang dapat dibuka -- 4 bos gelombang yang kuat untuk dikalahkan +- Kampanye, lengkap dengan pohon teknologi dan sebuah planet untuk dikuasai +- Pasukan penjaga yang sangat kuat untuk dikalahkan - Sistem transportasi energi, cairan dan barang -- 19 jenis drone, mech, dan kapal -- 120+ blok teknologi untuk dikuasai +- 33 jenis unit yang terdiri dari drone, meka, dan kapal +- 120+ blok teknologi yang bisa dipelajari - 75+ blok lingkungan yang berbeda - Multipemain lintas platform melalui jaringan lokal atau server khusus -- Aturan permainan khusus: Ubah biaya blok, statistik musuh, item awal, waktu gelombang, dan lainnya +- Pengaturan permainan khusus: Ubah biaya blok, statistik musuh, item awal, waktu gelombang, dan lainnya - Editor yang andal, dengan alat untuk menghasilkan sumber daya, medan, dekorasi, dan menerapkan simetri ke peta secara acak - Tata letak gelombang peta yang dapat disesuaikan diff --git a/fastlane/metadata/android/in/https:/github.com/changelogs/29741.txt b/fastlane/metadata/android/in/https:/github.com/changelogs/29741.txt new file mode 100644 index 0000000000..bce5747339 --- /dev/null +++ b/fastlane/metadata/android/in/https:/github.com/changelogs/29741.txt @@ -0,0 +1,5 @@ +[Ini adalah log perubahan yang terpotong, lihat Github untuk catatan lengkapnya] +- Memperbaiki 2 crash yang jarang terjadi +- Unit yang dibuat bergantung pada bahan produksinya di pohon teknologi +- Distributor sekarang dapat menimpa pengantar +- Memperbarui terjemahan