Merge branch 'PrismLauncher:develop' into develop

Rhelvetican · Mar 21, 2024 · 7f05698 · 7f05698
2 parents 5bb6f34 + 794a60b
commit 7f05698
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -166,7 +166,7 @@ jobs:
 
       - name: Retrieve ccache cache (Windows MinGW-w64)
         if: runner.os == 'Windows' && matrix.msystem != '' && inputs.build_type == 'Debug'
-        uses: actions/cache@v4.0.1
+        uses: actions/cache@v4.0.2
         with:
           path: '${{ github.workspace }}\.ccache'
           key: ${{ matrix.os }}-mingw-w64-ccache-${{ github.run_id }}

diff --git a/flake.lock b/flake.lock
diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
@@ -463,7 +463,7 @@ auto ExportToZipTask::exportZip() -> ZipResult
 
         auto absolute = file.absoluteFilePath();
         auto relative = m_dir.relativeFilePath(absolute);
-        setStatus("Compresing: " + relative);
+        setStatus("Compressing: " + relative);
         setProgress(m_progress + 1, m_progressTotal);
         if (m_follow_symlinks) {
             if (file.isSymLink())