Merge branch 'main' into main

.devcontainer/Dockerfile

@@ -0,0 +1,2 @@
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}

.devcontainer/devcontainer.json

@@ -1,6 +1,13 @@
 {
 	"name": "OrcaSlicer",
-	"image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04",
+	"build": {
+	"dockerfile": "Dockerfile",
+		"args": {
+			"PLATFORM": "linux/amd64",
+			"BASE_IMAGE": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04"
+		},
+		"options": ["--platform=linux/amd64"]
+	},
 	"runArgs": ["--env-file", "/tmp/devcontainer.env"],
     "features": {
         "ghcr.io/devcontainers/features/desktop-lite:1": {
@@ -48,4 +55,4 @@
 		"Set postCreate executable flag": "chmod +x .devcontainer/postCreate.sh"
 	},
 	"postCreateCommand": "sudo .devcontainer/postCreate.sh"
-}
+}

.github/workflows/build_all.yml

@@ -60,21 +60,21 @@ jobs:
       arch: ${{ matrix.arch }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
     secrets: inherit
-  # flatpak:
-  #   name: "Flatpak"
-  #   runs-on: ubuntu-latest
-  #   container:
-  #     image: bilelmoussaoui/flatpak-github-actions:gnome-45
-  #     options: --privileged
-  #   steps:
-  #   # maybe i'm too dumb and fucked up to do CI. OH WELL :D -ppd
-  #   - name: "Remove unneeded stuff to free disk space"
-  #     run:
-  #       sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY"
-  #   - uses: actions/checkout@v4
-  #   - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-  #     with:
-  #       bundle: orcaslicer.flatpak
-  #       manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
-  #       cache-key: flatpak-builder-${{ github.sha }}
-  #       cache: false
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      options: --privileged
+    steps:
+    # maybe i'm too dumb and fucked up to do CI. OH WELL :D -ppd
+    - name: "Remove unneeded stuff to free disk space"
+      run:
+        sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY"
+    - uses: actions/checkout@v4
+    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+      with:
+        bundle: orcaslicer.flatpak
+        manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
+        cache-key: flatpak-builder-${{ github.sha }}
+        cache: false

.github/workflows/build_orca.yml

@@ -159,6 +159,9 @@ jobs:
       - name: Build slicer Win
         if: inputs.os == 'windows-latest'
         working-directory: ${{ github.workspace }}
+        env:
+          WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\'
+          WindowsSDKVersion: '10.0.22000.0\'
         run: .\build_release_vs2022.bat slicer
 
       - name: Create installer Win

.github/workflows/check_profiles.yml

@@ -18,7 +18,7 @@ on:
 jobs:
   check_translation:
     name: Check profiles
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:  
       - name: Checkout repository
         uses: actions/checkout@v4

.gitignore

@@ -34,4 +34,4 @@ src/OrcaSlicer-doc/
 /deps/DL_CACHE
 **/.flatpak-builder/
 resources/profiles/user/default
-OrcaSlicer.code-workspace
+*.code-workspace

CMakeLists.txt

@@ -302,6 +302,10 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
         add_compile_options(-gz=zstd)
     endif()
 
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=template-id-cdtor" )
+    endif()
+
 endif()
 
 if (SLIC3R_ASAN)
@@ -407,6 +411,8 @@ if(SLIC3R_STATIC)
     set(Boost_USE_STATIC_LIBS ON)
     # Use boost libraries linked statically to the C++ runtime.
     # set(Boost_USE_STATIC_RUNTIME ON)
+else()
+    add_definitions(-DBOOST_LOG_DYN_LINK)
 endif()
 #set(Boost_DEBUG ON)
 # set(Boost_COMPILER "-mgw81")

README.md

@@ -1,26 +1,36 @@
+
+<h1> <p "font-size:200px;"><img align="left" src="https://github.com/KDW06/OrcaSlicer/blob/main/resources/images/OrcaSlicer.ico" width="100"> Orca Slicer</p> </h1>
+
 [![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
-# Orca Slicer     
-Orca Slicer is an open source slicer for FDM printers.   
+<br>Orca Slicer is an open source slicer for FDM printers. 
+
+
+Join our Discord community here:<br>
+<a href="https://discord.gg/P4VE9UY9gJ"><img src="https://img.shields.io/static/v1?message=Discord&logo=discord&label=&color=7289DA&logoColor=white&labelColor=&style=for-the-badge" height="35" alt="discord logo"/> </a>
+
+ <h3>🚨🚨🚨Important Security Alert🚨🚨🚨</h3> 
+
+Please be aware that "**orcaslicer.net**" or "**orcaslicer.info**" are NOT an official website for OrcaSlicer and may be potentially malicious. This site appears to use AI-generated content, lacking genuine context, and seems to exist solely to profit from advertisements. Worse, it may redirect download links to harmful sources. For your safety, avoid downloading OrcaSlicer from this site as the links may be compromised.
 
-![discord-mark-blue](https://github.com/SoftFever/OrcaSlicer/assets/103989404/b97d5ffc-072d-4d0a-bbda-e67ef373876f) Join community: [OrcaSlicer Official Discord Server](https://discord.gg/P4VE9UY9gJ)   
+The only official platforms for OrcaSlicer are our GitHub project page and the  <a href="https://discord.gg/P4VE9UY9gJ">official Discord channel</a> .
 
-🚨🚨🚨Alert🚨🚨🚨: "orcaslicer.net" is **NOT** our website and appears to be potentially malicious. The content there is AI-generated, which means it lacks genuine context and it's only purpose is to profit from ADs and worse: they can redirect download links to harmful sources. Please avoid downloading OrcaSlicer from this site, as the download links could be compromised at any time.
-The only official platforms for OrcaSlicer are the GitHub project page and the Discord channel mentioned above.
-I really value the OrcaSlicer community and appreciate all the social groups that have formed. However, it’s important to address that it’s harmful if any group falsely claims to be official or misleads its members. If you notice such a group or are part of one, please help by encouraging the group owner to add a clear disclaimer or by warning its members.
+We deeply value our OrcaSlicer community and appreciate all the social groups that support us. However, it is crucial to address the risk posed by any group that falsely claims to be official or misleads its members. If you encounter such a group or are part of one, please assist by encouraging the group owner to add a clear disclaimer or by alerting its members.
+
+Thank you for your vigilance and support in keeping our community safe!
 
 # Main features
-- Auto calibrations for all printers
-- Sandwich(inner-outer-inner) mode - an improved version of the `External perimeters first` mode
+- Auto-calibration for all printers
+- Sandwich (inner-outer-inner) mode - An improved version of the `External Perimeters First` mode
 - [Precise wall](https://github.com/SoftFever/OrcaSlicer/wiki/Precise-wall)
-- Polyholes conversion support [SuperSlicer Wiki: Polyholes](https://github.com/supermerill/SuperSlicer/wiki/Polyholes)
+- Polyholes conversion support: [SuperSlicer Wiki: Polyholes](https://github.com/supermerill/SuperSlicer/wiki/Polyholes)
 - Klipper support
 - More granular controls
-- More features can be found in [change notes](https://github.com/SoftFever/OrcaSlicer/releases/)  
+- Additional features can be found in the [change notes](https://github.com/SoftFever/OrcaSlicer/releases/)  
 
 # Wiki
-The wiki below aims to provide a detailed explanation of the slicer settings, how to get the most out of them as well as how to calibrate and setup your printer.
+The wiki below aims to provide a detailed explanation of the slicer settings, including how to maximize their use and how to calibrate and set up your printer.
 
-The wiki is work in progress so bear with us while we get it up and running!
+Please note that the wiki is a work in progress. We appreciate your patience as we continue to develop and improve it!
 
 **[Access the wiki here](https://github.com/SoftFever/OrcaSlicer/wiki)**  
 
@@ -50,7 +60,7 @@ Explore the latest developments in Orca Slicer with our nightly builds. Feedback
 **Mac**:
 1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.  
 2. Drag OrcaSlicer.app to Application folder. 
-3. *If you want to run a build from a PR, you also need following instructions below*  
+3. *If you want to run a build from a PR, you also need to follow the instructions below:*  
     <details quarantine>
     - Option 1 (You only need to do this once. After that the app can be opened normally.):
       - Step 1: Hold _cmd_ and right click the app, from the context menu choose **Open**.
@@ -68,30 +78,31 @@ Explore the latest developments in Orca Slicer with our nightly builds. Feedback
             ![image](./SoftFever_doc/mac_security_setting.png)  
     </details>
     
-**Linux(Ubuntu)**:
- 1. If you run into trouble to execute it, try this command in terminal:  
+**Linux (Ubuntu)**:
+ 1. If you run into trouble executing it, try this command in the terminal:  
     `chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage`
     
 # How to compile
 - Windows 64-bit  
   - Tools needed: Visual Studio 2019, Cmake, git, git-lfs, Strawberry Perl.
       - You will require cmake version 3.14 or later, which is available [on their website](https://cmake.org/download/).
-      - Strawberry Perl is [available on their github repository](https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/).
+      - Strawberry Perl is [available on their GitHub repository](https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/).
   - Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
   - Note: Don't forget to run `git lfs pull` after cloning the repository to download tools on Windows
 
 - Mac 64-bit  
   - Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf, texinfo
       - You can install most of them by running `brew install cmake gettext libtool automake autoconf texinfo`
   - run `build_release_macos.sh`
-  - To build and debug in XCode:
-      - run `XCode.app`
-      - open ``build_`arch`/OrcaSlicer.xcodeproj``
+  - To build and debug in Xcode:
+      - run `Xcode.app`
+      - open ``build_`arch`/OrcaSlicer.Xcodeproj``
       - menu bar: Product => Scheme => OrcaSlicer
       - menu bar: Product => Scheme => Edit Scheme...
           - Run => Info tab => Build Configuration: `RelWithDebInfo`
           - Run => Options tab => Document Versions: uncheck `Allow debugging when browsing versions`
       - menu bar: Product => Run
+
 - Linux (All Distros)
     - Docker
         - Dependencies: Docker [Installation Instructions](https://www.docker.com/get-started/), git
@@ -131,11 +142,6 @@ Thank you! :)
 </a>
 </td>
 <td>
-<a href="https://phrozen3d.com/">
-    <img src="SoftFever_doc\sponsor_logos\Phrozen_Logo圓_.png" alt="Phrozen Technology" width="96" height="">
-</a>
-</td>
-<td>
 <a href="https://bigtree-tech.com/">
     <img src="SoftFever_doc\sponsor_logos\BigTreeTech.png" alt="BIGTREE TECH" width="96" height="">
 </a>
@@ -175,5 +181,5 @@ The GNU Affero General Public License, version 3 ensures that if you use any par
 
 Orca Slicer includes a pressure advance calibration pattern test adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
 
-The bambu networking plugin is based on non-free libraries from Bambulab. It is optional to the Orca Slicer and provides extended functionalities for Bambulab printer users.
+The Bambu networking plugin is based on non-free libraries from BambuLab. It is optional to the Orca Slicer and provides extended functionalities for Bambulab printer users.
 

SECURITY.md

@@ -1,32 +1,47 @@
-POLICY: Our security policy is to avoid leaving the ecosystem worse than we found it. Meaning we are not planning to introduce vulnerabilities into the ecosystem.
-The OrcaSlicer team and community take all security bugs in OrcaSlicer seriously. Thank you for improving the security of OrcaSlicer. We appreciate your efforts to disclose the issue responsibly, and will make every effort to acknowledge your contributions.
+# Security Policy
 
-Report security bugs by emailing the lead maintainer at [email protected] and include the word "SECURITY" in the subject line.
+At OrcaSlicer, we are committed to maintaining the security of our ecosystem. Our policy is to ensure that we do not introduce vulnerabilities and that any security issues are addressed promptly and responsibly. We appreciate your help in improving the security of OrcaSlicer and thank you for your responsible disclosure.
+Reporting Security Bugs
 
-The lead maintainer will acknowledge your email within a week (7 days), and will send a more detailed response up to 48 hours after that indicating the next steps in handling your report. After the initial reply to your report, the security team will endeavor to keep you informed of the progress towards a fix and an announcement. We may ask for additional information or guidance.
+## To report a security bug, please follow these guidelines:
 
-OrcaSlicer will confirm the problem and determine the affected versions.
-OrcaSlicer will audit code to find any similar problems.
-OrcaSlicer will prepare fixes for all releases still under maintenance. These fixes will be released as fast as possible.
-Report security bugs in third-party modules to the person or team maintaining the module.
+  * Email Security Bugs:
+        Send an email to the lead maintainer at [email protected].
+        Include the word "SECURITY" in the subject line of your email.
 
-SECURITY DISCLOSURE: Your responsibility is to report vulnerabilities to us using the guidelines outlined below.
-Please give detailed steps on how to disclose the vulnerability. Keep these OWASP guidelines in mind ( https://www.owasp.org/index.php/Vulnerability_Disclosure_Cheat_Sheet ) when creating your disclosure policy.
+  * Response Times:
+        The lead maintainer will acknowledge receipt of your email within one week (7 days).
+        A detailed response will follow within 48 hours, outlining the next steps for handling your report.
+        After the initial reply, the security team will keep you informed about the progress toward a fix and any announcements.
 
-Below are some recommendations for security disclosures:
+  * Information and Collaboration:
+        We may request additional information or guidance as we work on addressing the issue.
 
-OrcaSlicer security contact { contact: mailto:[email protected]] }
-When disclosing vulnerabilities please do the following:
-Your name and affiliation (if any).
-Include scope of vulnerability. Let us know who could use this exploit.
-Document steps to identify the vulnerability. It is important that we can reproduce your findings.
-Show how to exploit vulnerability, give us an attack scenario.
-OrcaSlicer Checklist: Security Recommendations
-Follow these steps to improve security when using OrcaSlicer.
+  * Handling the Report:
+        OrcaSlicer will confirm the problem and determine the affected versions.
+        We will audit the code to find any similar issues and prepare fixes for all releases still under maintenance.
+        Fixes will be released as quickly as possible.
 
-...SEE SOMETHING
-...SAY SOMETHING
-1)...SEE SOMETHING
-We suggest you goto #2 if this happens.
+  * Third-Party Modules:
+        Report security issues in third-party modules to the respective maintainer of those modules.
 
-Why? Through experience we have found it is best to goto #2 in this situation.
+## Security Disclosure Guidelines
+
+When disclosing a vulnerability, please follow these steps to ensure your report is clear and actionable:
+
+  * Provide Detailed Information:
+        Scope: Clearly define the scope of the vulnerability.
+        Potential Impact: Let us know who could be affected by this exploit.
+        Reproduction Steps: Document detailed steps to reproduce the vulnerability.
+
+    Reference OWASP Guidelines:
+        Follow the <a href="https://cheatsheetseries.owasp.org/cheatsheets/Vulnerability_Disclosure_Cheat_Sheet.html">OWASP Vulnerability Disclosure Cheat Sheet</a> for best practices in vulnerability disclosure.
+
+## Security Recommendations
+
+To enhance security when using OrcaSlicer, we recommend following these steps:
+
+  * SEE SOMETHING: If you notice anything suspicious or have concerns, please report it.
+  * SAY SOMETHING: If you have any doubts or need assistance, do not hesitate to contact us.
+
+### Thank you for your commitment to the security of OrcaSlicer. Your efforts help us maintain a safe and reliable ecosystem.

cmake/modules/MacOSXBundleInfo.plist.in

@@ -37,6 +37,14 @@
         <array>
           <string>orcaslicer</string>
         </array>
+      </dict>
+		<dict>
+        <key>CFBundleURLName</key>
+        <string>BambuStudio Downloads</string>
+        <key>CFBundleURLSchemes</key>
+        <array>
+          <string>bambustudioopen</string>
+        </array>
       </dict>
     </array>
 	<key>CFBundleDocumentTypes</key>

deps/CMakeLists.txt

@@ -30,6 +30,10 @@ if (APPLE)
 
 endif ()
 
+if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
+    cmake_policy(SET CMP0135 NEW)
+endif()
+
 project(OrcaSlicer-deps)
 
 include(ExternalProject)
@@ -56,10 +60,6 @@ endif ()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
-else() 
-    if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
-        cmake_policy(SET CMP0135 NEW)
-    endif()
 endif()
 
 set(IS_CROSS_COMPILE FALSE)

doc/Calibration.md

@@ -149,4 +149,4 @@ You can also return to OrcaSlicer in the "Preview" tab, make sure the color sche
 - *The PA Tower method is inspired by [Klipper](https://www.klipper3d.org/Pressure_Advance.html)*
 - *The temp tower model is remixed from [Smart compact temperature calibration tower](https://www.thingiverse.com/thing:2729076)
 - *The max flowrate test was inspired by Stefan(CNC Kitchen), and the model used in the test is a remix of his [Extrusion Test Structure](https://www.printables.com/model/342075-extrusion-test-structure).
-- *chapgpt* ;)
+- *ChatGPT* ;)

doc/developer-reference/Home.md

@@ -4,3 +4,4 @@ This is a documentation from someone exploring the code and is by no means compl
 
 - [Preset, PresetBundle and PresetCollection](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/developer-reference/Preset-and-bundle.md)
 - [Plater, Sidebar, Tab, ComboBox](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/developer-reference/plater-sidebar-tab-combobox.md)
+- [Slicing Call Hierarchy](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/developer-reference/slicing-hierarchy.md)

doc/developer-reference/slicing-hierarchy.md

@@ -0,0 +1,5 @@
+## Slicing Call Hierarchy
+
+The Slicing logic is not the easiest to locate in the code base. Below is a flow diagram of function calls that are made after clicking the `Slice Plate` button in the UI. Most of the processing happens in different threads. Note the calls after `BackgroundSlicingProcess::start()`, but this is how you can find the slicing logic.
+
+<img src="../images/slicing_call_heirarchy.svg" alt="Example Image" width="320">

flatpak/entrypoint

@@ -6,10 +6,4 @@ grep -q org.freedesktop.Platform.GL.nvidia /.flatpak-info && export WEBKIT_DISAB
 # Work-around https://github.com/bambulab/BambuStudio/issues/3440
 export LC_ALL=C.UTF-8
 
-if [ $BAMBU_STUDIO_DARK_THEME == true ]; then
-    export GTK_THEME='Adwaita:dark'
-    # echo "Message: $(date +%T): INFO: using dark theme variant"
-fi
-
-exec /app/bin/orca-slicer "$@" &
-$(/app/bin/set-dark-theme-variant.py) &
+exec /app/bin/orca-slicer "$@"