Merge branch 'main' into cad-mainline

scripts/flatpak/com.orcaslicer.OrcaSlicer.yml

@@ -306,6 +306,12 @@ modules:
         sha256: c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684
         dest: external-packages/python3
 
+      # wxInspector 1.0.0
+      - type: file
+        url: https://github.com/Noisyfox/wxInspector/archive/refs/tags/v1.0.0.zip
+        sha256: 0ba163956f2d468b19a91b96c5aba66ee9610843ea41dda628ea44cdafde7db7
+        dest: external-packages/wxInspector
+
       # ---------------------------------------------------------------
       # Fallback archives for deps normally provided by the GNOME SDK.
       # These are only used if find_package() fails to locate them.

scripts/msix/AppxManifest.xml

@@ -2,11 +2,13 @@
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   xmlns:rescap3="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities/3"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
   xmlns:virtualization="http://schemas.microsoft.com/appx/manifest/virtualization/windows10"
-  IgnorableNamespaces="uap rescap rescap3 desktop6 virtualization">
+  IgnorableNamespaces="uap uap3 rescap rescap3 desktop desktop6 virtualization">
 
   <Identity Name="@MSIX_IDENTITY_NAME@"
             Publisher="@MSIX_PUBLISHER@"
@@ -64,6 +66,20 @@
         <uap:Extension Category="windows.protocol">
           <uap:Protocol Name="orcaslicer" />
         </uap:Extension>
+        <uap:Extension Category="windows.protocol">
+          <uap:Protocol Name="prusaslicer" />
+        </uap:Extension>
+        <uap:Extension Category="windows.protocol">
+          <uap:Protocol Name="bambustudio" />
+        </uap:Extension>
+        <uap:Extension Category="windows.protocol">
+          <uap:Protocol Name="cura" />
+        </uap:Extension>
+        <uap3:Extension Category="windows.appExecutionAlias" EntryPoint="Windows.FullTrustApplication">
+          <uap3:AppExecutionAlias>
+            <desktop:ExecutionAlias Alias="orca-slicer.exe" />
+          </uap3:AppExecutionAlias>
+        </uap3:Extension>
       </Extensions>
     </Application>
   </Applications>

scripts/orca_extra_profile_check.py

@@ -46,12 +46,16 @@ def no_duplicates_object_pairs_hook(pairs):
     return seen
 
 # NOTE: currently Orca expects compatible_printers to be a defined in every instantiation profile, inheritation is not supported in Profile page
-def check_filament_compatible_printers(vendor_folder):
+def check_filament_compatible_printers(vendor, vendor_folder):
     """
     Checks JSON files in the vendor folder for missing or empty 'compatible_printers'
     when 'instantiation' is flagged as true.
 
+    In the OrcaFilamentLibrary 'compatible_printers' is optional: a profile without it is generic and
+    offered on every printer, while a profile that lists printers supersedes the generic one there.
+
     Parameters:
+        vendor (str): The vendor name the folder belongs to.
         vendor_folder (str or Path): The directory to search for JSON profile files.
 
     Returns:
@@ -115,7 +119,7 @@ def check_filament_compatible_printers(vendor_folder):
 
     for profile in profiles.values():
         instantiation = str(profile['content'].get("instantiation", "")).lower() == "true"
-        if instantiation:
+        if instantiation and vendor != 'OrcaFilamentLibrary':
             try:
                 compatible_printers = get_property(profile, "compatible_printers")
                 if not compatible_printers or (isinstance(compatible_printers, list) and not compatible_printers):
@@ -571,7 +575,7 @@ def main():
         vendor_path = profiles_dir / vendor_name
 
         if args.check_filaments or not (args.check_materials and not args.check_filaments):
-            errors_found += check_filament_compatible_printers(vendor_path / "filament")
+            errors_found += check_filament_compatible_printers(vendor_name, vendor_path / "filament")
 
         if args.check_materials:
             new_errors, new_warnings = check_machine_default_materials(profiles_dir, vendor_name)