aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2024-12-23 20:34:36 +0100
committerGitHub <noreply@github.com>2024-12-23 20:34:36 +0100
commit7c49685027badf3ca768d2d4acdae315b08f1ffb (patch)
treebc45d066817335e1e0f5a7fdd6534cad3ca4daa4
parent253f0f01207d0f058f1535380cd1850e20f2efb9 (diff)
parentc8760eee80f447a5222e7264487e2bce3e30a255 (diff)
downloadFlightCore-feat/change-repair-window-to-tab.tar.gz
FlightCore-feat/change-repair-window-to-tab.zip
Merge branch 'main' into feat/change-repair-window-to-tabfeat/change-repair-window-to-tab
-rw-r--r--.github/workflows/push-test.yml6
-rw-r--r--.gitignore2
-rw-r--r--src-tauri/.gitignore3
-rw-r--r--src-tauri/Cargo.lock103
-rw-r--r--src-tauri/Cargo.toml9
-rw-r--r--src-tauri/bindings/CommitHead.ts2
-rw-r--r--src-tauri/bindings/FlightCoreVersion.ts2
-rw-r--r--src-tauri/bindings/InstallProgress.ts2
-rw-r--r--src-tauri/bindings/InstallState.ts2
-rw-r--r--src-tauri/bindings/InstallType.ts2
-rw-r--r--src-tauri/bindings/NorthstarLaunchOptions.ts2
-rw-r--r--src-tauri/bindings/NorthstarMod.ts2
-rw-r--r--src-tauri/bindings/NorthstarThunderstoreRelease.ts2
-rw-r--r--src-tauri/bindings/NorthstarThunderstoreReleaseWrapper.ts2
-rw-r--r--src-tauri/bindings/Project.ts2
-rw-r--r--src-tauri/bindings/PullRequestType.ts2
-rw-r--r--src-tauri/bindings/PullsApiResponseElement.ts2
-rw-r--r--src-tauri/bindings/ReleaseInfo.ts2
-rw-r--r--src-tauri/bindings/Repo.ts2
-rw-r--r--src-tauri/bindings/Tag.ts2
-rw-r--r--src-tauri/bindings/TagWrapper.ts2
-rw-r--r--src-tauri/bindings/ThunderstoreMod.ts2
-rw-r--r--src-tauri/bindings/ThunderstoreModVersion.ts2
-rw-r--r--src-tauri/src/github/mod.rs2
-rw-r--r--src-tauri/src/mod_management/mod.rs4
-rw-r--r--src-tauri/src/northstar/mod.rs3
-rw-r--r--src-tauri/tauri.conf.json2
-rw-r--r--src-vue/.vscode/extensions.json3
-rw-r--r--src-vue/package-lock.json138
-rw-r--r--src-vue/package.json9
-rw-r--r--src-vue/public/vite.svg1
-rw-r--r--src-vue/src/App.vue2
-rw-r--r--src-vue/src/assets/vue.svg1
-rw-r--r--src-vue/src/i18n/lang/ru.json39
34 files changed, 189 insertions, 174 deletions
diff --git a/.github/workflows/push-test.yml b/.github/workflows/push-test.yml
index 6fd267b1..bea15cab 100644
--- a/.github/workflows/push-test.yml
+++ b/.github/workflows/push-test.yml
@@ -1,5 +1,9 @@
name: "test-on-push"
-on: [push, pull_request]
+on:
+ push:
+ pull_request:
+ schedule:
+ - cron: "0 0 * * 0" # Run weekly to cover rust toolchain updates
jobs:
# Ensure version numbers in various places match up
diff --git a/.gitignore b/.gitignore
index adc2b1c9..37d8f70e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
# Node modules
node_modules/
-# Rust builds
-target/
diff --git a/src-tauri/.gitignore b/src-tauri/.gitignore
new file mode 100644
index 00000000..aba21e24
--- /dev/null
+++ b/src-tauri/.gitignore
@@ -0,0 +1,3 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 1e7eacbc..bf6d8e3a 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -3,12 +3,6 @@
version = 3
[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
-[[package]]
name = "addr2line"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -75,9 +69,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "arboard"
@@ -207,7 +201,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -224,7 +218,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -609,18 +603,18 @@ dependencies = [
[[package]]
name = "const_format"
-version = "0.2.32"
+version = "0.2.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
dependencies = [
"const_format_proc_macros",
]
[[package]]
name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
dependencies = [
"proc-macro2",
"quote",
@@ -789,7 +783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -799,7 +793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
dependencies = [
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -823,7 +817,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -834,7 +828,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -1030,7 +1024,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -1165,7 +1159,7 @@ dependencies = [
[[package]]
name = "flightcore"
-version = "2.24.0"
+version = "2.26.2"
dependencies = [
"anyhow",
"async-recursion",
@@ -1312,7 +1306,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -2845,7 +2839,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -3038,7 +3032,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -3166,7 +3160,7 @@ dependencies = [
"phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -3213,7 +3207,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -3347,9 +3341,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.74"
+version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
dependencies = [
"unicode-ident",
]
@@ -3519,9 +3513,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.5"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@@ -4110,32 +4104,33 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.203"
+version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.203"
+version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
name = "serde_json"
-version = "1.0.120"
+version = "1.0.133"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
dependencies = [
"indexmap 2.2.5",
"itoa 1.0.9",
+ "memchr",
"ryu",
"serde",
]
@@ -4158,7 +4153,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -4207,7 +4202,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -4359,7 +4354,7 @@ dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -4514,9 +4509,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.46"
+version = "2.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
dependencies = [
"proc-macro2",
"quote",
@@ -4544,9 +4539,9 @@ dependencies = [
[[package]]
name = "sysinfo"
-version = "0.30.12"
+version = "0.30.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
dependencies = [
"cfg-if",
"core-foundation-sys",
@@ -4961,7 +4956,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -5057,7 +5052,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -5208,7 +5203,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
]
[[package]]
@@ -5281,24 +5276,24 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "ts-rs"
-version = "8.1.0"
+version = "10.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d3fa4606cdab1e9b668cc65ce2545941d01f52bc27536a195c66c55b91cb84"
+checksum = "3a2f31991cee3dce1ca4f929a8a04fdd11fd8801aac0f2030b0fa8a0a3fef6b9"
dependencies = [
+ "lazy_static",
"thiserror",
"ts-rs-macros",
]
[[package]]
name = "ts-rs-macros"
-version = "8.1.0"
+version = "10.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86ae36cbb2d58b86677ad413054feeb0712e382e822131cf9a4a1e580c419b5"
+checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e"
dependencies = [
- "Inflector",
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
"termcolor",
]
@@ -5531,7 +5526,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
"wasm-bindgen-shared",
]
@@ -5565,7 +5560,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.46",
+ "syn 2.0.90",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 210c76b8..5edc3e3d 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,13 +1,12 @@
[package]
name = "flightcore"
-version = "2.24.0"
+version = "2.26.2"
description = "Mod-manager for Northstar"
authors = ["https://github.com/R2NorthstarTools/FlightCore/graphs/contributors"]
license = "MIT"
repository = "https://github.com/R2NorthstarTools/FlightCore"
default-run = "flightcore"
edition = "2021"
-rust-version = "1.66"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -39,7 +38,7 @@ zip = "0.6.2"
# Regex
regex = "1.10"
# Read out running application process names
-sysinfo = "0.30.12"
+sysinfo = "0.30.13"
# HTTP requests
reqwest = { version = "0.11", features = ["blocking"] }
# Persistent store for settings
@@ -51,9 +50,9 @@ async-recursion = "1.1.1"
# For parsing timestamps
chrono = "0.4.38"
# TypeScript bindings
-ts-rs = "8.1"
+ts-rs = "10.0"
# const formatting
-const_format = "0.2.32"
+const_format = "0.2.33"
# Logging libraries
pretty_env_logger = "0.5.0"
log = "0.4"
diff --git a/src-tauri/bindings/CommitHead.ts b/src-tauri/bindings/CommitHead.ts
index 7c4da020..cdc00e39 100644
--- a/src-tauri/bindings/CommitHead.ts
+++ b/src-tauri/bindings/CommitHead.ts
@@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { Repo } from "./Repo";
-export type CommitHead = { sha: string, ref: string, repo: Repo, }; \ No newline at end of file
+export type CommitHead = { sha: string, ref: string, repo: Repo, };
diff --git a/src-tauri/bindings/FlightCoreVersion.ts b/src-tauri/bindings/FlightCoreVersion.ts
index 6c0af915..b0b3d0cd 100644
--- a/src-tauri/bindings/FlightCoreVersion.ts
+++ b/src-tauri/bindings/FlightCoreVersion.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type FlightCoreVersion = { tag_name: string, published_at: string, }; \ No newline at end of file
+export type FlightCoreVersion = { tag_name: string, published_at: string, };
diff --git a/src-tauri/bindings/InstallProgress.ts b/src-tauri/bindings/InstallProgress.ts
index 234f3c35..c7c92542 100644
--- a/src-tauri/bindings/InstallProgress.ts
+++ b/src-tauri/bindings/InstallProgress.ts
@@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { InstallState } from "./InstallState";
-export type InstallProgress = { current_downloaded: bigint, total_size: bigint, state: InstallState, }; \ No newline at end of file
+export type InstallProgress = { current_downloaded: bigint, total_size: bigint, state: InstallState, };
diff --git a/src-tauri/bindings/InstallState.ts b/src-tauri/bindings/InstallState.ts
index 553aa53b..d2a91860 100644
--- a/src-tauri/bindings/InstallState.ts
+++ b/src-tauri/bindings/InstallState.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type InstallState = "Downloading" | "Extracting" | "Done"; \ No newline at end of file
+export type InstallState = "Downloading" | "Extracting" | "Done";
diff --git a/src-tauri/bindings/InstallType.ts b/src-tauri/bindings/InstallType.ts
index 094ccf8b..6ad43cb7 100644
--- a/src-tauri/bindings/InstallType.ts
+++ b/src-tauri/bindings/InstallType.ts
@@ -3,4 +3,4 @@
/**
* Defines how Titanfall2 was installed (Steam, Origin, ...)
*/
-export type InstallType = "STEAM" | "ORIGIN" | "EAPLAY" | "UNKNOWN"; \ No newline at end of file
+export type InstallType = "STEAM" | "ORIGIN" | "EAPLAY" | "UNKNOWN";
diff --git a/src-tauri/bindings/NorthstarLaunchOptions.ts b/src-tauri/bindings/NorthstarLaunchOptions.ts
index fc977f68..6133f6c0 100644
--- a/src-tauri/bindings/NorthstarLaunchOptions.ts
+++ b/src-tauri/bindings/NorthstarLaunchOptions.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type NorthstarLaunchOptions = { launch_via_steam: boolean, bypass_checks: boolean, }; \ No newline at end of file
+export type NorthstarLaunchOptions = { launch_via_steam: boolean, bypass_checks: boolean, };
diff --git a/src-tauri/bindings/NorthstarMod.ts b/src-tauri/bindings/NorthstarMod.ts
index 1643778d..cddd97d2 100644
--- a/src-tauri/bindings/NorthstarMod.ts
+++ b/src-tauri/bindings/NorthstarMod.ts
@@ -3,4 +3,4 @@
/**
* Object holding various information about a Northstar mod
*/
-export type NorthstarMod = { name: string, version: string | null, thunderstore_mod_string: string | null, enabled: boolean, directory: string, }; \ No newline at end of file
+export type NorthstarMod = { name: string, version: string | null, thunderstore_mod_string: string | null, enabled: boolean, directory: string, };
diff --git a/src-tauri/bindings/NorthstarThunderstoreRelease.ts b/src-tauri/bindings/NorthstarThunderstoreRelease.ts
index 771ca732..10991793 100644
--- a/src-tauri/bindings/NorthstarThunderstoreRelease.ts
+++ b/src-tauri/bindings/NorthstarThunderstoreRelease.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type NorthstarThunderstoreRelease = { package: string, version: string, }; \ No newline at end of file
+export type NorthstarThunderstoreRelease = { package: string, version: string, };
diff --git a/src-tauri/bindings/NorthstarThunderstoreReleaseWrapper.ts b/src-tauri/bindings/NorthstarThunderstoreReleaseWrapper.ts
index 8551dde6..1da6a7da 100644
--- a/src-tauri/bindings/NorthstarThunderstoreReleaseWrapper.ts
+++ b/src-tauri/bindings/NorthstarThunderstoreReleaseWrapper.ts
@@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { NorthstarThunderstoreRelease } from "./NorthstarThunderstoreRelease";
-export type NorthstarThunderstoreReleaseWrapper = { label: string, value: NorthstarThunderstoreRelease, }; \ No newline at end of file
+export type NorthstarThunderstoreReleaseWrapper = { label: string, value: NorthstarThunderstoreRelease, };
diff --git a/src-tauri/bindings/Project.ts b/src-tauri/bindings/Project.ts
index a0f00bb8..5ab3c2b5 100644
--- a/src-tauri/bindings/Project.ts
+++ b/src-tauri/bindings/Project.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type Project = "FlightCore" | "Northstar"; \ No newline at end of file
+export type Project = "FlightCore" | "Northstar";
diff --git a/src-tauri/bindings/PullRequestType.ts b/src-tauri/bindings/PullRequestType.ts
index 582f831a..fdadddb0 100644
--- a/src-tauri/bindings/PullRequestType.ts
+++ b/src-tauri/bindings/PullRequestType.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type PullRequestType = "Mods" | "Launcher"; \ No newline at end of file
+export type PullRequestType = "Mods" | "Launcher";
diff --git a/src-tauri/bindings/PullsApiResponseElement.ts b/src-tauri/bindings/PullsApiResponseElement.ts
index 2db93fe2..c9a146d4 100644
--- a/src-tauri/bindings/PullsApiResponseElement.ts
+++ b/src-tauri/bindings/PullsApiResponseElement.ts
@@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { CommitHead } from "./CommitHead";
-export type PullsApiResponseElement = { number: bigint, title: string, url: string, head: CommitHead, html_url: string, labels: Array<string>, }; \ No newline at end of file
+export type PullsApiResponseElement = { number: bigint, title: string, url: string, head: CommitHead, html_url: string, labels: Array<string>, };
diff --git a/src-tauri/bindings/ReleaseInfo.ts b/src-tauri/bindings/ReleaseInfo.ts
index 78426273..09a39ba5 100644
--- a/src-tauri/bindings/ReleaseInfo.ts
+++ b/src-tauri/bindings/ReleaseInfo.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type ReleaseInfo = { name: string, published_at: string, body: string, }; \ No newline at end of file
+export type ReleaseInfo = { name: string, published_at: string, body: string, };
diff --git a/src-tauri/bindings/Repo.ts b/src-tauri/bindings/Repo.ts
index eade8cd4..8430eb32 100644
--- a/src-tauri/bindings/Repo.ts
+++ b/src-tauri/bindings/Repo.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type Repo = { full_name: string, }; \ No newline at end of file
+export type Repo = { full_name: string, };
diff --git a/src-tauri/bindings/Tag.ts b/src-tauri/bindings/Tag.ts
index 00ff5225..f51b3f26 100644
--- a/src-tauri/bindings/Tag.ts
+++ b/src-tauri/bindings/Tag.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type Tag = { name: string, }; \ No newline at end of file
+export type Tag = { name: string, };
diff --git a/src-tauri/bindings/TagWrapper.ts b/src-tauri/bindings/TagWrapper.ts
index ea7f0bcd..d2f0009d 100644
--- a/src-tauri/bindings/TagWrapper.ts
+++ b/src-tauri/bindings/TagWrapper.ts
@@ -4,4 +4,4 @@ import type { Tag } from "./Tag";
/**
* Wrapper type needed for frontend
*/
-export type TagWrapper = { label: string, value: Tag, }; \ No newline at end of file
+export type TagWrapper = { label: string, value: Tag, };
diff --git a/src-tauri/bindings/ThunderstoreMod.ts b/src-tauri/bindings/ThunderstoreMod.ts
index a421334b..88eafa4c 100644
--- a/src-tauri/bindings/ThunderstoreMod.ts
+++ b/src-tauri/bindings/ThunderstoreMod.ts
@@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { ThunderstoreModVersion } from "./ThunderstoreModVersion";
-export type ThunderstoreMod = { name: string, full_name: string, owner: string, package_url: string, date_created: string, date_updated: string, uuid4: string, rating_score: number, is_pinned: boolean, is_deprecated: boolean, has_nsfw_content: boolean, categories: Array<string>, versions: Array<ThunderstoreModVersion>, }; \ No newline at end of file
+export type ThunderstoreMod = { name: string, full_name: string, owner: string, package_url: string, date_created: string, date_updated: string, uuid4: string, rating_score: number, is_pinned: boolean, is_deprecated: boolean, has_nsfw_content: boolean, categories: Array<string>, versions: Array<ThunderstoreModVersion>, };
diff --git a/src-tauri/bindings/ThunderstoreModVersion.ts b/src-tauri/bindings/ThunderstoreModVersion.ts
index a20f776f..b01af408 100644
--- a/src-tauri/bindings/ThunderstoreModVersion.ts
+++ b/src-tauri/bindings/ThunderstoreModVersion.ts
@@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type ThunderstoreModVersion = { name: string, full_name: string, description: string, icon: string, version_number: string, dependencies: Array<string>, download_url: string, downloads: number, date_created: string, website_url: string, is_active: boolean, uuid4: string, file_size: bigint, }; \ No newline at end of file
+export type ThunderstoreModVersion = { name: string, full_name: string, description: string, icon: string, version_number: string, dependencies: Array<string>, download_url: string, downloads: number, date_created: string, website_url: string, is_active: boolean, uuid4: string, file_size: bigint, };
diff --git a/src-tauri/src/github/mod.rs b/src-tauri/src/github/mod.rs
index 343d041a..9bc3f834 100644
--- a/src-tauri/src/github/mod.rs
+++ b/src-tauri/src/github/mod.rs
@@ -279,7 +279,7 @@ pub fn compare_tags_northstar(first_tag: Tag, second_tag: Tag) -> Result<String,
// Convert the set to a sorted vector.
let mut sorted_vec: Vec<String> = authors_set.into_iter().collect();
- sorted_vec.sort();
+ sorted_vec.sort_by_key(|a| a.to_lowercase());
// Define a string to prepend to each element.
let prefix = "@";
diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index 2a018920..52ef1180 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -244,8 +244,8 @@ pub fn parse_mods_in_package(
// Get list of folders in `mods` directory
for path in paths {
- let my_path = path.unwrap().path();
- let md = std::fs::metadata(my_path.clone()).unwrap();
+ let my_path = path?.path();
+ let md = std::fs::metadata(my_path.clone())?;
if md.is_dir() {
directories.push(my_path);
}
diff --git a/src-tauri/src/northstar/mod.rs b/src-tauri/src/northstar/mod.rs
index 4b16f701..9953d742 100644
--- a/src-tauri/src/northstar/mod.rs
+++ b/src-tauri/src/northstar/mod.rs
@@ -214,10 +214,11 @@ pub fn launch_northstar(
let ns_exe_path = format!("{}/NorthstarLauncher.exe", game_install.game_path);
let ns_profile_arg = format!("-profile={}", game_install.profile);
- let _output = std::process::Command::new("C:\\Windows\\System32\\cmd.exe")
+ let mut output = std::process::Command::new("C:\\Windows\\System32\\cmd.exe")
.args(["/C", "start", "", &ns_exe_path, &ns_profile_arg])
.spawn()
.expect("failed to execute process");
+ output.wait().expect("failed waiting on child process");
return Ok("Launched game".to_string());
}
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 182c907d..30dbdfcb 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
},
"package": {
"productName": "FlightCore",
- "version": "2.24.0"
+ "version": "2.26.2"
},
"tauri": {
"allowlist": {
diff --git a/src-vue/.vscode/extensions.json b/src-vue/.vscode/extensions.json
deleted file mode 100644
index a7cea0b0..00000000
--- a/src-vue/.vscode/extensions.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "recommendations": ["Vue.volar"]
-}
diff --git a/src-vue/package-lock.json b/src-vue/package-lock.json
index ac8e6fda..b67fa7d8 100644
--- a/src-vue/package-lock.json
+++ b/src-vue/package-lock.json
@@ -10,19 +10,18 @@
"dependencies": {
"@element-plus/icons-vue": "^2.0.9",
"element-plus": "^2.7.8",
- "marked": "^13.0.2",
+ "marked": "^14.1.3",
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
"vue": "^3.4.35",
"vue-i18n": "^9.13.1",
- "vue-router": "^4.4.2",
+ "vue-router": "^4.4.3",
"vuex": "^4.0.2"
},
"devDependencies": {
- "@types/marked": "^6.0.0",
"@vitejs/plugin-vue": "^3.1.0",
- "typescript": "^5.5.4",
+ "typescript": "^5.6.3",
"vite": "^3.1.0",
- "vue-tsc": "^2.0.29"
+ "vue-tsc": "^2.1.10"
}
},
"node_modules/@babel/helper-string-parser": {
@@ -221,16 +220,6 @@
"@types/lodash": "*"
}
},
- "node_modules/@types/marked": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/@types/marked/-/marked-6.0.0.tgz",
- "integrity": "sha512-jmjpa4BwUsmhxcfsgUit/7A9KbrC48Q0q8KvnY107ogcjGgTFDlIL3RpihNpx2Mu1hM4mdFQjoVc4O6JoGKHsA==",
- "deprecated": "This is a stub types definition. marked provides its own type definitions, so you do not need this installed.",
- "dev": true,
- "dependencies": {
- "marked": "*"
- }
- },
"node_modules/@types/web-bluetooth": {
"version": "0.0.16",
"resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
@@ -250,27 +239,27 @@
}
},
"node_modules/@volar/language-core": {
- "version": "2.4.0-alpha.18",
- "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz",
- "integrity": "sha512-JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg==",
+ "version": "2.4.8",
+ "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.8.tgz",
+ "integrity": "sha512-K/GxMOXGq997bO00cdFhTNuR85xPxj0BEEAy+BaqqayTmy9Tmhfgmq2wpJcVspRhcwfgPoE2/mEJa26emUhG/g==",
"dev": true,
"dependencies": {
- "@volar/source-map": "2.4.0-alpha.18"
+ "@volar/source-map": "2.4.8"
}
},
"node_modules/@volar/source-map": {
- "version": "2.4.0-alpha.18",
- "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz",
- "integrity": "sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==",
+ "version": "2.4.8",
+ "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.8.tgz",
+ "integrity": "sha512-jeWJBkC/WivdelMwxKkpFL811uH/jJ1kVxa+c7OvG48DXc3VrP7pplSWPP2W1dLMqBxD+awRlg55FQQfiup4cA==",
"dev": true
},
"node_modules/@volar/typescript": {
- "version": "2.4.0-alpha.18",
- "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.18.tgz",
- "integrity": "sha512-sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ==",
+ "version": "2.4.8",
+ "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.8.tgz",
+ "integrity": "sha512-6xkIYJ5xxghVBhVywMoPMidDDAFT1OoQeXwa27HSgJ6AiIKRe61RXLoik+14Z7r0JvnblXVsjsRLmCr42SGzqg==",
"dev": true,
"dependencies": {
- "@volar/language-core": "2.4.0-alpha.18",
+ "@volar/language-core": "2.4.8",
"path-browserify": "^1.0.1",
"vscode-uri": "^3.0.8"
}
@@ -337,16 +326,16 @@
"integrity": "sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw=="
},
"node_modules/@vue/language-core": {
- "version": "2.0.29",
- "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.29.tgz",
- "integrity": "sha512-o2qz9JPjhdoVj8D2+9bDXbaI4q2uZTHQA/dbyZT4Bj1FR9viZxDJnLcKVHfxdn6wsOzRgpqIzJEEmSSvgMvDTQ==",
+ "version": "2.1.10",
+ "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.10.tgz",
+ "integrity": "sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==",
"dev": true,
"dependencies": {
- "@volar/language-core": "~2.4.0-alpha.18",
- "@vue/compiler-dom": "^3.4.0",
+ "@volar/language-core": "~2.4.8",
+ "@vue/compiler-dom": "^3.5.0",
"@vue/compiler-vue2": "^2.7.16",
- "@vue/shared": "^3.4.0",
- "computeds": "^0.0.1",
+ "@vue/shared": "^3.5.0",
+ "alien-signals": "^0.2.0",
"minimatch": "^9.0.3",
"muggle-string": "^0.4.1",
"path-browserify": "^1.0.1"
@@ -360,6 +349,35 @@
}
}
},
+ "node_modules/@vue/language-core/node_modules/@vue/compiler-core": {
+ "version": "3.5.12",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.12.tgz",
+ "integrity": "sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/parser": "^7.25.3",
+ "@vue/shared": "3.5.12",
+ "entities": "^4.5.0",
+ "estree-walker": "^2.0.2",
+ "source-map-js": "^1.2.0"
+ }
+ },
+ "node_modules/@vue/language-core/node_modules/@vue/compiler-dom": {
+ "version": "3.5.12",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.12.tgz",
+ "integrity": "sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==",
+ "dev": true,
+ "dependencies": {
+ "@vue/compiler-core": "3.5.12",
+ "@vue/shared": "3.5.12"
+ }
+ },
+ "node_modules/@vue/language-core/node_modules/@vue/shared": {
+ "version": "3.5.12",
+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.12.tgz",
+ "integrity": "sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==",
+ "dev": true
+ },
"node_modules/@vue/reactivity": {
"version": "3.4.35",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.35.tgz",
@@ -488,6 +506,12 @@
}
}
},
+ "node_modules/alien-signals": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.2.0.tgz",
+ "integrity": "sha512-StlonZhBBrsPPwrDjiPAiVTf/rolxffLxVPT60Qv/t88BZ81BvUVzHgGqEFvJ1ii8HXtm1+zU2Icr59tfWEcag==",
+ "dev": true
+ },
"node_modules/async-validator": {
"version": "4.2.5",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz",
@@ -508,12 +532,6 @@
"balanced-match": "^1.0.0"
}
},
- "node_modules/computeds": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/computeds/-/computeds-0.0.1.tgz",
- "integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==",
- "dev": true
- },
"node_modules/csstype": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -1027,9 +1045,9 @@
}
},
"node_modules/marked": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/marked/-/marked-13.0.2.tgz",
- "integrity": "sha512-J6CPjP8pS5sgrRqxVRvkCIkZ6MFdRIjDkwUwgJ9nL2fbmM6qGQeB2C16hi8Cc9BOzj6xXzy0jyi0iPIfnMHYzA==",
+ "version": "14.1.3",
+ "resolved": "https://registry.npmjs.org/marked/-/marked-14.1.3.tgz",
+ "integrity": "sha512-ZibJqTULGlt9g5k4VMARAktMAjXoVnnr+Y3aCqW1oDftcV4BA3UmrBifzXoZyenHRk75csiPu9iwsTj4VNBT0g==",
"bin": {
"marked": "bin/marked.js"
},
@@ -1147,10 +1165,11 @@
}
},
"node_modules/rollup": {
- "version": "2.79.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
- "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+ "version": "2.79.2",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
+ "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
"dev": true,
+ "license": "MIT",
"bin": {
"rollup": "dist/bin/rollup"
},
@@ -1213,9 +1232,9 @@
}
},
"node_modules/typescript": {
- "version": "5.5.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
- "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+ "version": "5.6.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
"devOptional": true,
"bin": {
"tsc": "bin/tsc",
@@ -1226,10 +1245,11 @@
}
},
"node_modules/vite": {
- "version": "3.2.8",
- "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.8.tgz",
- "integrity": "sha512-EtQU16PLIJpAZol2cTLttNP1mX6L0SyI0pgQB1VOoWeQnMSvtiwovV3D6NcjN8CZQWWyESD2v5NGnpz5RvgOZA==",
+ "version": "3.2.11",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.11.tgz",
+ "integrity": "sha512-K/jGKL/PgbIgKCiJo5QbASQhFiV02X9Jh+Qq0AKCRCRKZtOTVi4t6wh75FDpGf2N9rYOnzH87OEFQNaFy6pdxQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"esbuild": "^0.15.9",
"postcss": "^8.4.18",
@@ -1320,9 +1340,9 @@
}
},
"node_modules/vue-router": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.2.tgz",
- "integrity": "sha512-1qNybkn2L7QsLzaXs8nvlQmRKp8XF8DCxZys/Jr1JpQcHsKUxTKzTxCVA1G7NfBfwRIBgCJPoujOG5lHCCNUxw==",
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.3.tgz",
+ "integrity": "sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A==",
"dependencies": {
"@vue/devtools-api": "^6.6.3"
},
@@ -1334,13 +1354,13 @@
}
},
"node_modules/vue-tsc": {
- "version": "2.0.29",
- "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.29.tgz",
- "integrity": "sha512-MHhsfyxO3mYShZCGYNziSbc63x7cQ5g9kvijV7dRe1TTXBRLxXyL0FnXWpUF1xII2mJ86mwYpYsUmMwkmerq7Q==",
+ "version": "2.1.10",
+ "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.1.10.tgz",
+ "integrity": "sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==",
"dev": true,
"dependencies": {
- "@volar/typescript": "~2.4.0-alpha.18",
- "@vue/language-core": "2.0.29",
+ "@volar/typescript": "~2.4.8",
+ "@vue/language-core": "2.1.10",
"semver": "^7.5.4"
},
"bin": {
diff --git a/src-vue/package.json b/src-vue/package.json
index dcd81c12..be8d155f 100644
--- a/src-vue/package.json
+++ b/src-vue/package.json
@@ -11,18 +11,17 @@
"dependencies": {
"@element-plus/icons-vue": "^2.0.9",
"element-plus": "^2.7.8",
- "marked": "^13.0.2",
+ "marked": "^14.1.3",
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
"vue": "^3.4.35",
"vue-i18n": "^9.13.1",
- "vue-router": "^4.4.2",
+ "vue-router": "^4.4.3",
"vuex": "^4.0.2"
},
"devDependencies": {
- "@types/marked": "^6.0.0",
"@vitejs/plugin-vue": "^3.1.0",
- "typescript": "^5.5.4",
+ "typescript": "^5.6.3",
"vite": "^3.1.0",
- "vue-tsc": "^2.0.29"
+ "vue-tsc": "^2.1.10"
}
}
diff --git a/src-vue/public/vite.svg b/src-vue/public/vite.svg
deleted file mode 100644
index e7b8dfb1..00000000
--- a/src-vue/public/vite.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg> \ No newline at end of file
diff --git a/src-vue/src/App.vue b/src-vue/src/App.vue
index 3a1eec8d..a73c8bac 100644
--- a/src-vue/src/App.vue
+++ b/src-vue/src/App.vue
@@ -67,8 +67,8 @@ export default {
data-tauri-drag-region
>
<el-menu-item index="/">{{ $t('menu.play') }}</el-menu-item>
- <el-menu-item index="/changelog">{{ $t('menu.changelog') }}</el-menu-item>
<el-menu-item index="/mods">{{ $t('menu.mods') }}</el-menu-item>
+ <el-menu-item index="/changelog">{{ $t('menu.changelog') }}</el-menu-item>
<el-menu-item index="/settings">{{ $t('menu.settings') }}</el-menu-item>
<el-menu-item index="/repair" v-if="$store.state.repair_view_visible">{{ $t('menu.repair') }}</el-menu-item>
<el-menu-item index="/dev" v-if="$store.state.developer_mode">{{ $t('menu.dev') }}</el-menu-item>
diff --git a/src-vue/src/assets/vue.svg b/src-vue/src/assets/vue.svg
deleted file mode 100644
index 770e9d33..00000000
--- a/src-vue/src/assets/vue.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg> \ No newline at end of file
diff --git a/src-vue/src/i18n/lang/ru.json b/src-vue/src/i18n/lang/ru.json
index 6a0331f1..b0261299 100644
--- a/src-vue/src/i18n/lang/ru.json
+++ b/src-vue/src/i18n/lang/ru.json
@@ -32,7 +32,7 @@
"players": "игроков",
"servers": "серверов",
"unable_to_load_playercount": "Не можем загрузить количество игроков",
- "northstar_running": "Нордстар запущен:",
+ "northstar_running": "Northstar запущен:",
"ea_app_running": "EA App запущен:",
"see_patch_notes": "просмотреть список изменений"
},
@@ -40,13 +40,13 @@
"local": {
"delete_confirm": "Вы уверены, что хотите удалить этот мод?",
"delete": "Удалить",
- "success_deleting": "Успешно удалено {modName}",
+ "success_deleting": "{modName} Успешно удален",
"no_mods": "Моды не найдены.",
- "part_of_ts_mod": "Этот мод Нордстара является частью мода на Thunderstore"
+ "part_of_ts_mod": "Этот мод Northstar является частью мода на Thunderstore"
},
"online": {
"no_match": "Не найдено совпадающих модов.",
- "try_another_search": "Попробуйте еще поиск!"
+ "try_another_search": "Попробуйте другой запрос!"
},
"menu": {
"online": "Онлайн",
@@ -59,7 +59,7 @@
"date_asc": "По дате (со старейшего)",
"date_desc": "По дате (с новейшего)",
"top_rated": "Самый популярный",
- "most_downloaded": "Самый загруженный"
+ "most_downloaded": "Самый загружаемый"
},
"local": "Установленные",
"select_categories": "Выбрать категории"
@@ -68,7 +68,7 @@
"button": {
"being_installed": "Установка...",
"being_updated": "Обновление...",
- "installed": "Установлено",
+ "installed": "Установлен",
"install": "Установить",
"outdated": "Обновить"
},
@@ -76,9 +76,9 @@
"remove": "Удалить мод",
"remove_dialog_title": "Внимание",
"remove_dialog_text": "Удалить мод Thunderstore?",
- "remove_success": "Удален {modName}",
+ "remove_success": "{modName} Удален",
"more_info": "Подробнее",
- "install_success": "Установлен {modName}"
+ "install_success": "{modName} Установлен"
}
},
"settings": {
@@ -92,23 +92,23 @@
"enable_test_channels": "Включить каналы с тестовыми релизами",
"dev_mode_enabled_title": "Осторожно!",
"repair": {
- "open_window": "Открыть окно починки",
+ "open_window": "Открыть окно фиксов",
"window": {
- "title": "Окно починки FlightCore",
- "force_reinstall_ns": "Принудительно переустановить Нордстар",
+ "title": "Окно фиксов FlightCore",
+ "force_reinstall_ns": "Принудительно переустановить Northstar",
"delete_persistent_store": "Удалить постоянное хранилище FlightCore",
- "reinstall_title": "Принудительно переустанавливаем Нордстар",
+ "reinstall_title": "Принудительно переустанавливаем Northstar",
"reinstall_text": "Пожалуйста, подождите",
"disable_all_but_core_success": "Выключены все моды кроме главных",
"disable_all_but_core": "Выключить все моды, кроме главных",
"warning": "Это окно содержит различные функции для устранения часто возникающих проблем с Northstar и FlightCore.",
"force_delete_temp_dl": "Принудительно удалить папку с временными загрузками",
- "reinstall_success": "Нордстар успешно переустановлен",
+ "reinstall_success": "Northstar успешно переустановлен",
"disable_modsettings": "Выключить мод ModSettings",
"disable_modsettings_success": "Выключен мод ModSettings",
"kill_northstar_process": "Закрыть запущенный Northstar/Titanfall 2"
},
- "title": "Починка"
+ "title": "Фиксы"
},
"nb_ts_mods_per_page_desc1": "Это влияет на производительность при просмотре модов с Thunderstore.",
"about": "Информация:",
@@ -126,11 +126,12 @@
"title": "Профили",
"clone": "Копировать",
"delete": "Удалить",
- "delete_confirm": "Вы уверены, что удалите этот профиль?",
+ "delete_confirm": "Вы уверены, что хотите удалить этот профиль?",
"new_profile_name": "Введите новое имя профиля",
"create_empty": "Новый профиль"
}
- }
+ },
+ "show_nsfw_mods": "Показывать NSFW-моды с Thunderstore"
},
"notification": {
"game_folder": {
@@ -159,7 +160,7 @@
},
"no_new": {
"text": "Смотреть здесь нечего!",
- "title": "Актуальный"
+ "title": "Нет уведомлений"
},
"date_prefix": "в"
},
@@ -170,8 +171,8 @@
}
},
"names": {
- "Northstar": "Нордстар",
- "NorthstarReleaseCandidate": "Релизный кандидат Нордстар"
+ "Northstar": "Northstar",
+ "NorthstarReleaseCandidate": "Пре-релизная версия Northstar"
}
}
}