Merge branch 'master' into next

.github/workflows/main.yml

@@ -43,7 +43,7 @@ jobs:
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: ${{ runner.workspace }}\Qt
           key: Qt-5.15.2-QtCache

CHANGELOG.md

@@ -18,7 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 
-## [1.1.1 / 5.56.1] - 2022-06-XX
+## [1.1.1 / 5.56.1] - 2022-06-07
 
 ### Added
 - compatibility templates can now be viewed from the settings window [#1891](https://github.com/sandboxie-plus/Sandboxie/issues/1891)
@@ -31,7 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - changed Move Box behaviour [#1879](https://github.com/sandboxie-plus/Sandboxie/issues/1879)
 - improved implementation of the PreferExternalManifest option
 - Win32k hooks are now by default only used for Edge and Chromium apps as they cause issues with other software [#1902](https://github.com/sandboxie-plus/Sandboxie/issues/1902) [#1912](https://github.com/sandboxie-plus/Sandboxie/issues/1912) [#1897](https://github.com/sandboxie-plus/Sandboxie/issues/1897)
-- "AllowBoxedJobs=y" is not the default
+- "AllowBoxedJobs=y" is now the default behaviour
 
 ### Fixed
 - fixed Edge issue with Windows 11 after KB5014019

SandboxiePlus/SandMan/Resources/SandMan.qrc

@@ -87,4 +87,10 @@
         <file alias="Full6">Boxes/sandbox-o-full.png</file>
         <file alias="Busy">Boxes/BusyOverlay.png</file>
     </qresource>
+    <qresource prefix="/Assets">
+        <file>Advanced.png</file>
+        <file>AdvancedD.png</file>
+        <file>Simple.png</file>
+        <file>SimpleD.png</file>
+    </qresource>
 </RCC>