Merge branch 'steam-beta'

Raphiiko · Mar 29, 2024 · 9f798f9 · 9f798f9
2 parents efe14a6 + 3a04ed6
commit 9f798f9
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.12.0]
 
+## [1.12.0]
+
 ### Added
 
 - Show SteamVR device roles instead of serial numbers in the device list, when available. (by [góngo](https://github.com/TheMrGong))

diff --git a/docs/readmes/generated/STEAM_STORE_CN.json b/docs/readmes/generated/STEAM_STORE_CN.json
diff --git a/docs/readmes/generated/STEAM_STORE_EN.json b/docs/readmes/generated/STEAM_STORE_EN.json
diff --git a/docs/readmes/generated/STEAM_STORE_ID.json b/docs/readmes/generated/STEAM_STORE_ID.json
diff --git a/docs/readmes/generated/STEAM_STORE_JA.json b/docs/readmes/generated/STEAM_STORE_JA.json
diff --git a/docs/readmes/generated/STEAM_STORE_KO.json b/docs/readmes/generated/STEAM_STORE_KO.json
diff --git a/docs/readmes/generated/STEAM_STORE_RU.json b/docs/readmes/generated/STEAM_STORE_RU.json
diff --git a/docs/readmes/generated/STEAM_STORE_TW.json b/docs/readmes/generated/STEAM_STORE_TW.json
diff --git a/docs/readmes/src/steam_description_template.txt b/docs/readmes/src/steam_description_template.txt
@@ -36,16 +36,24 @@
 [h2]{{BRIGHTNESS_AUTOMATIONS_HEADER}}[/h2]
 {{BRIGHTNESS_AUTOMATIONS_BODY}}
 
-[h2]{{SYSTEM_MICROPHONE_MUTE_AUTOMATIONS_HEADER}}[/h2]
+[h2]{{MICROPHONE_MUTE_AUTOMATIONS_HEADER}}[/h2]
 {{SYSTEM_MICROPHONE_MUTE_AUTOMATIONS_BODY}}
 
+{{VRCHAT_MICROPHONE_MUTE_AUTOMATIONS_BODY}}
+
+[h2]{{AUDIO_VOLUME_AUTOMATIONS_HEADER}}[/h2]
+{{AUDIO_VOLUME_AUTOMATIONS_BODY}}
+
 [h2]{{HEART_RATE_AUTOMATIONS_HEADER}}[/h2]
 {{HEART_RATE_AUTOMATIONS_INTRO}}
 
 {{HEART_RATE_AUTOMATIONS_BODY_SLEEP_DETECTION}}
 
 {{HEART_RATE_AUTOMATIONS_BODY_NIGHTMARE_DETECTION}}
 
+[h2]{{HMD_SPECIFIC_AUTOMATIONS_HEADER}}[/h2]
+{{HMD_SPECIFIC_AUTOMATIONS_BODY}}
+
 [h2]{{RESOLUTION_AUTOMATIONS_HEADER}}[/h2]
 {{RESOLUTION_AUTOMATIONS_BODY}}
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "@protobuf-ts/grpc-transport": "^2.9.0",
     "@protobuf-ts/grpcweb-transport": "^2.9.0",
     "@protobuf-ts/runtime": "^2.9.0",
-    "@tauri-apps/api": "^1.5.0",
+    "@tauri-apps/api": "^1.4.0",
     "chart.js": "^4.4.0",
     "chartjs-adapter-moment": "^1.0.1",
     "colorjoe": "^4.2.0",
@@ -106,7 +106,7 @@
     "@angular/cli": "^16.1.8",
     "@angular/compiler-cli": "^16.1.8",
     "@protobuf-ts/plugin": "^2.9.0",
-    "@tauri-apps/cli": "^1.5.11",
+    "@tauri-apps/cli": "^1.4.0",
     "@types/lodash": "^4.14.188",
     "@types/marked": "^4.0.7",
     "@types/set-cookie-parser": "^2.4.2",

diff --git a/src-core/Cargo.toml b/src-core/Cargo.toml
@@ -7,10 +7,10 @@ license = "MIT"
 repository = "https://github.com/Raphiiko/Oyasumi"
 default-run = "oyasumivr"
 edition = "2021"
-rust-version = "1.70.0"
+rust-version = "1.71.1"
 
 [build-dependencies]
-tauri-build = { version = "1.5.1", features = [] }
+tauri-build = { version = "1.4.1", features = [] }
 tonic-build = { version = "0.11.0", features = [] }
 
 [dependencies]
@@ -98,7 +98,7 @@ rev = "2949a3f"
 # path = "../../oyasumivr-oscquery"
 
 [dependencies.tauri]
-version = "1.6.1"
+version = "1.4.1"
 features = [
   "global-shortcut-all",
   "clipboard-write-text",

diff --git a/src-core/src/main.rs b/src-core/src/main.rs
@@ -323,7 +323,7 @@ async fn app_setup(app_handle: tauri::AppHandle) {
     // Initialize mdns sidecar module
     mdns_sidecar::init().await;
     // Initialize Discord module
-    discord::init().await;
+    // discord::init().await;
     // Setup start of minute cronjob
     let mut cron = CronJob::new("CRON_MINUTE_START", on_cron_minute_start);
     cron.seconds("0");