Merge branch 'main' into develop

Raphiiko · Nov 3, 2024 · 806b613 · 806b613
2 parents b02a3fc + 068336c
commit 806b613
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - GPU acceleration for SteamVR overlays (Community contribution by [BenjaminZehowlt](https://github.com/BenjaminZehowlt))
 
+## [1.14.6]
+
 ### Fixed
 
 - Fixed parsing of new VRChat join/leave log format

diff --git a/scripts/steam/1-prepare-steam-sdk.sh b/scripts/steam/1-prepare-steam-sdk.sh
@@ -6,7 +6,7 @@
 # Clean up pre-existing files
 rm -rf SteamSDK
 # Unzip the SteamWorks SDK
-unzip scripts/steam/lib/steamworks_sdk_159.zip -d SteamSDK
+unzip scripts/steam/lib/steamworks_sdk_160.zip -d SteamSDK
 # Create Depot folders
 mkdir -p SteamSDK/sdk/tools/ContentBuilder/content/Win64
 mkdir -p SteamSDK/sdk/tools/ContentBuilder/content/Win64_CN

diff --git a/scripts/steam/lib/steamworks_sdk_159.zip → scripts/steam/lib/steamworks_sdk_160.zip b/scripts/steam/lib/steamworks_sdk_159.zip → scripts/steam/lib/steamworks_sdk_160.zip
diff --git a/src-core/Cargo.lock b/src-core/Cargo.lock
diff --git a/src-ui/app/services/telemetry.service.ts b/src-ui/app/services/telemetry.service.ts
@@ -59,7 +59,7 @@ export class TelemetryService {
       if (this.trackedJSErrors.includes(errorData)) return;
       this.trackedJSErrors.push(errorData);
       this.trackEvent('ui_js_error', {
-        message: e.message,
+        errorData,
       });
     });
   }