From 36704e2d242cac7403ff770e747c38cb223bdb8d Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sun, 24 Mar 2024 13:37:42 +0200 Subject: [PATCH 01/21] docs: fixed date in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31436235..d8553784 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [1.5.3] - 24.03.2023 +## [1.5.3] - 24.03.2024 ### Added From e4bc7afa7474fc7ffae4c1b5afc8c12325f8b503 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sun, 24 Mar 2024 13:38:10 +0200 Subject: [PATCH 02/21] docs: fixed date in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fe54584..1caed13e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [3.9.5] - 24.03.2023 +## [3.9.5] - 24.03.2024 ### Added From 860a8474d3064a0b441ea0afd5d8b47c1d5e70c6 Mon Sep 17 00:00:00 2001 From: "Jeong, Hun" Date: Sun, 24 Mar 2024 11:17:36 -0700 Subject: [PATCH 03/21] Show some helpful error when --run-game cannot work Instead of just try to run UI with invalid argument to fail, it will just fail with better error messages. Fixes #327 --- src/main.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.rs b/src/main.rs index 525fcdff..8af25b0c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -241,6 +241,10 @@ fn main() -> anyhow::Result<()> { return Ok(()); } + LauncherState::PredownloadAvailable { .. } if run_game => { + return Err(anyhow::anyhow!("Predownload available. Use --just-run-game to run anyway, or open the UI to download it")); + } + _ => () } } From 18222ed17d265d1315186b80c58879a3c8950dca Mon Sep 17 00:00:00 2001 From: vbrabandt <87247880+vbrabandt2005@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:06:14 +0100 Subject: [PATCH 04/21] update my username in credits just found out I could change my username and I'd decided to changed it. --- src/ui/about.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/about.rs b/src/ui/about.rs index 3df62ec1..28e37efb 100644 --- a/src/ui/about.rs +++ b/src/ui/about.rs @@ -79,7 +79,7 @@ impl SimpleComponent for AboutDialog { "Indonesia — @yumekarisu https://github.com/yumekarisu", "Tiếng Việt — Nguyễn Hữu Chánh https://github.com/Chanhnh", "Українська — Іван Потієнко https://github.com/xxanqw", - "ไทย — @thegooglerider https://github.com/TheGoogleRider2" + "ไทย — @vbrabandt2005 https://github.com/vbrabandt2005" ].join("\n"), set_debug_info: &[ From abe660d0b9d4be839346d942ae84142a81d77e49 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 27 Mar 2024 18:14:05 +0200 Subject: [PATCH 05/21] feat(core): updated core version --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b51614b4..685a7f4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,8 +57,8 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "anime-game-core" -version = "1.17.5" -source = "git+https://github.com/an-anime-team/anime-game-core?tag=1.17.5#55dd60f6b5f78aa80e2217404c3ee1151657f011" +version = "1.17.6" +source = "git+https://github.com/an-anime-team/anime-game-core?tag=1.17.6#0fb314b61d1deb1cd281dc6dc041ce27886cf513" dependencies = [ "anyhow", "bzip2", @@ -82,8 +82,8 @@ dependencies = [ [[package]] name = "anime-launcher-sdk" -version = "1.12.7" -source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.12.7#f4133c0875af54b07b4c0dac04df4598193ac9ec" +version = "1.12.8" +source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.12.8#f8d321f1d22dce555a275c662cf98c0e6b331bc7" dependencies = [ "anime-game-core", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index fa75b7d4..415544e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "honkers-railway-launcher" version = "1.5.3" description = "The Honkers Railway launcher" -authors = ["Nikita Podvirnyy "] +authors = ["Nikita Podvirnyi "] homepage = "https://github.com/an-anime-team/the-honkers-railway-launcher" repository = "https://github.com/an-anime-team/the-honkers-railway-launcher" license = "GPL-3.0" @@ -19,7 +19,7 @@ glib-build-tools = "0.19" [dependencies.anime-launcher-sdk] git = "https://github.com/an-anime-team/anime-launcher-sdk" -tag = "1.12.7" +tag = "1.12.8" features = ["all", "star-rail", "star-rail-patch"] # path = "../anime-launcher-sdk" # ! for dev purposes only From ed90e7ebc63d9a6e615a4f1cbd4860702f5fe1a6 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 27 Mar 2024 18:16:45 +0200 Subject: [PATCH 06/21] feat: updated changelog --- CHANGELOG.md | 5 +++++ src/ui/about.rs | 23 +++-------------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8553784..6dccf8c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Updated voiceovers sizes +- Updated game version parsing algorithm + ## [1.5.3] - 24.03.2024 ### Added diff --git a/src/ui/about.rs b/src/ui/about.rs index 548750f3..180bf6de 100644 --- a/src/ui/about.rs +++ b/src/ui/about.rs @@ -43,7 +43,7 @@ impl SimpleComponent for AboutDialog { set_version: &APP_VERSION, set_developers: &[ - "Nikita Podvirnyy https://github.com/krypt0nn" + "Nikita Podvirnyi https://github.com/krypt0nn" ], add_credit_section: (Some("Patch credits"), &[ @@ -99,28 +99,11 @@ impl SimpleComponent for AboutDialog { set_release_notes_version: &APP_VERSION, set_release_notes: &[ - "

Added

", - - "
    ", - "
  • Bundle applications-system-symbolic icon to the app
  • ", - "
  • Added force grab cursor option to the gamescope settings
  • ", - "
  • Added Thai
  • ", - "
  • Added Ukrainian
  • ", - "
", - "

Changed

", "
    ", - "
  • Update wish url
  • ", - "
  • Updated dependencies
  • ", - "
  • Improved app args parsing
  • ", - "
  • Updated locales
  • ", - "
", - - "

Fixed

", - - "
    ", - "
  • Fixed GtkSwitch UI state representation
  • ", + "
  • Updated voiceovers sizes
  • ", + "
  • Updated game version parsing algorithm
  • ", "
" ].join("\n"), From 1b41f0e791d29fb7f455033db610cc7ba8f04f53 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 27 Mar 2024 18:21:42 +0200 Subject: [PATCH 07/21] 1.5.4 --- CHANGELOG.md | 5 ++++- Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dccf8c7..cac6ab7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.5.4] - 27.03.2024 + ### Changed - Updated voiceovers sizes @@ -265,7 +267,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-[unreleased]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.3...next +[unreleased]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.4...next +[1.5.4]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.3...1.5.4 [1.5.3]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.2...1.5.3 [1.5.2]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.1...1.5.2 [1.5.1]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.0...1.5.1 diff --git a/Cargo.lock b/Cargo.lock index 685a7f4a..08d0c77c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1512,7 +1512,7 @@ dependencies = [ [[package]] name = "honkers-railway-launcher" -version = "1.5.3" +version = "1.5.4" dependencies = [ "anime-launcher-sdk", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 415544e8..20bc62c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "honkers-railway-launcher" -version = "1.5.3" +version = "1.5.4" description = "The Honkers Railway launcher" authors = ["Nikita Podvirnyi "] homepage = "https://github.com/an-anime-team/the-honkers-railway-launcher" From 440b62e8356abaea24f35903e3167813f8543e32 Mon Sep 17 00:00:00 2001 From: JustMarkov <67514343+JustMarkov@users.noreply.github.com> Date: Fri, 29 Mar 2024 08:45:18 +0500 Subject: [PATCH 08/21] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 115afe4f..a879a654 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ instead of the actual name of the game, to avoid search engine parsing. | Distribution | Format | Wiki | Source | | - | - | - | - | -| Fedora | Flatpak | [link](https://github.com/an-anime-team/the-honkers-railway-launcher/wiki/Installation#-any-distribution-flatpak) | - | +| Any | Flatpak | [link](https://github.com/an-anime-team/the-honkers-railway-launcher/wiki/Installation#-any-distribution-flatpak) | - | | Arch Linux, Manjaro | AUR | [link](https://github.com/an-anime-team/the-honkers-railway-launcher/wiki/Installation#-arch-linux-aur) | [the-honkers-railway-launcher-bin](https://aur.archlinux.org/packages/the-honkers-railway-launcher-bin) | | Fedora, OpenSUSE | RPM | [link](https://github.com/an-anime-team/the-honkers-railway-launcher/wiki/Installation#-fedora-rpm) | [HRL](https://build.opensuse.org/repositories/home:Maroxy:AAT-Apps/HRL) | | Gentoo | ebuild | [link](https://github.com/an-anime-team/the-honkers-railway-launcher/wiki/Installation#-gentoo-linux-ebuild) | [gentoo-ebuilds](https://github.com/an-anime-team/gentoo-ebuilds) | From 5aff39932833dc86a7d4ec21856c82ef20806f97 Mon Sep 17 00:00:00 2001 From: Dominik Hejl Date: Tue, 2 Apr 2024 11:56:26 +0200 Subject: [PATCH 09/21] add czech localization --- assets/locales/common.ftl | 1 + assets/locales/cs/components.ftl | 20 ++++++++ assets/locales/cs/enhancements.ftl | 57 ++++++++++++++++++++++ assets/locales/cs/environment.ftl | 7 +++ assets/locales/cs/errors.ftl | 66 ++++++++++++++++++++++++++ assets/locales/cs/first_run.ftl | 65 +++++++++++++++++++++++++ assets/locales/cs/game.ftl | 7 +++ assets/locales/cs/gamescope.ftl | 16 +++++++ assets/locales/cs/general.ftl | 70 +++++++++++++++++++++++++++ assets/locales/cs/main.ftl | 76 ++++++++++++++++++++++++++++++ assets/locales/cs/sandbox.ftl | 28 +++++++++++ src/i18n.rs | 3 +- 12 files changed, 415 insertions(+), 1 deletion(-) create mode 100644 assets/locales/cs/components.ftl create mode 100644 assets/locales/cs/enhancements.ftl create mode 100644 assets/locales/cs/environment.ftl create mode 100644 assets/locales/cs/errors.ftl create mode 100644 assets/locales/cs/first_run.ftl create mode 100644 assets/locales/cs/game.ftl create mode 100644 assets/locales/cs/gamescope.ftl create mode 100644 assets/locales/cs/general.ftl create mode 100644 assets/locales/cs/main.ftl create mode 100644 assets/locales/cs/sandbox.ftl diff --git a/assets/locales/common.ftl b/assets/locales/common.ftl index 632d9e52..790c98ff 100644 --- a/assets/locales/common.ftl +++ b/assets/locales/common.ftl @@ -33,3 +33,4 @@ id-id = Indonesia vi-vn = Tiếng Việt uk-ua = Українська th-th = ไทย +cs-cz = Čeština diff --git a/assets/locales/cs/components.ftl b/assets/locales/cs/components.ftl new file mode 100644 index 00000000..813daac9 --- /dev/null +++ b/assets/locales/cs/components.ftl @@ -0,0 +1,20 @@ +components = Komponenty +components-description = Spravovat verze Wine a DXVK + +selected-version = Současně používaná verze +recommended-only = Pouze doporučené + +wine-version = Verze Wine +wine-recommended-description = Zobrazovat pouze doporučená vydaní Wine + +wine-options = Možnosti Wine + +wine-use-shared-libraries = Používat sdílené knihovny Wine +wine-use-shared-libraries-description = Nastaví LD_LIBRARY_PATH aby se systémové knihovny načítaly ze zvolené verze Wine + +gstreamer-use-shared-libraries = Používat sdílené knihovny gstreamer +gstreamer-use-shared-libraries-description = Nastaví GST_PLUGIN_PATH aby se komponenty gstreamer načítaly ze zvolené verze Wine + +dxvk-version = DXVK verze +dxvk-selection-disabled = Výběr DXVK je vypnutý kvůli vašemu nastavení Wine skupin +dxvk-recommended-description = Zobrazovat pouze doporučená vydaní DXVK diff --git a/assets/locales/cs/enhancements.ftl b/assets/locales/cs/enhancements.ftl new file mode 100644 index 00000000..c247b2a0 --- /dev/null +++ b/assets/locales/cs/enhancements.ftl @@ -0,0 +1,57 @@ +game-settings-description = Spravujte nastavení hry a účtu +sandbox-settings-description = Izolovat hru v bubblewrap sandboxu, podobně jak to dělá Flatpak +environment-settings-description = Specifikovat proměné prostředí a příkaz pro spuštění hry + +wine = Wine + +synchronization = Synchronizace +wine-sync-description = Technologie použitá na synchronizaci vnitřních procesů Wine + +language = Jazyk +wine-lang-description = Jazyk který bude nastaven ve Wine prostředí. Může opravit problémy s rozložením klávesnice +system = Systém + +borderless-window = Okno bez okrajů +virtual-desktop = Virtuální plocha + +map-drive-c = Připojení jednotky C: +map-drive-c-description = Automaticky udělá symlink složky drive_c z Wine prefixu na dosdevices + +map-game-folder = Připojení složky se hrou +map-game-folder-description = Automaticky udělá symlink složky se hrou na dosdevices + +game = Hra + +hud = HUD + +fsr = FSR +fsr-description = Škáluje hru na velikost vašeho monitoru. Aby jste tuto funkci použili vyberte nižší rozlišení v nastavení hry a stiskněte Alt+Enter +ultra-quality = Ultra kvalita +quality = Kvalita +balanced = Vyváženě +performance = Výkon + +gamemode = Herní režim +gamemode-description = Nastaví hře vyšší prioritu než zbytek procesů + +gamescope = Gamescope +gamescope-description = Gamescope je nástroj od firmy Valve který umožňuje hře běžet v izolované instanci Xwayland, podporuje GPU od AMD, Intel, a Nvidia + +discord-rpc = Discord RPC +discord-rpc-description = Discord RPC Discord RPC poskytuje informace o hře kterou hrajete Discordu aby to viděli vaši přátelé +icon = Ikona +title = Titulek +description = Popis + +fps-unlocker = FPS Odemykač +fps-unlocker-description = Odstraní limit FPS pomocí úpravy paměti hry. Může být detekováno anti-cheatem + +enabled = Povoleno + +fps-unlocker-interval = Přepisovací interval +fps-unlocker-interval-description = Prodleva v milisekundách mezi přepisováním FPS limitu. Přepisování je nutné aby si to hra neresetovala + +window-mode = Režim v okně +borderless = Celá obrazovka v okně +popup = Popup +fullscreen = Celá obrazovka diff --git a/assets/locales/cs/environment.ftl b/assets/locales/cs/environment.ftl new file mode 100644 index 00000000..4ec904c7 --- /dev/null +++ b/assets/locales/cs/environment.ftl @@ -0,0 +1,7 @@ +environment = Běhové prostředí +game-command = Spouštěcí příkaz +game-command-description = Příkaz určený ke spuštění hry. Zástupný symbol %command% je generován launcherem, například: gamemoderun '%command%' +new-variable = Nová proměnná +name = Jméno +value = Hodnota +add = Přidat diff --git a/assets/locales/cs/errors.ftl b/assets/locales/cs/errors.ftl new file mode 100644 index 00000000..3f370711 --- /dev/null +++ b/assets/locales/cs/errors.ftl @@ -0,0 +1,66 @@ +launcher-folder-opening-error = Nepodařilo se otevřít složku launcheru +game-folder-opening-error = Nepodařilo se otevřít složku se hrou +config-file-opening-error = Nepodařilo se otevřít konfigurační soubor +debug-file-opening-error = Nepodařilo se otevřít debugovací soubor + +wish-url-search-failed = Nebyla nalezena žádná adresa URL wishů +wish-url-opening-error = Nepodařilo se otevřít URL wishů + +wine-run-error = Nepodařilo se spustit {$executable} pomocí Wine + +game-launching-failed = Nepodařilo se spustit hru +failed-get-selected-wine = Nepodařilo se získat vybranou verzi Wine +downloading-failed = Stahování selhalo +unpacking-failed = Rozbalování selhalo + +kill-game-process-failed = Nepodařilo se zabít proces hry + +game-file-repairing-error = Nepodařilo se opravit soubory hry +integrity-files-getting-error = Nepodařilo se získat soubory integrity + +background-downloading-failed = Nepodařila se stáhnout tapeta +components-index-sync-failed = Nepodařilo se synchronizovat seznam komponent +components-index-verify-failed = Nepodařilo se ověřit seznam komponent +config-update-error = Nepodařilo se uložit konfiguraci +wine-prefix-update-failed = Nepodařilo se aktualizovat Wine prefix +dxvk-install-failed = Nepodařilo se nainstalovat DXVK +voice-package-deletion-error = Nepodařilo se odstranit Dabing + +game-diff-finding-error = Nepodařilo se najít herní diff +patch-info-fetching-error = Informace o opravě se nepodařilo načíst +launcher-state-updating-error = Aktualizace stavu spouštěče se nezdařila + +package-not-available = Balíček není dostupný: {$package} +wine-download-error = Nepodařilo se stáhnout Wine +wine-unpack-errror = Nepodařilo se rozbalit Wine +wine-install-failed = Nepodařilo se nainstalovat Wine +dxvk-download-error = Nepodařilo se stáhnout DXVK +dxvk-unpack-error = Nepodařilo se rozbalit DXVK +dxvk-apply-error = Nepodařilo se nainstalovat DXVK + +downloaded-wine-list-failed = Nepodařilo se zobrazit seznam Wine verzí + +patch-sync-failed = Synchronizace složky patchů se nezdařila +patch-state-check-failed = Nepodařilo se zkontrolovat stav složky patchů +game-patching-error = Nepodařilo se patchnout hru + +# Disable telemetry + +telemetry-servers-disabling-error = Nepodařilo se vypnout servery s telemetrií + +# Sandbox + +documentation-url-open-failed = Nepodařilo se otevřít adresu URL dokumentace + +# Game + +game-session-add-failed = Přidání herní relace se nezdařilo +game-session-update-failed = Aktualizace herní relace se nezdařila +game-session-remove-failed = Odebrání herní relace se nezdařilo +game-session-set-current-failed = Nastavení aktuální herní relace se nezdařilo +game-session-apply-failed = Nepodařilo se použít herní relaci + +# Enhancements + +discord-rpc-icons-fetch-failed = Ikony Discord RPC se nepodařilo načíst +discord-rpc-icon-download-failed = Ikonu Discord RPC se nepodařilo stáhnout diff --git a/assets/locales/cs/first_run.ftl b/assets/locales/cs/first_run.ftl new file mode 100644 index 00000000..b4b4d86e --- /dev/null +++ b/assets/locales/cs/first_run.ftl @@ -0,0 +1,65 @@ +welcome = Vítejte + +welcome-page-message = + Ahoj! Vítej v An Anime Game Launcheru + + Než budete moci hru spustit, musíme připravit nějaké věci a stáhnout výchozí komponenty + + +tos-violation-warning = Upozornění na porušení smluvních podmínek + +tos-violation-warning-message = + Tento spouštěč je neoficiální nástroj, který nijak nesouvisí se společností {company-name} ani {company-alter-name}. + + Tento nástroj je navržen tak, aby usnadnil hraní {game-name} na Linuxu, a byl vytvořen s jediným účelem – nainstalovat a spustit hru s menšími problémy. + + Činí tak pomocí stávajících komponent a zjednodušuje práci uživatele. + + Některé zde použité komponenty však pravděpodobně porušují smluvní podmínky {company-name} pro {game-name}. + + Pokud používáte tento spouštěč, váš hráčský účet může být označen jako nesplňující TOS podle {company-name}/{company-alter-name}. + + Pokud k tomu dojde a váš účet by porušil TOS, {company-name}/{company-alter-name} si může dělat, co chce. Včetně zákazu. + + Pokud chápete riziko pokusu hrát hru neoficiálně, pokračujte stisknutím OK + +tos-dialog-title = Jste si jisti, že rozumíte tomu, co chceme říci? +tos-dialog-message = + 1. Nezveřejňujte žádné informace o tomto projektu + 2. Nezneužívejte projekt používáním nějakých modifikovaných klientů a podobně + 3. Na otázky se ptejte na našem discord nebo matrix serveru + + +dependencies = Závislosti +missing-dependencies-title = Chybí vám závislosti! +missing-dependencies-message = Před pokračováním v procesu instalace musíte do systému nainstalovat některé balíčky + + +default-paths = Výchozí cesty +choose-default-paths = Vybrat výchozí cesty +show-all-folders = Vím, co dělám +show-all-folders-subtitle = Zobrazit další nastavení výběru cesty. Udělej jak říkám... +runners-folder = Složka spouštěčů +dxvks-folder = Složka DXVK +wine-prefix-folder = Složka Wine prefixů +global-game-installation-folder = Instalační složka globální verze hry +chinese-game-installation-folder = Instalační složka čínské verze hry +fps-unlocker-folder = Složka odemykače FPS +components-index = Seznam komponent +patch-folder = Složka patchů +temp-folder = Složka dočasných souborů + +migrate = Migrovat + + +select-voice-packages = Vyberte dabingy + + +download-components = Stáhnout komponenty +download-dxvk = Stáhnout DXVK +apply-dxvk = Aplikovat DXVK + + +finish = Dokončit +finish-title = Všechno je hotovo! +finish-message = Všechny základní komponenty byly staženy. Nyní můžete restartovat launcher a stáhnout hru. Vítejte v klubu! diff --git a/assets/locales/cs/game.ftl b/assets/locales/cs/game.ftl new file mode 100644 index 00000000..20a3359b --- /dev/null +++ b/assets/locales/cs/game.ftl @@ -0,0 +1,7 @@ +game-sessions = Herní relace + +active-sessions = Aktivní relace +active-session-description = Aktuálně vybraná herní relace. Aktualizace po každém spuštění hry + +update-session = Aktualizujte relaci pomocí aktuálních hodnot registru ve Wine prefixu +delete-session = Smazat relaci diff --git a/assets/locales/cs/gamescope.ftl b/assets/locales/cs/gamescope.ftl new file mode 100644 index 00000000..da3b1f11 --- /dev/null +++ b/assets/locales/cs/gamescope.ftl @@ -0,0 +1,16 @@ +game-resolution = Rozlišení hry +gamescope-resolution = Rozlišení Gamescope + +upscaling = Škálování + +integer-scaling = Integerové škálování +integer-scaling-description = Změní každý pixel na čtvercovou nebo obdélníkovou skupinu celočíselného počtu pixelů stejné barvy. Zabraňuje ztrátě ostrosti při škálování Full HD na 4K +gamescope-fsr-description = Technika upscalingu s otevřeným zdrojovým kódem vyvinutá společností AMD pro lepší kvalitu škálování +nis-description = Technika škálování s otevřeným zdrojovým kódem vyvinutá společností Nvidia jako nezávislá, nenáročná alternativa k jejich proprietárnímu řešení DLSS, což znamená, že funguje na grafických procesorech AMD a Intel a také na GPU Nvidia. + +other-settings = Další nastavení +framerate-limit = FPS limit +unfocused-framerate-limit = FPS limit při nečinosti + +force-grab-cursor = Vynutit uchopení kurzoru +force-grab-cursor-description = Vždy používejte relativní režim myši namísto překlápění v závislosti na viditelnosti kurzoru. Kurzor myši bude ve hře správně vycentrován diff --git a/assets/locales/cs/general.ftl b/assets/locales/cs/general.ftl new file mode 100644 index 00000000..539de646 --- /dev/null +++ b/assets/locales/cs/general.ftl @@ -0,0 +1,70 @@ +appearance = Vzhled +modern = Moderní +classic = Klasický +update-background = Aktualizovat tapetu +update-background-description = Stáhněte si oficiální tapetu pro launcher. Můžete jej zakázat, abyste místo toho použili svůj vlastní obrázek jako tapetu + +launcher-language = Jazyk launcheru +launcher-language-description = Platí po restartu + +game-edition = Verze hry +global = Světová (Global) +china = Čínská (China) + +game-environment = Herní prostředí +game-environment-description = Získejte specifické funkce, jako jsou další platební metody + +game-voiceovers = Herní dabingy +game-voiceovers-description = Seznam stažených dabingů, můžete je přepínat ve hře +english = Anglický +japanese = Japonský +korean = Korejský +chinese = Čínský + +migrate-installation = Přesunout instalaci +migrate-installation-description = Otevřete speciální okno, kde můžete změnit instalační složku hry +repair-game = Opravit hru + +status = Stav + +game-version = Verze hry +game-not-installed = není nainstalována + +game-predownload-available = Je k dispozici předběžné stažení aktualizace hry: {$old} -> {$new} +game-update-available = Aktualizace hry k dispozici: {$old} -> {$new} +game-outdated = Hra je příliš zastaralá a nelze ji aktualizovat. Nejnovější verze: {$latest} + +player-patch-version = Verze patche +player-patch-version-description = Hlavní patch, který vám umožní hrát hru na Linuxu + +patch-not-available = Patch není dostupný +patch-not-available-tooltip = Servery s Patchem nejsou dostupné + +patch-outdated = Zastaralý ({$current}) +patch-outdated-tooltip = Patch je zastaralý: {$current} -> {$latest} + +patch-preparation = Příprava +patch-preparation-tooltip = Patch je ve vývoji + +patch-testing-tooltip = Předběžné vydání patche je dostupné +patch-not-applied-tooltip = Patch není aplikovaný + +apply-main-patch = Aplikovat hlavní patch +apply-main-patch-description = Experimentální. Vypnutím této možnosti vám umožní spustit hru bez použití patche. To nemusí fungovat nebo vyžaduje ruční úpravy souborů. Použijte, pokud víte, co děláte + +disable-mhypbase = Vypnout mhypbase +disable-mhypbase-description = Experimentální. Pokud je povoleno, launcher deaktivuje mhypbase.dll během aplikace hlavního patche, což je v současnosti ekvivalent xlua patch. Zlepšuje výkon a snižuje využití procesoru + +ask-superuser-permissions = Požádat o oprávnění superuživatele +ask-superuser-permissions-description = Launcher je použije k automatické aktualizaci vašeho souboru hostitelů. V edici flatpak to není potřeba + +launcher-behavior = Chování launcheru +launcher-behavior-description = Jak se má launcher chovat když je hra spuštěna + +wine-tools = Nástroje Wine +command-line = Příkazová řádka +registry-editor = Editor registru +explorer = Prohlížeč souborů +task-manager = Správce úloh +configuration = Nastavení +debugger = Debugger diff --git a/assets/locales/cs/main.ftl b/assets/locales/cs/main.ftl new file mode 100644 index 00000000..bf1817f5 --- /dev/null +++ b/assets/locales/cs/main.ftl @@ -0,0 +1,76 @@ +custom = Vlastní +none = Žádný +default = Výchozí +details = Detaily +options = Možnosti + +width = Šířka +height = Výška + +# Menu items + +launcher-folder = Složka launcheru +game-folder = Složka hry +config-file = Konfigurační soubor +debug-file = Debugovací soubor +wish-url = Otevřít přání +about = info + + +close = Zavřít +hide = Schovat +nothing = Nic +save = Uložit +continue = Pokračovat +resume = Obnovit +exit = Opustit +check = Zkontrolovat +restart = Restartovat +agree = Souhlasit + + +loading-data = Načítám data +downloading-background-picture = Stahuji tapetu +updating-components-index = Aktualizuji seznam komponent +loading-game-version = Načítám verzi hry +loading-patch-status = Načítám stav patche +loading-launcher-state = Načítám stav launcheru +loading-launcher-state--game = Načítám stav launcheru: ověřuji verzi hry +loading-launcher-state--voice = Načítám stav launcheru: ověřuji dabing - {$locale} +loading-launcher-state--patch = Načítám stav launcheru: ověřuji nainstalovaný patch + + +checking-free-space = Kontroluji volné místo +downloading = Stahuji +updating-permissions = Aktualizuji oprávnění +unpacking = Rozbaluji +verifying-files = Kontroluji soubory +repairing-files = Opravuji soubory +migrating-folders = Přemisťuji složky +applying-hdiff = Aplikuji hdiff patche +removing-outdated = Odstraňuji staré soubory + + +components-index-updated = Seznam komponent byl aktualizován + + +launch = Hrát +migrate-folders = Přemístit složky +migrate-folders-tooltip = Aktualizovat strukturu složek hry +apply-patch = Aplikovat patch +disable-telemetry = Vypnout telemetrii +download-wine = Stáhnout Wine +create-prefix = Vytvořit Wine prefix +update = Aktualizovat +download = Stáhnout +predownload-update = Předbězně stáhnout aktualizaci {$version} ({$size}) + +kill-game-process = Zabít procesy hry + +main-window--patch-unavailable-tooltip = Opravné servery jsou nedostupné a launcher nemůže ověřit stav oprav hry. Hru smíte spustit pouze na vlastní nebezpečí +main-window--patch-outdated-tooltip = Patch je zastaralý nebo ve stavu přípravy, takže není k dispozici pro použití. Vraťte se později, abyste viděli jeho stav +main-window--version-outdated-tooltip = Verze je příliš zastaralá a nelze ji aktualizovat + +preferences = Nastavení +general = Obecné +enhancements = Vylepšení diff --git a/assets/locales/cs/sandbox.ftl b/assets/locales/cs/sandbox.ftl new file mode 100644 index 00000000..8e9f1681 --- /dev/null +++ b/assets/locales/cs/sandbox.ftl @@ -0,0 +1,28 @@ +sandbox = Sandbox +sandbox-description = Provozovat hru v izolovaném prostředí, zabrání jí v přístupu k vašim osobním údajům + +enable-sandboxing = Povolit sandbox +enable-sandboxing-description = Provozovat hru v kopii vašeho souborového systému + +hide-home-directory = Skrýt domovskou složku +hide-home-directory-description = Izolovat vaše složky /home, /var/home/$USER, a $HOME + +hostname = Hostname +additional-arguments = Další argumenty + +private-directories = Soukromé složky +private-directories-description = Tyto složky budou nahrazeny prázdným virtuálním souborovým systémem (tmpfs) a jejich původní obsah nebude dostupný pro hru v sandboxu + +path = Cesta + +shared-directories = Sdílené složky +shared-directories-description = Tyto adresáře budou symlink s adresáři ve vašem hostitelském systému + +original-path = Původní cesta +new-path = Nová cesta + +read-only = Pouze pro čtení +read-only-description = Neumožnit hře zapisovat do těchto složek + +symlinks = Symlinky +symlinks-description = Vytvoří symlink pro propojení původní cesty s novou v sandboxu diff --git a/src/i18n.rs b/src/i18n.rs index 2d623748..c1153425 100644 --- a/src/i18n.rs +++ b/src/i18n.rs @@ -28,7 +28,8 @@ pub const SUPPORTED_LANGUAGES: &[LanguageIdentifier] = &[ langid!("vi-vn"), langid!("nl-nl"), langid!("uk-ua"), - langid!("th-th") + langid!("th-th"), + langid!("cs-cz") ]; pub static mut LANG: LanguageIdentifier = langid!("en-us"); From d95cfbaf30e7dd53a633f0deb50342b14e1096fe Mon Sep 17 00:00:00 2001 From: Egor Erastov Date: Sat, 6 Apr 2024 21:19:25 +0300 Subject: [PATCH 10/21] fix: wish url --- src/ui/main/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/main/mod.rs b/src/ui/main/mod.rs index 0f157a7d..e5e0123d 100644 --- a/src/ui/main/mod.rs +++ b/src/ui/main/mod.rs @@ -816,7 +816,7 @@ impl SimpleComponent for App { let web_cache = String::from_utf8_lossy(&web_cache); // https://webstatic-sea.[ho-yo-ver-se].com/hkrpg/event/e20211215gacha-v3/index.html?...... - if let Some(url) = web_cache.lines().rev().find(|line| line.contains("gacha-v3/index.html")) { + if let Some(url) = web_cache.lines().rev().find(|line| line.contains("gacha-v2/index.html") || line.contains("gacha-v3/index.html")) { let url_begin_pos = url.find("https://").unwrap(); let url_end_pos = url_begin_pos + url[url_begin_pos..].find("\0\0\0\0").unwrap(); From 1f7dfdb7194e1312871790a1ea5a120d2106fc6c Mon Sep 17 00:00:00 2001 From: Renaud Lepage Date: Sun, 14 Apr 2024 08:51:19 -0700 Subject: [PATCH 11/21] Better labels for the payment processing options --- src/ui/preferences/general/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/preferences/general/mod.rs b/src/ui/preferences/general/mod.rs index c092a758..0561a034 100644 --- a/src/ui/preferences/general/mod.rs +++ b/src/ui/preferences/general/mod.rs @@ -303,8 +303,8 @@ impl SimpleAsyncComponent for GeneralApp { set_subtitle: &tr!("game-environment-description"), set_model: Some(>k::StringList::new(&[ - "PC", - "Android" + "Hoyoverse", + "Google Play" ])), set_selected: match CONFIG.launcher.environment { From 5e64554e04ae0e8785c3cb6d827ed1cae1665a01 Mon Sep 17 00:00:00 2001 From: fautics <117799111+fautics@users.noreply.github.com> Date: Tue, 16 Apr 2024 11:47:57 -0700 Subject: [PATCH 12/21] Update to the maintanted ebuilds --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cba3434..2e78c5c3 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ | Arch Linux, Manjaro | AUR | [link](https://github.com/an-anime-team/an-anime-game-launcher/wiki/Installation#-arch-linux-aur) | [an-anime-game-launcher-bin](https://aur.archlinux.org/packages/an-anime-game-launcher-bin) | | Fedora, OpenSUSE | RPM | [link](https://github.com/an-anime-team/an-anime-game-launcher/wiki/Installation#-fedora-rpm) | [AAGL](https://build.opensuse.org/repositories/home:Maroxy:AAT-Apps/AAGL) | | Ubuntu | pacstall | - | [an-anime-game-launcher-bin](https://pacstall.dev/packages/an-anime-game-launcher-bin) | -| Gentoo | ebuild | [link](https://github.com/an-anime-team/an-anime-game-launcher/wiki/Installation#-gentoo-linux-ebuild) | [aagl-ebuilds](https://github.com/an-anime-team/aagl-ebuilds) | +| Gentoo | ebuild | [link](https://github.com/an-anime-team/an-anime-game-launcher/wiki/Installation#-gentoo-linux-ebuild) | [aagl-ebuilds](https://github.com/an-anime-team/gentoo-ebuilds) | | NixOS | nixpkg | [link](https://github.com/an-anime-team/an-anime-game-launcher/wiki/Installation#-nixos-nixpkg) | [aagl-gtk-on-nix](https://github.com/ezKEa/aagl-gtk-on-nix) | To see the installation guides, please visit the wiki page [here](https://github.com/an-anime-team/an-anime-game-launcher/wiki/Installation) From 07f57f0a646ae6725c229852bfcde5e4d92a6931 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 18:58:51 +0200 Subject: [PATCH 13/21] build: updated SDK version --- Cargo.lock | 250 ++++++++++++++++++++++++++++++++++++++--------------- Cargo.toml | 6 +- 2 files changed, 182 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1657610f..8fcda630 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,8 +57,8 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "anime-game-core" -version = "1.17.5" -source = "git+https://github.com/an-anime-team/anime-game-core?tag=1.17.5#55dd60f6b5f78aa80e2217404c3ee1151657f011" +version = "1.17.7" +source = "git+https://github.com/an-anime-team/anime-game-core?tag=1.17.7#1cbf224beee7ddbcebd9642d7b402be8fb0f3ab0" dependencies = [ "anyhow", "bzip2", @@ -82,8 +82,8 @@ dependencies = [ [[package]] name = "anime-launcher-sdk" -version = "1.12.7" -source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.12.7#f4133c0875af54b07b4c0dac04df4598193ac9ec" +version = "1.12.9" +source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.12.9#e2733ba548409a1c3972cc74213336127df3c698" dependencies = [ "anime-game-core", "anyhow", @@ -155,6 +155,15 @@ dependencies = [ "backtrace", ] +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arc-swap" version = "1.7.1" @@ -357,12 +366,6 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bitflags" version = "1.3.2" @@ -385,7 +388,7 @@ dependencies = [ "arrayvec", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -470,9 +473,9 @@ dependencies = [ [[package]] name = "cached" -version = "0.49.2" +version = "0.51.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f251fd1e72720ca07bf5d8e310f54a193fd053479a1f6342c6663ee4fa01cf96" +checksum = "dd93a9f06ec296ca66b4c26fafa9ed63f32c473d7a708a5f28563ee64c948515" dependencies = [ "ahash", "cached_proc_macro", @@ -485,14 +488,14 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f16c0d84de31a2ab7fdf5f7783c14631f7075cf464eb3bb43119f61c9cb2a" +checksum = "771aa57f3b17da6c8bcacb187bb9ec9bc81c8160e72342e67c329e0e1651a669" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.55", ] [[package]] @@ -567,6 +570,15 @@ dependencies = [ "inout", ] +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -582,12 +594,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -619,6 +625,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.0" @@ -665,9 +686,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -675,29 +696,35 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.55", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.55", ] +[[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + [[package]] name = "deranged" version = "0.3.11" @@ -718,6 +745,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "digest" version = "0.10.7" @@ -928,6 +966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", + "libz-ng-sys", "miniz_oxide", ] @@ -1537,9 +1576,9 @@ dependencies = [ [[package]] name = "human-panic" -version = "1.2.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370" +checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" dependencies = [ "anstream", "anstyle", @@ -1723,6 +1762,16 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libz-ng-sys" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" +dependencies = [ + "cmake", + "libc", +] + [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -1745,6 +1794,16 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "lzma-sys" version = "0.1.20" @@ -1894,6 +1953,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "objc" version = "0.2.7" @@ -2012,17 +2092,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "pathdiff" version = "0.2.1" @@ -2031,14 +2100,12 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] [[package]] @@ -2549,17 +2616,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -2578,6 +2634,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "slab" version = "0.4.9" @@ -2763,9 +2825,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "num-conv", @@ -2933,6 +2995,12 @@ dependencies = [ "rustc-hash", ] +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + [[package]] name = "typenum" version = "1.17.0" @@ -3513,50 +3581,90 @@ dependencies = [ "syn 2.0.55", ] +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "zip" -version = "0.6.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "006d078b7b6fc587bb25e022ad39e7086f44e5c4fef6076964ea601533241beb" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", - "constant_time_eq 0.1.5", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "num_enum", "pbkdf2", + "rand", "sha1", + "thiserror", "time", + "zeroize", + "zopfli", "zstd", ] +[[package]] +name = "zopfli" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" +dependencies = [ + "crc32fast", + "log", + "simd-adler32", + "typed-arena", +] + [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 3be99405..7c308bf3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ glib-build-tools = "0.19" [dependencies.anime-launcher-sdk] git = "https://github.com/an-anime-team/anime-launcher-sdk" -tag = "1.12.7" +tag = "1.12.9" features = ["all", "honkai", "honkai-patch"] # path = "../anime-launcher-sdk" # ! for dev purposes only @@ -36,7 +36,7 @@ whatadistro = "0.1.0" serde_json = "1.0" anyhow = "1.0" lazy_static = "1.4.0" -cached = { version = "0.49", features = ["proc_macro"] } +cached = { version = "0.51", features = ["proc_macro"] } md-5 = { version = "0.10", features = ["asm"] } enum-ordinalize = "4.3" @@ -46,4 +46,4 @@ tracing-subscriber = "0.3" fluent-templates = "0.9" unic-langid = "0.9" -human-panic = "1.2.2" +human-panic = "2.0.0" From d0265192d3208a11db9cdb113e83b50be26aaf1e Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 19:19:27 +0200 Subject: [PATCH 14/21] build: updated dependencies --- Cargo.lock | 250 ++++++++++++++++++++++++++++++++++++++--------------- Cargo.toml | 6 +- 2 files changed, 182 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c508e691..466f4d4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,8 +57,8 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "anime-game-core" -version = "1.17.5" -source = "git+https://github.com/an-anime-team/anime-game-core?tag=1.17.5#55dd60f6b5f78aa80e2217404c3ee1151657f011" +version = "1.17.8" +source = "git+https://github.com/an-anime-team/anime-game-core?tag=1.17.8#8f3c1aecc8d61ae07f00d8af9d56c91f75b54bfb" dependencies = [ "anyhow", "bzip2", @@ -107,8 +107,8 @@ dependencies = [ [[package]] name = "anime-launcher-sdk" -version = "1.12.7" -source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.12.7#f4133c0875af54b07b4c0dac04df4598193ac9ec" +version = "1.12.10" +source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.12.10#56a0d3b0b6ccb1fc5b359f8ff1f281225e122218" dependencies = [ "anime-game-core", "anyhow", @@ -180,6 +180,15 @@ dependencies = [ "backtrace", ] +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arc-swap" version = "1.7.1" @@ -382,12 +391,6 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bitflags" version = "1.3.2" @@ -410,7 +413,7 @@ dependencies = [ "arrayvec", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -495,9 +498,9 @@ dependencies = [ [[package]] name = "cached" -version = "0.49.2" +version = "0.51.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f251fd1e72720ca07bf5d8e310f54a193fd053479a1f6342c6663ee4fa01cf96" +checksum = "dd93a9f06ec296ca66b4c26fafa9ed63f32c473d7a708a5f28563ee64c948515" dependencies = [ "ahash", "cached_proc_macro", @@ -510,14 +513,14 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f16c0d84de31a2ab7fdf5f7783c14631f7075cf464eb3bb43119f61c9cb2a" +checksum = "771aa57f3b17da6c8bcacb187bb9ec9bc81c8160e72342e67c329e0e1651a669" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.55", ] [[package]] @@ -592,6 +595,15 @@ dependencies = [ "inout", ] +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -607,12 +619,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -644,6 +650,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.0" @@ -690,9 +711,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -700,29 +721,35 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.55", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.55", ] +[[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + [[package]] name = "deranged" version = "0.3.11" @@ -743,6 +770,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "digest" version = "0.10.7" @@ -953,6 +991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", + "libz-ng-sys", "miniz_oxide", ] @@ -1537,9 +1576,9 @@ dependencies = [ [[package]] name = "human-panic" -version = "1.2.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370" +checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" dependencies = [ "anstream", "anstyle", @@ -1723,6 +1762,16 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libz-ng-sys" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" +dependencies = [ + "cmake", + "libc", +] + [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -1745,6 +1794,16 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "lzma-sys" version = "0.1.20" @@ -1894,6 +1953,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "objc" version = "0.2.7" @@ -2012,17 +2092,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "pathdiff" version = "0.2.1" @@ -2031,14 +2100,12 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] [[package]] @@ -2549,17 +2616,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -2578,6 +2634,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "slab" version = "0.4.9" @@ -2763,9 +2825,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "num-conv", @@ -2933,6 +2995,12 @@ dependencies = [ "rustc-hash", ] +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + [[package]] name = "typenum" version = "1.17.0" @@ -3513,50 +3581,90 @@ dependencies = [ "syn 2.0.55", ] +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "zip" -version = "0.6.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "006d078b7b6fc587bb25e022ad39e7086f44e5c4fef6076964ea601533241beb" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", - "constant_time_eq 0.1.5", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "num_enum", "pbkdf2", + "rand", "sha1", + "thiserror", "time", + "zeroize", + "zopfli", "zstd", ] +[[package]] +name = "zopfli" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" +dependencies = [ + "crc32fast", + "log", + "simd-adler32", + "typed-arena", +] + [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 2b625a3a..b5b98996 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ glib-build-tools = "0.19" [dependencies.anime-launcher-sdk] git = "https://github.com/an-anime-team/anime-launcher-sdk" -tag = "1.12.7" +tag = "1.12.10" features = ["all", "genshin"] # path = "../anime-launcher-sdk" # ! for dev purposes only @@ -36,7 +36,7 @@ whatadistro = "0.1.0" serde_json = "1.0" anyhow = "1.0" lazy_static = "1.4.0" -cached = { version = "0.49", features = ["proc_macro"] } +cached = { version = "0.51", features = ["proc_macro"] } md-5 = { version = "0.10", features = ["asm"] } enum-ordinalize = "4.3" @@ -46,4 +46,4 @@ tracing-subscriber = "0.3" fluent-templates = "0.9" unic-langid = "0.9" -human-panic = "1.2.2" +human-panic = "2.0.0" From 8e657c869240a337f6840c18ba7fc6e412c5858e Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 19:19:37 +0200 Subject: [PATCH 15/21] refactor: fixed warnings --- src/i18n.rs | 4 ++-- src/ui/first_run/default_paths.rs | 19 ++++++++++--------- src/ui/preferences/enhancements/mod.rs | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/i18n.rs b/src/i18n.rs index 2d623748..ad00a352 100644 --- a/src/i18n.rs +++ b/src/i18n.rs @@ -106,7 +106,7 @@ macro_rules! tr { use fluent_templates::Loader; #[allow(unused_unsafe)] - $crate::i18n::LOCALES.lookup(unsafe { &$crate::i18n::LANG }, $id) + $crate::i18n::LOCALES.lookup(unsafe { $crate::i18n::LANG.as_ref() }, $id) } }; @@ -124,7 +124,7 @@ macro_rules! tr { )* #[allow(unused_unsafe)] - $crate::i18n::LOCALES.lookup_complete(unsafe { &$crate::i18n::LANG }, $id, Some(&args)) + $crate::i18n::LOCALES.lookup_complete(unsafe { $crate::i18n::LANG.as_ref() }, $id, Some(&args)) } }; } diff --git a/src/ui/first_run/default_paths.rs b/src/ui/first_run/default_paths.rs index 3967da2e..76a5077a 100644 --- a/src/ui/first_run/default_paths.rs +++ b/src/ui/first_run/default_paths.rs @@ -344,7 +344,8 @@ impl SimpleAsyncComponent for DefaultPathsApp { self.game_china = result.join(concat!("Yu", "anS", "hen")); self.fps_unlocker = result.join("fps-unlocker"); self.components = result.join("components"); - self.temp = result.clone(); + + self.temp.clone_from(&result); self.launcher = result; } @@ -435,15 +436,15 @@ impl DefaultPathsApp { pub fn update_config(&self) -> anyhow::Result<()> { let mut config = Config::get()?; - config.game.wine.builds = self.runners.clone(); - config.game.dxvk.builds = self.dxvks.clone(); - config.game.wine.prefix = self.prefix.clone(); - config.game.path.global = self.game_global.clone(); - config.game.path.china = self.game_china.clone(); - config.components.path = self.components.clone(); - config.launcher.temp = Some(self.temp.clone()); + config.game.wine.builds.clone_from(&self.runners); + config.game.dxvk.builds.clone_from(&self.dxvks); + config.game.wine.prefix.clone_from(&self.prefix); + config.game.path.global.clone_from(&self.game_global); + config.game.path.china.clone_from(&self.game_china); + config.components.path.clone_from(&self.components); + config.game.enhancements.fps_unlocker.path.clone_from(&self.fps_unlocker); - config.game.enhancements.fps_unlocker.path = self.fps_unlocker.clone(); + config.launcher.temp = Some(self.temp.clone()); Config::update_raw(config) } diff --git a/src/ui/preferences/enhancements/mod.rs b/src/ui/preferences/enhancements/mod.rs index 12b92ef4..e38d149a 100644 --- a/src/ui/preferences/enhancements/mod.rs +++ b/src/ui/preferences/enhancements/mod.rs @@ -754,7 +754,7 @@ impl SimpleAsyncComponent for EnhancementsApp { EnhancementsAppMsg::SetDiscordRpcIcon(index) => { if let Some(icon) = self.discord_rpc_icons.guard().get(index.current_index()) { if let Ok(mut config) = Config::get() { - config.launcher.discord_rpc.icon = icon.name.clone(); + config.launcher.discord_rpc.icon.clone_from(&icon.name); Config::update(config); From c1426be188a88e44dc8e452022df8d9d0867639c Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 19:28:32 +0200 Subject: [PATCH 16/21] revert: reverted !354 Not needed after fixing gtk args --- src/main.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8af25b0c..525fcdff 100644 --- a/src/main.rs +++ b/src/main.rs @@ -241,10 +241,6 @@ fn main() -> anyhow::Result<()> { return Ok(()); } - LauncherState::PredownloadAvailable { .. } if run_game => { - return Err(anyhow::anyhow!("Predownload available. Use --just-run-game to run anyway, or open the UI to download it")); - } - _ => () } } From 3af245306f4dd8f35e4ef8b8b2634d87443b0b49 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 19:36:45 +0200 Subject: [PATCH 17/21] feat: updated changelog and about window --- CHANGELOG.md | 10 ++++++++++ src/ui/about.rs | 27 +++++++++------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1caed13e..3b1642de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- Added 4.6.0 voiceovers sizes +- Added Czech + +### Changed + +- Changed labels for the payment processing options +- Changed one of translator's username + ## [3.9.5] - 24.03.2024 ### Added diff --git a/src/ui/about.rs b/src/ui/about.rs index 28e37efb..e99043b3 100644 --- a/src/ui/about.rs +++ b/src/ui/about.rs @@ -43,11 +43,11 @@ impl SimpleComponent for AboutDialog { set_version: &APP_VERSION, set_developers: &[ - "Nikita Podvirnyy https://github.com/krypt0nn" + "Nikita Podvirnyi https://github.com/krypt0nn" ], add_credit_section: (Some("An Anime Team"), &[ - "Nikita Podvirnyy https://github.com/krypt0nn", + "Nikita Podvirnyi https://github.com/krypt0nn", "Marie Piontek https://github.com/Mar0xy", "Luna Neff https://github.com/lunaneff", "Renaud Lepage https://github.com/cybik", @@ -60,7 +60,7 @@ impl SimpleComponent for AboutDialog { ], set_translator_credits: &[ - "Русский, English — Nikita Podvirnyy https://github.com/krypt0nn", + "Русский, English — Nikita Podvirnyi https://github.com/krypt0nn", "Deutsch — Marie Piontek https://github.com/Mar0xy", "Deutsch — @caem", "Français — @zeGolem https://github.com/zeGolem", @@ -79,7 +79,8 @@ impl SimpleComponent for AboutDialog { "Indonesia — @yumekarisu https://github.com/yumekarisu", "Tiếng Việt — Nguyễn Hữu Chánh https://github.com/Chanhnh", "Українська — Іван Потієнко https://github.com/xxanqw", - "ไทย — @vbrabandt2005 https://github.com/vbrabandt2005" + "ไทย — @vbrabandt2005 https://github.com/vbrabandt2005", + "Čeština — @panmourovaty https://github.com/panmourovaty" ].join("\n"), set_debug_info: &[ @@ -97,25 +98,15 @@ impl SimpleComponent for AboutDialog { "

Added

", "
    ", - "
  • Bundle applications-system-symbolic icon to the app
  • ", - "
  • Added force grab cursor option to the gamescope settings
  • ", - "
  • Added Thai
  • ", - "
  • Added Ukrainian
  • ", + "
  • Added 4.6.0 voiceovers sizes
  • ", + "
  • Added Czech
  • ", "
", "

Changed

", "
    ", - "
  • Update wish url
  • ", - "
  • Updated dependencies
  • ", - "
  • Improved app args parsing
  • ", - "
  • Updated locales
  • ", - "
", - - "

Fixed

", - - "
    ", - "
  • Fixed GtkSwitch UI state representation
  • ", + "
  • Changed labels for the payment processing options
  • ", + "
  • Changed one of translator's username
  • ", "
" ].join("\n"), From 2b01578209ff6f0795759c257f60f7ae2f518e7f Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 19:40:17 +0200 Subject: [PATCH 18/21] ci: added `cmake` package --- .github/workflows/check_source_code.yml | 2 +- .github/workflows/compile_release_build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check_source_code.yml b/.github/workflows/check_source_code.yml index 9397c726..575a4771 100644 --- a/.github/workflows/check_source_code.yml +++ b/.github/workflows/check_source_code.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: | apt update - apt install -y build-essential libgtk-4-dev libadwaita-1-dev git curl + apt install -y build-essential libgtk-4-dev libadwaita-1-dev git curl cmake - uses: dtolnay/rust-toolchain@stable with: diff --git a/.github/workflows/compile_release_build.yml b/.github/workflows/compile_release_build.yml index a70b8c48..80ce2e39 100644 --- a/.github/workflows/compile_release_build.yml +++ b/.github/workflows/compile_release_build.yml @@ -6,7 +6,7 @@ on: paths: [ "src/**" ] release: - types: [published] + types: [ published ] workflow_dispatch: @@ -26,7 +26,7 @@ jobs: - name: Install dependencies run: | apt update - apt install -y build-essential libgtk-4-dev libadwaita-1-dev git curl + apt install -y build-essential libgtk-4-dev libadwaita-1-dev git curl cmake - uses: dtolnay/rust-toolchain@stable with: From 68a68a291a3ede5c8ae3777a8282701c4a0980ab Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 19:44:23 +0200 Subject: [PATCH 19/21] 3.9.6 --- CHANGELOG.md | 5 ++++- Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b1642de..d30e0296 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [3.9.6] - 08.05.2024 + ### Added - Added 4.6.0 voiceovers sizes @@ -477,7 +479,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-[unreleased]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.9.5...next +[unreleased]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.9.6...next +[3.9.6]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.9.5...3.9.6 [3.9.5]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.9.4...3.9.5 [3.9.4]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.9.3...3.9.4 [3.9.3]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.9.2...3.9.3 diff --git a/Cargo.lock b/Cargo.lock index 466f4d4b..b58a872e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "anime-game-launcher" -version = "3.9.5" +version = "3.9.6" dependencies = [ "anime-launcher-sdk", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index b5b98996..73e7fb99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anime-game-launcher" -version = "3.9.5" +version = "3.9.6" description = "Anime Game launcher" authors = ["Nikita Podvirnyy "] homepage = "https://github.com/an-anime-team/an-anime-game-launcher" From 135f2ace099d9a7931161b3644c064ac697cf45f Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 20:06:46 +0200 Subject: [PATCH 20/21] 1.5.5 --- CHANGELOG.md | 5 ++++- Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b65a4c3..c0f45abf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.5.5] - 08.05.2024 + ### Added - Added Czech @@ -271,7 +273,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-[unreleased]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.4...next +[unreleased]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.5...next +[1.5.5]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.4...1.5.5 [1.5.4]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.3...1.5.4 [1.5.3]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.2...1.5.3 [1.5.2]: https://github.com/an-anime-team/the-honkers-railway-launcher/compare/1.5.1...1.5.2 diff --git a/Cargo.lock b/Cargo.lock index d4c97585..43babd22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1503,7 +1503,7 @@ dependencies = [ [[package]] name = "honkers-railway-launcher" -version = "1.5.4" +version = "1.5.5" dependencies = [ "anime-launcher-sdk", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index a1f4a6aa..6dd833b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "honkers-railway-launcher" -version = "1.5.4" +version = "1.5.5" description = "The Honkers Railway launcher" authors = ["Nikita Podvirnyi "] homepage = "https://github.com/an-anime-team/the-honkers-railway-launcher" From 69b216dab7c7efa381be52c259574b9166f093ee Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 May 2024 20:24:23 +0200 Subject: [PATCH 21/21] feat: updated changelog --- CHANGELOG.md | 4 ++++ src/ui/about.rs | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8f23508..ebfa60ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added Czech +### Changed + +- Updated API links + ## [1.6.1] - 24.03.2024 ### Added diff --git a/src/ui/about.rs b/src/ui/about.rs index 4842e25e..bb495e72 100644 --- a/src/ui/about.rs +++ b/src/ui/about.rs @@ -104,6 +104,12 @@ impl SimpleComponent for AboutDialog { "
    ", "
  • Added Czech
  • ", + "
", + + "

Changed

", + + "
    ", + "
  • Updated API links
  • ", "
" ].join("\n"),