Fixed an issue that profile OTA won't work if major version didn't match app version

Fix 0.16mm parameters and update start_gcode

.clang-format

@@ -95,7 +95,7 @@ PenaltyBreakString: 600
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 50
 PenaltyReturnTypeOnItsOwnLine: 300
-PointerAlignment: Right
+PointerAlignment: Left
 ReflowComments:  true
 SortIncludes:    false
 SortUsingDeclarations: false

.devcontainer/devcontainer.json

@@ -0,0 +1,51 @@
+{
+	"name": "OrcaSlicer",
+	"image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04",
+	"runArgs": ["--env-file", "/tmp/devcontainer.env"],
+    "features": {
+        "ghcr.io/devcontainers/features/desktop-lite:1": {
+			"password": "orca"
+		}
+    },
+	"customizations": {
+		"vscode": {
+			"settings": { 
+				"cmake.configureArgs": [
+					"-DSLIC3R_GTK=3",
+					"-DBBL_RELEASE_TO_PUBLIC=1",
+					"-DBBL_INTERNAL_TESTING=0",
+					"-DSLIC3R_STATIC=1",
+					"-DCMAKE_PREFIX_PATH=${workspaceFolder}/deps/build/destdir/usr/local"
+				],
+				"cmake.buildToolArgs": [
+					"-l${containerEnv:CORES}"
+				]
+			},
+			
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"ms-vscode.cmake-tools",
+				"ms-vscode.cpptools-extension-pack"
+			]
+		}
+	},
+	
+    "forwardPorts": [6080],
+	"portsAttributes": {
+		"6080": {
+			"label": "VNC web client (noVNC)",
+			"onAutoForward": "silent"
+		}
+    },
+	"otherPortsAttributes": {
+		"onAutoForward": "ignore"
+	},
+	
+	"initializeCommand": {
+		"Setup Temporary Env File": "echo \"CORES=`nproc --all`\" > /tmp/devcontainer.env"
+	},
+	"onCreateCommand": {
+		"Set postCreate executable flag": "chmod +x .devcontainer/postCreate.sh"
+	},
+	"postCreateCommand": "sudo .devcontainer/postCreate.sh"
+}

.devcontainer/postCreate.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+# Update and upgrade all system packages
+apt update
+apt upgrade -y          
+
+echo "-----------------------------------------"	
+echo "Running BuildLinux.sh with update flag..."
+echo "-----------------------------------------"	
+./BuildLinux.sh -u
+
+echo "------------------------------"
+echo "Installing missing packages..."
+echo "------------------------------"
+apt install -y libgl1-mesa-dev m4 autoconf libtool

.gitattributes

@@ -0,0 +1 @@
+*.exe filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,36 +1,58 @@
-name: Bug Report
+name: 🐞 Bug Report
 description: File a bug report
-labels: bug
+labels: ["bug"]
 body:
   - type: markdown
     attributes:
       value: |
         **Thank you for using Orca Slicer and wanting to report a bug.**
+        
+        Please note that this is not the place to make feature requests or ask for help.
+        For this, please use the [Feature request](https://github.com/SoftFever/OrcaSlicer/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others.
+        
         Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment.
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this problem?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
   - type: input
     id: version
     attributes:
       label: OrcaSlicer Version
       description: Which version of Orca Slicer are you running? You can see the full version in `Help` -> `About Orca Slicer`.
-      placeholder: e.g. 1.6.6
+      placeholder: e.g. 1.9.0
+    validations:
+      required: true
+  - type: dropdown
+    id: os_type
+    attributes:
+      label: "Operating System (OS)"
+      description: "What OSes are you are experiencing issues on?"
+      multiple: true
+      options:
+        - Linux
+        - macOS
+        - Windows
     validations:
       required: true
   - type: input
-    id: os_info
+    id: os_version
     attributes:
-      label: OS version
-      description: Which OS version are you using?
-      placeholder: |
-        OS: Windows 7/8/10/11 ... , Ubuntu 22.04/Fedora 36 ... , macOS 10.15/11.1/12.3 ...
+      label: "OS Version"
+      description: "What OS version does this relate to?"
+      placeholder: "i.e. OS: Windows 7/8/10/11 ..., Ubuntu 22.04/Fedora 36 ..., macOS 10.15/11.1/12.3 ..."
     validations:
       required: true
   - type: textarea
     id: system_info
     attributes:
       label: Additional system information
-      description: For the performance issue, please also show the CPU、Memory information; For the 3D Rendering issue, please also show the Display Card information.
+      description: For the performance issue, please also show the CPU, Memory information; For the 3D Rendering issue, please also show the Display Card information.
       placeholder: |
-        CPU: 11th gen intel r core tm i7-1185g7/amd ryzen 7 6800h/...
+        CPU: 11th gen Intel r core tm i7-1185g7/AMD Ryzen 7 6800h/...
         Memory: 32/16 GB...
         Display Card: NVIDIA Quadro P400/...
     validations:
@@ -50,8 +72,8 @@ body:
       description: Please described the detailed steps to reproduce this issue
       placeholder: |
         1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
+        2. Click on '...'
+        3. Scroll down to '...'
         4. See error
     validations:
       required: true
@@ -100,3 +122,12 @@ body:
       options:
         - label: Log file
         - label: Project file
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Screenshots? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Support (Discord channel)
+    url: https://discord.gg/P4VE9UY9gJ
+    about: Please ask and answer support "how do I?"questions here.
+  - name: Discussion Forum
+    url: https://github.com/SoftFever/OrcaSlicer/discussions
+    about: Please raise ideas and feature suggestions here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Which printers will be beneficial to this feature**
-E.g. Voron/Klipper based printer/etc...
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,66 @@
+name: 🚀 Feature Request / Enhancement
+description: Suggest an improvement to make Orca Slicer even better!
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+
+        If your idea is still at the formulation stage, or you're not sure it would
+        be useful to many users, you can raise it as a discussion topic under [Ideas](https://github.com/SoftFever/OrcaSlicer/discussions/categories/ideas)
+        or you can raise it on the [Discord server](https://discord.gg/P4VE9UY9gJ).
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this feature request?
+      description: |
+        Please search to see if an issue already exists for a feature, or perhaps one similar.
+        You can then comment and react so that we know know much interest there is in the feature request.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem?
+      description: A clear and concise description of what the problem is.
+      placeholder: I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Which printers will be beneficial to this feature?
+      description: Select affected printer firmware type.
+      multiple: true
+      options: 
+        - Klipper
+        - Marlin
+        - Others
+        - All
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+      placeholder: It should do [...]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+      placeholder: |
+        1. [...]
+        2. [...]
+        3. [...]
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context, diagrams, illustations or screenshots about the feature request here.
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/workflows/build_all.yml

@@ -0,0 +1,58 @@
+name: Build all
+
+on:
+  push:
+    branches:
+     - main
+     - release/*
+    paths:
+     - 'deps/**'
+     - 'src/**'
+     - '**/CMakeLists.txt'
+     - 'version.inc'
+     - 'localization/**'
+     - 'resources/**'
+     - ".github/workflows/build_*.yml"
+
+  pull_request:
+    branches:
+     - main
+     - release/*
+    paths:
+     - 'deps/**'
+     - 'src/**'
+     - '**/CMakeLists.txt'
+     - 'version.inc'
+     - ".github/workflows/build_*.yml"
+
+  workflow_dispatch: # allows for manual dispatch
+    inputs:
+      build-deps-only:
+        description: 'Only build dependencies (bypasses caching)'
+        type: boolean
+        default: false
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+  
+
+jobs:
+  build_all:
+    name: Build All
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-20.04
+          - os: windows-latest
+          - os: macos-12
+            arch: x86_64
+          - os: macos-12
+            arch: arm64
+    uses: ./.github/workflows/build_check_cache.yml
+    with:
+      os: ${{ matrix.os }}
+      arch: ${{ matrix.arch }}
+      build-deps-only: ${{ inputs.build-deps-only || false }}
+    secrets: inherit

.github/workflows/build_check_cache.yml

@@ -0,0 +1,60 @@
+name: Check Cache
+
+on:
+  workflow_call:
+    inputs:
+      os:
+        required: true
+        type: string
+      arch:
+        required: false
+        type: string
+      build-deps-only:
+        required: false
+        type: boolean
+  
+jobs:
+  check_cache: # determines if there is a cache and outputs variables used in caching process
+    name: Check Cache
+    runs-on: ${{ inputs.os }}
+    outputs:
+      cache-key: ${{ steps.set_outputs.outputs.cache-key }}
+      cache-path: ${{ steps.set_outputs.outputs.cache-path }}
+      valid-cache: ${{ steps.cache_deps.outputs.cache-hit }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          lfs: 'true'
+        
+      - name: set outputs
+        id: set_outputs
+        env:
+          underscore-arch: ${{ inputs.os == 'macos-12' && '_' || ''}}${{ inputs.os == 'macos-12' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing
+          dash-arch: ${{ inputs.os == 'macos-12' && '-' || ''}}${{ inputs.os == 'macos-12' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing
+          dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-12') && 'OrcaSlicer_dep' || 'destdir' }}
+          output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
+        run: |
+          echo cache-key=${{ runner.os }}${{ env.dash-arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
+          echo cache-path=${{ github.workspace }}/deps/build${{ env.underscore-arch }}/${{ env.dep-folder-name }}${{ env.underscore-arch }} >> ${{ env.output-cmd }}
+            
+      - name: load cache
+        id: cache_deps
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.set_outputs.outputs.cache-path }}
+          key: ${{ steps.set_outputs.outputs.cache-key }}
+          lookup-only: true
+        
+  build_deps: # call next step
+    name: Build Deps
+    needs: [check_cache]
+    uses: ./.github/workflows/build_deps.yml
+    with:
+      cache-key: ${{ needs.check_cache.outputs.cache-key }}
+      cache-path: ${{ needs.check_cache.outputs.cache-path }}
+      valid-cache: ${{ needs.check_cache.outputs.valid-cache == 'true' }}
+      os: ${{ inputs.os }}
+      arch: ${{ inputs.arch }}
+      build-deps-only: ${{ inputs.build-deps-only }}
+    secrets: inherit

.github/workflows/build_deps.yml

@@ -1,60 +1,64 @@
-# name: Build Deps
-name: Build deps
-
 on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'deps/**'
-      - .github/workflows/build_deps.yml
-  push:
-    branches:
-      - main
-    paths:
-      - 'deps/**'
-      - .github/workflows/build_deps.yml
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+  workflow_call:
+    inputs:
+      cache-key:
+        required: true
+        type: string
+      cache-path:
+        required: true
+        type: string
+      valid-cache:
+        required: true
+        type: boolean
+      os:
+        required: true
+        type: string
+      arch:
+        required: false
+        type: string
+      build-deps-only:
+        required: false
+        type: boolean
 
 jobs:
   build_deps:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-20.04
-          - os: windows-latest
-          - os: macos-12
-            arch: x86_64
-          - os: macos-12
-            arch: arm64
-    runs-on: ${{ matrix.os }}
-
+    name: Build Deps
+    if: inputs.build-deps-only || inputs.valid-cache != true
+    runs-on: ${{ inputs.os }}
+    env:
+      date:
     steps:
+      
+      # Setup the environment
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          lfs: 'true'
+        
+      - name: load cached deps
+        uses: actions/cache@v4
+        with:
+          path: ${{ inputs.cache-path }}
+          key: ${{ inputs.cache-key }}
 
       - name: setup dev on Windows
-        if: matrix.os == 'Windows'
-        uses: microsoft/setup-msbuild@v1.1
+        if: inputs.os == 'windows-latest'
+        uses: microsoft/setup-msbuild@v2
 
       - name: Get the date on Ubuntu and macOS
-        if: matrix.os != 'windows-latest'
-        id: get-date-unix
+        if: inputs.os != 'windows-latest'
         run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
         
       - name: Get the date on Windows
-        if: matrix.os == 'windows-latest'
-        id: get-date-windows
+        if: inputs.os == 'windows-latest'
         run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
         shell: pwsh
 
+        
+      # Build Dependencies
       - name: Build on Windows
-        if: matrix.os == 'windows-latest'
+        if: inputs.os == 'windows-latest'
         working-directory: ${{ github.workspace }}
         run: |
             choco install strawberryperl
@@ -64,26 +68,21 @@ jobs:
             .\build_release_vs2022.bat pack
             cd ${{ github.workspace }}/deps/build
 
-      - name: Build on Mac x86_64
-        if: matrix.os == 'macos-12' && matrix.arch == 'x86_64'
+      - name: Build on Mac ${{ inputs.arch }}
+        if: inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-            brew install cmake git gettext automake
-            mkdir -p ${{ github.workspace }}/deps/build_x86_64
-            mkdir -p ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
-            ./build_release_macos.sh -dp -a x86_64
+            brew install cmake git gettext automake texinfo ninja
+            brew list
+            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
+            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }}
+            brew uninstall --ignore-dependencies zstd
+            ./build_release_macos.sh -dpx -a ${{ inputs.arch }} -t 10.15
+            brew install zstd
 
-      - name: Build on Mac arm64
-        if: matrix.os == 'macos-12' && matrix.arch == 'arm64'
-        working-directory: ${{ github.workspace }}
-        run: |
-            brew install cmake git gettext automake
-            mkdir -p ${{ github.workspace }}/deps/build_arm64
-            mkdir -p ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
-            ./build_release_macos.sh -dp -a arm64
 
       - name: Build on Ubuntu
-        if: matrix.os == 'ubuntu-20.04'
+        if: inputs.os == 'ubuntu-20.04'
         working-directory: ${{ github.workspace }}
         run: |
             sudo apt-get update
@@ -91,7 +90,7 @@ jobs:
             libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules pkgconf \
             libglu1-mesa-dev libcairo2-dev libgtk-3-dev libsoup2.4-dev libwebkit2gtk-4.0-dev \
             libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev \
-            gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev
+            gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev texinfo
             mkdir -p ${{ github.workspace }}/deps/build
             mkdir -p ${{ github.workspace }}/deps/build/destdir
             sudo ./BuildLinux.sh -ur
@@ -99,32 +98,39 @@ jobs:
             ./BuildLinux.sh -dr
             cd deps/build
             tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
-
-      - name: Upload Mac arm64 artifacts
-        if: matrix.os == 'macos-12' && matrix.arch == 'arm64'
-        uses: actions/upload-artifact@v3
-        with:
-          name: OrcaSlicer_dep_mac_arm64_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep*.tar.gz
       
-      - name: Upload Mac x86_64 artifacts
-        if: matrix.os == 'macos-12' && matrix.arch == 'x86_64'
-        uses: actions/upload-artifact@v3
+            
+      # Upload Artifacts
+      - name: Upload Mac ${{ inputs.arch }} artifacts
+        if: inputs.os == 'macos-12'
+        uses: actions/upload-artifact@v4
         with:
-          name: OrcaSlicer_dep_mac_x86_64_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep*.tar.gz
+          name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}
+          path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz
 
       - name: Upload Windows artifacts
-        if: matrix.os == 'windows-latest'
-        uses: actions/upload-artifact@v3
+        if: inputs.os == 'windows-latest'
+        uses: actions/upload-artifact@v4
         with:
           name: OrcaSlicer_dep_win64_${{ env.date }}
           path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
 
       - name: Upload Ubuntu artifacts
-        if: matrix.os == 'ubuntu-20.04'
-        uses: actions/upload-artifact@v3
+        if: inputs.os == 'ubuntu-20.04'
+        uses: actions/upload-artifact@v4
         with:
           name: OrcaSlicer_dep_ubuntu_${{ env.date }}
           path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
-        
+          
+  build_orca:
+    name: Build OrcaSlicer
+    needs: [build_deps]
+    if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }}
+    uses: ./.github/workflows/build_orca.yml
+    with:
+      cache-key: ${{ inputs.cache-key }}
+      cache-path: ${{ inputs.cache-path }}
+      os: ${{ inputs.os }}
+      arch: ${{ inputs.arch }}
+    secrets: inherit
+        

.github/workflows/build_orca.yml

@@ -1,114 +1,97 @@
-name: Build OrcaSlicer
-
-on: 
-    push:
-      branches: 
-       - main
-      paths:
-       - 'src/**'
-       - '**/CMakeLists.txt'
-       - 'version.inc'
-       - 'localization/**'
-       - 'resources/**'
-       - ".github/workflows/build_orca.yml"
-
-    pull_request:
-      branches: 
-       - main 
-      paths:
-       - 'src/**'
-       - '**/CMakeLists.txt'
-       - 'version.inc'
-       - ".github/workflows/build_orca.yml"
- 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+on:
+    workflow_call:
+      inputs:
+        cache-key:
+          required: true
+          type: string
+        cache-path:
+          required: true
+          type: string
+        os:
+          required: true
+          type: string
+        arch:
+          required: false
+          type: string
 
 jobs:
   build_orca:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-20.04
-          - os: windows-latest
-          - os: macos-12
-            arch: x86_64
-          - os: macos-12
-            arch: arm64
-    runs-on: ${{ matrix.os }}
+    name: Build OrcaSlicer
+    runs-on: ${{ inputs.os }}
+    env:
+      date:
+      ver:
+      ver_pure:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          lfs: 'true'
+
+      - name: load cached deps
+        uses: actions/cache@v4
+        with:
+          path: ${{ inputs.cache-path }}
+          key: ${{ inputs.cache-key }}
+          fail-on-cache-miss: true
 
       - name: Get the version and date on Ubuntu and macOS
-        if: matrix.os != 'windows-latest'
-        id: get-version-unix
+        if: inputs.os != 'windows-latest'
         run: |
-          ver=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
+          ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            ver="PR-${{ github.event.number }}"
+          else
+            ver=V$ver_pure
+          fi
           echo "ver=$ver" >> $GITHUB_ENV
+          echo "ver_pure=$ver_pure" >> $GITHUB_ENV
           echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
 
       - name: Get the version and date on Windows
-        if: matrix.os == 'windows-latest'
-        id: get-version-windows
+        if: inputs.os == 'windows-latest'
         run: |
-          echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
-          # Extract the version from the file
-          $versionContent = Get-Content version.inc -Raw
-          if ($versionContent -match 'set\(SoftFever_VERSION "(.*?)"\)') {
-              $ver = $matches[1]
+          $date = Get-Date -Format 'yyyyMMdd'
+          $ref = "${{ github.ref }}"
+          $eventName = "${{ github.event_name }}"
+          $prNumber = "${{ github.event.number }}"
+      
+          if ($eventName -eq 'pull_request') {
+              $ver = "PR" + $prNumber
+          } else {
+              $versionContent = Get-Content version.inc -Raw
+              if ($versionContent -match 'set\(SoftFever_VERSION "(.*?)"\)') {
+                  $ver = $matches[1]
+              }
+              $ver = "V$ver"
           }
+      
           echo "ver=$ver" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
-          echo "date: ${{ env.date }} version: $ver"
+          echo "date=$date" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
+          echo "date: ${{ env.date }} version: ${{ env.ver }}"
         shell: pwsh
-
+        
 #   Mac
       - name: Install tools mac
-        if: matrix.os == 'macos-12'
+        if: inputs.os == 'macos-12'
         run: |
-          brew install cmake git gettext zstd tree
-          mkdir -p ${{ github.workspace }}/deps/build_${{matrix.arch}}
-          mkdir -p ${{ github.workspace }}/deps/build_${{matrix.arch}}/OrcaSlicer_dep_${{matrix.arch}}
-
-      # - name: build deps
-        # if: matrix.os == 'macos-12'
-        #   id: cache_deps
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps_${{matrix.arch}}
-      #   with:
-      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-      #     key: build-${{ env.cache-name }}
-
-      # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
-      #   name: build deps
-      #   working-directory: ${{ github.workspace }}
-      #   continue-on-error: true
-      #   run: ./build_release_macos.sh -d -a ${{matrix.arch}}
-      - name: Download and extract deps
-        if: matrix.os == 'macos-12'
-        working-directory: ${{ github.workspace }}
-        run: |
-          curl -LJO https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz
-          tar -zvxf ./OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz -C ${{ github.workspace }}/deps/build_${{matrix.arch}}
-          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_${{matrix.arch}}
-          tree ${{ github.workspace }}/deps/build_${{matrix.arch}}
-          rm ./OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz
-
+          brew install cmake git gettext tree ninja
+          brew list
+          mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
+          mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
+          tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
 
       - name: Build slicer mac
-        if: matrix.os == 'macos-12'
+        if: inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-          ./build_release_macos.sh -s -n -a ${{matrix.arch}}
+          ./build_release_macos.sh -s -n -x -a ${{inputs.arch}} -t 10.15
 
  # Thanks to RaySajuuk, it's working now
       - name: Sign app and notary
-        if: github.ref == 'refs/heads/main' && matrix.os == 'macos-12'
+        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -125,109 +108,119 @@ jobs:
           security import $CERTIFICATE_PATH -P $P12_PASSWORD -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $P12_PASSWORD $KEYCHAIN_PATH
-          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_${{matrix.arch}}/OrcaSlicer/OrcaSlicer.app
-          ln -s /Applications ${{ github.workspace }}/build_${{matrix.arch}}/OrcaSlicer/Applications
-          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{matrix.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{matrix.arch}}_V${{ env.ver }}.dmg
-          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_${{matrix.arch}}_V${{ env.ver }}.dmg
+          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/OrcaSlicer.app
+          ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
           xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
-          xcrun notarytool submit "OrcaSlicer_Mac_${{matrix.arch}}_V${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
-          xcrun stapler staple OrcaSlicer_Mac_${{matrix.arch}}_V${{ env.ver }}.dmg
+          xcrun notarytool submit "OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
+          xcrun stapler staple OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
 
       - name: Create DMG without notary
-        if: github.ref != 'refs/heads/main' && matrix.os == 'macos-12'
+        if: github.ref != 'refs/heads/main' && inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-          ln -s /Applications ${{ github.workspace }}/build_${{matrix.arch}}/OrcaSlicer/Applications
-          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{matrix.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{matrix.arch}}_V${{ env.ver }}.dmg
+          ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
 
       - name: Upload artifacts mac
-        if: matrix.os == 'macos-12'
-        uses: actions/upload-artifact@v3
+        if: inputs.os == 'macos-12'
+        uses: actions/upload-artifact@v4
         with:
-          name: OrcaSlicer_Mac_${{matrix.arch}}_V${{ env.ver }}
-          path: ${{ github.workspace }}/OrcaSlicer_Mac_${{matrix.arch}}_V${{ env.ver }}.dmg
+          name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}
+          path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+
+      - name: Deploy Mac release
+        if: github.ref == 'refs/heads/main' && inputs.os == 'macos-12'
+        uses: WebFreak001/deploy-nightly@v3.1.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          asset_name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          asset_content_type: application/octet-stream 
+          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
 
 # Windows
       - name: setup MSVC
-        if: matrix.os == 'windows-latest'
-        uses: microsoft/setup-msbuild@v1.1
+        if: inputs.os == 'windows-latest'
+        uses: microsoft/setup-msbuild@v2
 
       - name: Install nsis
-        if: matrix.os == 'windows-latest'
+        if: inputs.os == 'windows-latest'
         run: |
           dir "C:/Program Files (x86)/Windows Kits/10/Include"
           choco install nsis
 
-      - name: download deps
-        if: matrix.os == 'windows-latest'
-        shell: powershell
-        run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_win64_20230810_vs2022.zip", "$env:temp\OrcaSlicer_dep_win64_20230810_vs2022.zip")'
-
-      - name: maker dir
-        if: matrix.os == 'windows-latest'
-        working-directory: ${{ github.workspace }}
-        run: |
-          mkdir ${{ github.workspace }}/deps/build
-          mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-
-      - name: extract deps
-        if: matrix.os == 'windows-latest'
-        working-directory: ${{ github.workspace }}/deps/build
-        shell: cmd
-        run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_win64_20230810_vs2022.zip'
-      
-      # - name: build deps
-        # if: matrix.os == 'windows-latest'
-        #   id: cache_deps
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps
-      #   with:
-      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}
-
-      # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
-      #   name: build deps
-      #   working-directory: ${{ github.workspace }}
-      #   continue-on-error: true
-      #   run: .\build_release_vs2022.bat deps
-    
-      # - run:  Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force
-
       - name: Build slicer Win
-        if: matrix.os == 'windows-latest'
+        if: inputs.os == 'windows-latest'
         working-directory: ${{ github.workspace }}
         run: .\build_release_vs2022.bat slicer
 
       - name: Create installer Win
-        if: matrix.os == 'windows-latest'
+        if: inputs.os == 'windows-latest'
         working-directory: ${{ github.workspace }}/build
         run: |
           cpack -G NSIS
 
-      # - name: pack app
-        # if: matrix.os == 'windows-latest'
-        #   working-directory: ${{ github.workspace }}/build
-      #   shell: cmd
-      #   run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_dev_build.zip ${{ github.workspace }}/build/OrcaSlicer'
+      - name: Pack app
+        if: inputs.os == 'windows-latest'
+        working-directory: ${{ github.workspace }}/build
+        shell: cmd
+        run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_Windows_${{ env.ver }}_portable.zip ${{ github.workspace }}/build/OrcaSlicer'
 
+      - name: Pack PDB
+        if: inputs.os == 'windows-latest'
+        working-directory: ${{ github.workspace }}/build/src/Release
+        shell: cmd
+        run: '"C:/Program Files/7-Zip/7z.exe" a -m0=lzma2 -mx9 Debug_PDB_${{ env.ver }}_for_developers_only.7z  *.pdb'
+          
       - name: Upload artifacts Win zip
-        if: matrix.os == 'windows-latest'
-        uses: actions/upload-artifact@v3
+        if: inputs.os == 'windows-latest'
+        uses: actions/upload-artifact@v4
         with:
-          name: OrcaSlicer_Windows_V${{ env.ver }}_portable
-          path: ${{ github.workspace }}/build/OrcaSlicer
+          name: OrcaSlicer_Windows_${{ env.ver }}_portable
+          path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
 
       - name: Upload artifacts Win installer
-        if: matrix.os == 'windows-latest'
-        uses: actions/upload-artifact@v3
+        if: inputs.os == 'windows-latest'
+        uses: actions/upload-artifact@v4
         with:
-          name: OrcaSlicer_Windows_V${{ env.ver }}
+          name: OrcaSlicer_Windows_${{ env.ver }}
           path: ${{ github.workspace }}/build/OrcaSlicer*.exe
-# Ubuntu
 
+      - name: Upload artifacts Win PDB
+        if: inputs.os == 'windows-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: PDB
+          path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
+
+      - name: Deploy Windows release portable
+        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        uses: WebFreak001/deploy-nightly@v3.1.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
+          asset_name: OrcaSlicer_Windows_${{ env.ver }}_portable.zip
+          asset_content_type: application/x-zip-compressed 
+          max_releases: 1 
+
+      - name: Deploy Windows release installer
+        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        uses: WebFreak001/deploy-nightly@v3.1.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
+          asset_name: OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
+          asset_content_type: application/x-msdownload
+          max_releases: 1 
+
+# Ubuntu
       - name: Install dependencies
-        if: matrix.os == 'ubuntu-20.04'
+        if: inputs.os == 'ubuntu-20.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y autoconf build-essential cmake curl eglexternalplatform-dev \
@@ -237,52 +230,57 @@ jobs:
           libwebkit2gtk-4.0-dev libxkbcommon-dev locales locales-all m4 pkgconf sudo wayland-protocols wget
 
       - name: Install dependencies from BuildLinux.sh
-        if: matrix.os == 'ubuntu-20.04'
+        if: inputs.os == 'ubuntu-20.04'
         shell: bash
         run: sudo ./BuildLinux.sh -ur
 
       - name: Fix permissions
-        if: matrix.os == 'ubuntu-20.04'
+        if: inputs.os == 'ubuntu-20.04'
         shell: bash
         run: sudo chown $USER -R ./
-      # - name: Build deps
-        # if: matrix.os == 'ubuntu-20.04'
-        #   id: cache_deps
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
-      #   with:
-      #     path: ${{ github.workspace }}/deps/build/destdir
-      #     key: build-${{ env.cache-name }}
-
-      # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
-      #   name: Build deps
-      #   working-directory: ${{ github.workspace }}
-      #   continue-on-error: true
-      #   run: ./BuildLinux.sh -dr
-      - name: Download and extract deps
-        if: matrix.os == 'ubuntu-20.04'
-        working-directory: ${{ github.workspace }}
-        run: |
-          mkdir -p ${{ github.workspace }}/deps/build
-          mkdir -p ${{ github.workspace }}/deps/build/destdir
-          curl -LJO https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_ubuntu_20231008.zip
-          unzip ./OrcaSlicer_dep_ubuntu_20231008.zip -d ${{ github.workspace }}/deps/build/destdir
-          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/destdir
-          ls -l ${{ github.workspace }}/deps/build/destdir
-          rm OrcaSlicer_dep_ubuntu_20231008.zip
-
 
       - name: Build slicer
-        if: matrix.os == 'ubuntu-20.04'
+        if: inputs.os == 'ubuntu-20.04'
         shell: bash
         run: |
           ./BuildLinux.sh -isr
-          chmod +x ./build/OrcaSlicer_ubu64.AppImage
-        
+          mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
+          chmod +x ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
+
+      - name: Build orca_custom_preset_tests
+        if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04'
+        working-directory: ${{ github.workspace }}/build/src
+        shell: bash
+        run: |
+          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -g 1
+          cd ${{ github.workspace }}/resources/profiles
+          zip -r orca_custom_preset_tests.zip user/
+
       - name: Upload artifacts Ubuntu
-        if: matrix.os == 'ubuntu-20.04'
-        uses: actions/upload-artifact@v3
+        if: inputs.os == 'ubuntu-20.04'
+        uses: actions/upload-artifact@v4
         with:
-          name: OrcaSlicer_Linux_V${{ env.ver }}
-          path: './build/OrcaSlicer_ubu64.AppImage'
+          name: OrcaSlicer_Linux_${{ env.ver }}
+          path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage'
+
+      - name: Deploy Ubuntu release
+        if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04'
+        uses: WebFreak001/deploy-nightly@v3.1.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
+          asset_name: OrcaSlicer_Linux_${{ env.ver }}.AppImage
+          asset_content_type: application/octet-stream
+          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
+
+      - name: Deploy orca_custom_preset_tests
+        if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04'
+        uses: WebFreak001/deploy-nightly@v3.1.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip
+          asset_name: orca_custom_preset_tests.zip
+          asset_content_type: application/octet-stream
+          max_releases: 1 

.github/workflows/check_locale.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:  
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install gettext 
         run: |

.github/workflows/check_profiles.yml

@@ -0,0 +1,39 @@
+name: Check profiles
+on: 
+    pull_request:
+      branches: 
+       - main 
+      paths:
+       - 'resources/profiles/**'
+       - ".github/workflows/check_profiles.yml"
+
+jobs:
+  check_translation:
+    name: Check profiles
+    runs-on: ubuntu-22.04
+    steps:  
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # download
+      - name: Download 
+        working-directory: ${{ github.workspace }}
+        run: |
+          curl -LJO https://github.com/SoftFever/Orca_tools/releases/download/1/OrcaSlicer_profile_validator
+          chmod +x ./OrcaSlicer_profile_validator
+
+      # validate profiles
+      - name: validate system profiles
+        run: |
+          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
+
+      - name: validate custom presets
+        working-directory: ${{ github.workspace }}
+        run: |
+          curl -LJO https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
+          unzip ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
+          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
+
+
+
+        

.github/workflows/orca_bot.yml

@@ -4,22 +4,62 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
-  close-issues:
+  stale:
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
+      contents: write # only for delete-branch option
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
-          days-before-issue-stale: 90
-          days-before-issue-close: 14
-          operations-per-run: 1000
-          stale-issue-label: "stale"
-          stale-issue-message: "GitHub bot: this issue is stale because it has been open for 90 days with no activity."
-          close-issue-message: "GitHub bot: This issue was closed because it has been inactive for 14 days since being marked as stale."
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          remove-issue-stale-when-updated: true
-          remove-pr-stale-when-updated: true 
+          # PAT for GitHub API authentication
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          # Max number of operations per run
+          operations-per-run: 1000
+          # Order to get issues/PRs
+          ascending: true
+
+          # ISSUES
+          # Do not auto-close an issue if it is assigned to a milestone
+          exempt-all-issue-milestones: true
+          # Exempt all issues with assignees from stale
+          exempt-all-issue-assignees: true
+          # Idle number of days before marking issues stale
+          days-before-issue-stale: 90
+          # Idle number of days before marking issues close
+          days-before-issue-close: 7
+          # Label to apply on staled issues
+          stale-issue-label: "stale"
+          # Issue close reason
+          close-issue-reason: not_planned
+          # Remove stale label from issues on updates
+          remove-issue-stale-when-updated: true
+          # Issue stale message
+          stale-issue-message: "Orca bot: this issue is stale because it has been open for 90 days with no activity."
+          # Issue closure message
+          close-issue-message: "Orca bot: This issue was closed because it has been inactive for 7 days since being marked as stale."
+
+          # PRs
+          # Do not auto-close a PR if it is assigned to a milestone
+          exempt-all-pr-milestones: true
+          # Exempt all PRs with assignees from stale
+          exempt-all-pr-assignees: true
+          # Skip the stale action for draft PRs
+          exempt-draft-pr: true
+          # Idle number of days before marking PRs stale
+          days-before-pr-stale: -1
+          # Idle number of days before marking PRs close
+          days-before-pr-close: -1
+          # Label to apply on staled PRs
+          stale-pr-label: "stale"
+          # Label to apply on closed PRs
+          close-pr-label: not_planned
+          # Remove stale label from PRs on updates
+          remove-pr-stale-when-updated: true
+          # PR stale message
+          stale-pr-message: "Orca bot: this PR is stale because it has been open for XX days with no activity."
+          # PR closure message
+          close-pr-message: "Orca bot: This PR was closed because it has been inactive for X days since being marked as stale."
+          # Delete branch after closing a stale PR
+          delete-branch: true

.github/workflows/publish_docs_to_wiki.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:  
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # 1. Clone the current wiki master branch to a folder named `tmp_wiki`
       - name: Pull content from wiki

.gitignore

@@ -1,7 +1,7 @@
 Build
 Build.bat
 /build*/
-deps/build
+deps/build*
 MYMETA.json
 MYMETA.yml
 _build
@@ -26,4 +26,10 @@ SVG
 src/OrcaSlicer-doc/
 .idea/
 /.cache/
-*.mo
+*.mo
+**/process_full/
+**/machine_full/
+**/filament_full/
+/deps/DL_CACHE/
+/deps/DL_CACHE
+resources/profiles/user/default

BuildLinux.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e # exit on first error
 
 export ROOT=`pwd`
 export NCORES=`nproc --all`
@@ -7,6 +6,8 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${NCORES}
 FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
 FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
 
+set -e # exit on first error
+
 function check_available_memory_and_disk() {
     FREE_MEM_GB=$(free -g -t | grep 'Mem:' | rev | cut -d" " -f1 | rev)
     MIN_MEM_GB=10
@@ -77,7 +78,7 @@ then
 fi
 
 # Addtional Dev packages for OrcaSlicer
-export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
+export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules texinfo"
 # libwebkit2gtk-4.1-dev ??
 export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
 if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then
@@ -162,9 +163,10 @@ then
     fi
     if [[ -n "$BUILD_DEBUG" ]]
     then
-        # have to build deps with debug & release or the cmake won't find evrything it needs
+        # have to build deps with debug & release or the cmake won't find everything it needs
         mkdir deps/build/release
         pushd deps/build/release
+            echo -e "cmake ../.. -DDESTDIR=\"../destdir\" $BUILD_ARGS"
             cmake ../.. -DDESTDIR="../destdir" $BUILD_ARGS
             make -j$NCORES
         popd
@@ -173,6 +175,7 @@ then
     
     # cmake deps
     pushd deps/build
+        echo "cmake .. $BUILD_ARGS"
         cmake .. $BUILD_ARGS
         echo "done"
         
@@ -224,12 +227,16 @@ then
     
     # cmake
     pushd build
-        cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}
+        echo -e "cmake .. -DCMAKE_PREFIX_PATH=\"$PWD/../deps/build/destdir/usr/local\" -DSLIC3R_STATIC=1 -DORCA_TOOLS=ON ${BUILD_ARGS}"
+        cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS} -DORCA_TOOLS=ON 
         echo "done"
         
         # make Slic3r
         echo "[8/9] Building Slic3r..."
         make -j$NCORES OrcaSlicer # Slic3r
+
+        # make OrcaSlicer_profile_validator
+        make -j$NCORES OrcaSlicer_profile_validator
     popd
     ./run_gettext.sh
     echo "done"

CMakeLists.txt

@@ -1,4 +1,13 @@
 cmake_minimum_required(VERSION 3.13)
+
+if (APPLE)
+    # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
+    if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
+    endif ()
+    message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+endif ()
+
 project(OrcaSlicer)
 
 include("version.inc")
@@ -52,14 +61,15 @@ if (APPLE)
     if (CMAKE_MACOSX_BUNDLE)
         set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
     endif()
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
     SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer")
 
+    message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
 endif ()
 
 # Proposal for C++ unit tests and sandboxes
 option(SLIC3R_BUILD_SANDBOXES   "Build development sandboxes" OFF)
 option(SLIC3R_BUILD_TESTS       "Build unit tests" OFF)
+option(ORCA_TOOLS       "Build Orca tools" OFF)
 
 if (IS_CROSS_COMPILE)
     message("Detected cross compilation setup. Tests and encoding checks will be forcedly disabled!")
@@ -252,6 +262,10 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
         add_compile_options(-Wno-deprecated-declarations)
     endif()
 
+    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15)
+        add_compile_options(-Wno-error=enum-constexpr-conversion)
+    endif()
+
     #GCC generates loads of -Wunknown-pragmas when compiling igl. The fix is not easy due to a bug in gcc, see
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66943 or
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431
@@ -306,7 +320,7 @@ if(WIN32)
     add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
     if(MSVC)
         # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
-        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -DBOOST_SYSTEM_USE_UTF8 )
+        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 )
         # Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
         add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
         add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@@ -332,6 +346,16 @@ if(CMAKE_CXX_FLAGS_RELWITHDEBINFO MATCHES "/O2")
     string(REGEX REPLACE "/O2" "/Od" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 endif()
 
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES "-O2")
+        string(REGEX REPLACE "-O2" "-O0" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+    endif()
+
+    if(CMAKE_CXX_FLAGS_RELWITHDEBINFO MATCHES "-O2")
+        string(REGEX REPLACE "-O2" "-O0" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    endif()
+endif()
+
 if(MSVC)
     if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES "/Ob1")
         string(REGEX REPLACE "/Ob1" "/Ob0" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
@@ -359,7 +383,7 @@ endif()
 # boost::process was introduced first in version 1.64.0,
 # boost::beast::detail::base64 was introduced first in version 1.66.0
 set(MINIMUM_BOOST_VERSION "1.66.0")
-set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams")
+set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;program_options")
 find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
 
 add_library(boost_libs INTERFACE)
@@ -426,11 +450,8 @@ find_package(TBB REQUIRED)
 # add_definitions(-DTBB_USE_CAPTURED_EXCEPTION=0)
 
 find_package(OpenSSL REQUIRED)
-if (APPLE)
-find_package(CURL CONFIG REQUIRED)
-else()
 find_package(CURL REQUIRED)
-endif()
+
 
 add_library(libcurl INTERFACE)
 target_link_libraries(libcurl INTERFACE CURL::libcurl)
@@ -499,6 +520,8 @@ find_package(PNG REQUIRED)
 set(OpenGL_GL_PREFERENCE "LEGACY")
 find_package(OpenGL REQUIRED)
 
+set(GLEW_ROOT "${CMAKE_PREFIX_PATH}")
+message("GLEW_ROOT: ${GLEW_ROOT}")
 # Find glew or use bundled version
 if (SLIC3R_STATIC AND NOT SLIC3R_STATIC_EXCLUDE_GLEW)
     set(GLEW_USE_STATIC_LIBS ON)
@@ -511,9 +534,11 @@ find_package(glfw3 REQUIRED)
 
 # Find the Cereal serialization library
 find_package(cereal REQUIRED)
-set_target_properties(cereal PROPERTIES IMPORTED_GLOBAL TRUE)
 if (NOT TARGET cereal::cereal)
+    set_target_properties(cereal PROPERTIES IMPORTED_GLOBAL TRUE)
     add_library(cereal::cereal ALIAS cereal)
+else ()
+    set_target_properties(cereal::cereal PROPERTIES IMPORTED_GLOBAL TRUE)
 endif ()
 
 # l10n
@@ -752,7 +777,7 @@ set (CPACK_PACKAGE_VENDOR "SoftFever")
 set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}")
 set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
 set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
-set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_${SoftFever_VERSION}")
+set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_V${SoftFever_VERSION}")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers")
 set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
@@ -774,4 +799,4 @@ set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) # must also in
 
 set(CPACK_WIX_UPGRADE_GUID "058245e8-20e0-4a95-9ab7-1acfe17ad511")
 set(CPACK_GENERATOR NSIS)
-include(CPack)
+include(CPack)

README.md

@@ -1,39 +1,48 @@
-[![Build OrcaSlicer](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_orca.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_orca.yml)  
-
+[![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.   
-You can download Orca Slicer here: [github releases page](https://github.com/SoftFever/OrcaSlicer/releases/).  
+
 ![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)   
 
 # Main features
 - Auto calibrations for all printers
 - Sandwich(inner-outer-inner) mode - an improved version of the `External perimeters first` mode
-- Precise wall
+- [Precise wall](https://github.com/SoftFever/OrcaSlicer/wiki/Precise-wall)
 - 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/)  
 
-### Some background
-OrcaSlicer is fork of Bambu Studio  
-It was previously known as BambuStudio-SoftFever  
-Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. 
-Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
-Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)  
+
+# Download
+
+### Stable Release
+📥 **[Download the Latest Stable Release](https://github.com/SoftFever/OrcaSlicer/releases/latest)**  
+Visit our GitHub Releases page for the latest stable version of Orca Slicer, recommended for most users.
+
+### Nightly Builds
+🌙 **[Download the Latest Nightly Build](https://github.com/SoftFever/OrcaSlicer/releases/tag/nightly-builds)**  
+Explore the latest developments in Orca Slicer with our nightly builds. Feedback on these versions is highly appreciated.
+
 
 # How to install
 **Windows**: 
-1.  Install and run  
+1.  Download the installer for your preferred version from the [releases page](https://github.com/SoftFever/OrcaSlicer/releases).
+    - *For convenience there is also a portable build available.*
     - *If you have troubles to run the build, you might need to install following runtimes:*
-      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)  
-      - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)  
+      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
+          - [Details of this runtime](https://aka.ms/webview2)
+          - [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703)
+      - [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
+          -  [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe)
+          -  This file may already be available on your computer if you've installed visual studio.  Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142`
 
 **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 bellow*  
+3. *If you want to run a build from a PR, you also need following instructions below*  
     <details quarantine>
-    - Option 1 (You only need to do this once. After that the app can be oppened normally.):
+    - 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**.
       - Step 2: A warning window will pop up, click _Open_  
       
@@ -51,17 +60,31 @@ Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr
     
 **Linux(Ubuntu)**:
  1. If you run into trouble to execute it, try this command in terminal:  
-    `chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
+    `chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage`
+    
 # How to compile
 - Windows 64-bit  
-  - Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
+  - 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/).
   - 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
+  - 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``
+      - 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
 
-- Ubuntu  
+- Ubuntu 
+  - Dependencies **Will be auto installed with the shell script**: `libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git texinfo`
   - run 'sudo ./BuildLinux.sh -u'
   - run './BuildLinux.sh -dsir'
 
@@ -109,6 +132,14 @@ Ko-fi supporters: [Backers list](https://github.com/SoftFever/OrcaSlicer/wiki/Or
 Support me  
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/G2G5IP3CP)
 
+## Some background
+OrcaSlicer is originaly forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
+
+Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. 
+Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
+Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)  
+
+
 # License
 Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on Bambu Studio by BambuLab.
 

SECURITY.md

@@ -0,0 +1,32 @@
+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.
+
+Report security bugs by emailing the lead maintainer at softfeverever@gmail.com and include the word "SECURITY" in the subject line.
+
+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.
+
+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.
+
+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.
+
+Below are some recommendations for security disclosures:
+
+OrcaSlicer security contact { contact: mailto:softfeverever@gmail.com] }
+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.
+
+...SEE SOMETHING
+...SAY SOMETHING
+1)...SEE SOMETHING
+We suggest you goto #2 if this happens.
+
+Why? Through experience we have found it is best to goto #2 in this situation.

build_release.bat

@@ -1,26 +1,50 @@
 set WP=%CD%
+
+set debug=OFF
+set debuginfo=OFF
+if "%1"=="debug" set debug=ON
+if "%2"=="debug" set debug=ON
+if "%1"=="debuginfo" set debuginfo=ON
+if "%2"=="debuginfo" set debuginfo=ON
+if "%debug%"=="ON" (
+    set build_type=Debug
+    set build_dir=build-dbg
+) else (
+    if "%debuginfo%"=="ON" (
+        set build_type=RelWithDebInfo
+        set build_dir=build-dbginfo
+    ) else (
+        set build_type=Release
+        set build_dir=build
+    )
+)
+echo build type set to %build_type%
+
 cd deps
-mkdir build
-cd build
+mkdir %build_dir%
+cd %build_dir%
 set DEPS=%CD%/OrcaSlicer_dep
 if "%1"=="slicer" (
     GOTO :slicer
 )
 echo "building deps.."
-cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config Release --target deps -- -m
+
+echo cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake --build . --config %build_type% --target deps -- -m
 
 if "%1"=="deps" exit /b 0
 
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir build 
-cd build
+mkdir %build_dir%
+cd %build_dir%
 
-cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
-cmake --build . --config Release --target ALL_BUILD -- -m
+echo cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type%
+cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
+cmake --build . --config %build_type% --target ALL_BUILD -- -m
 cd ..
 call run_gettext.bat
-cd build
-cmake --build . --target install --config Release
+cd %build_dir%
+cmake --build . --target install --config %build_type%

build_release_macos.sh

@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
-while getopts ":a:sdphn" opt; do
-  case ${opt} in
+set -e
+set -o pipefail
+
+while getopts ":dpa:snt:xbc:h" opt; do
+  case "${opt}" in
     d )
         export BUILD_TARGET="deps"
         ;;
@@ -17,87 +20,204 @@ while getopts ":a:sdphn" opt; do
     n )
         export NIGHTLY_BUILD="1"
         ;;
+    t )
+        export OSX_DEPLOYMENT_TARGET="$OPTARG"
+        ;;
+    x )
+        export SLICER_CMAKE_GENERATOR="Ninja"
+        export SLICER_BUILD_TARGET="all"
+        export DEPS_CMAKE_GENERATOR="Ninja"
+        ;;
+    b )
+        export BUILD_ONLY="1"
+        ;;
+    c )
+        export BUILD_CONFIG="$OPTARG"
+        ;;
     h ) echo "Usage: ./build_release_macos.sh [-d]"
         echo "   -d: Build deps only"
         echo "   -a: Set ARCHITECTURE (arm64 or x86_64)"
         echo "   -s: Build slicer only"
         echo "   -n: Nightly build"
+        echo "   -t: Specify minimum version of the target platform, default is 11.3"
+        echo "   -x: Use Ninja CMake generator, default is Xcode"
+        echo "   -b: Build without reconfiguring CMake"
+        echo "   -c: Set CMake build configuration, default is Release"
         exit 0
         ;;
+    * )
+        ;;
   esac
 done
 
-if [ -z "$ARCH" ]
-then
-  export ARCH=$(uname -m)
+# Set defaults
+
+if [ -z "$ARCH" ]; then
+  ARCH="$(uname -m)"
+  export ARCH
 fi
 
-echo "Arch: $ARCH"
-echo "BUILD_TARGET: $BUILD_TARGET"
-
-if which -s brew; then
-	brew --prefix libiconv
-	brew --prefix zstd
-	export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
-elif which -s port; then
-	port install libiconv
-	port install zstd
-	export LIBRARY_PATH=$LIBRARY_PATH:/opt/local/lib
-else
-	echo "Need either brew or macports to successfully build deps"
-	exit 1
+if [ -z "$BUILD_CONFIG" ]; then
+  export BUILD_CONFIG="Release"
 fi
 
-WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd $WD/deps
-mkdir -p build_$ARCH
-cd build_$ARCH
-DEPS=$PWD/OrcaSlicer_dep_$ARCH
-mkdir -p $DEPS
-if [ "slicer." != $BUILD_TARGET. ]; 
-then
-    echo "building deps..."
-    echo "cmake ../ -DDESTDIR=$DEPS -DOPENSSL_ARCH=darwin64-${ARCH}-cc -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}"
-    cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-${ARCH}-cc" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}
-    cmake --build . --config Release --target deps 
-    if [ "1." == "$PACK_DEPS". ];
-    then
-        tar -zcvf OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz OrcaSlicer_dep_$ARCH
-    fi
+if [ -z "$BUILD_TARGET" ]; then
+  export BUILD_TARGET="all"
 fi
 
-
-if [ "deps." == "$BUILD_TARGET". ];
-then
-    exit 0
+if [ -z "$SLICER_CMAKE_GENERATOR" ]; then
+  export SLICER_CMAKE_GENERATOR="Xcode"
 fi
 
-cd $WD
-mkdir -p build_$ARCH
-cd build_$ARCH
-echo "building slicer..."
-cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH}
-cmake --build . --config Release --target ALL_BUILD 
-cd ..
-./run_gettext.sh
-cd build_$ARCH
-mkdir -p OrcaSlicer
-cd OrcaSlicer
-rm -r ./OrcaSlicer.app
-cp -pR ../src/Release/OrcaSlicer.app ./OrcaSlicer.app
-resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
-rm ./OrcaSlicer.app/Contents/Resources
-cp -R $resources_path ./OrcaSlicer.app/Contents/Resources
-# delete .DS_Store file
-find ./OrcaSlicer.app/ -name '.DS_Store' -delete
-# extract version
-# export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
-# ver="_V${ver//\"}"
-# echo $PWD
-# if [ "1." != "$NIGHTLY_BUILD". ];
-# then
-#     ver=${ver}_dev
+if [ -z "$SLICER_BUILD_TARGET" ]; then
+  export SLICER_BUILD_TARGET="ALL_BUILD"
+fi
+
+if [ -z "$DEPS_CMAKE_GENERATOR" ]; then
+  export DEPS_CMAKE_GENERATOR="Unix Makefiles"
+fi
+
+if [ -z "$OSX_DEPLOYMENT_TARGET" ]; then
+  export OSX_DEPLOYMENT_TARGET="11.3"
+fi
+
+echo "Build params:"
+echo " - ARCH: $ARCH"
+echo " - BUILD_CONFIG: $BUILD_CONFIG"
+echo " - BUILD_TARGET: $BUILD_TARGET"
+echo " - CMAKE_GENERATOR: $SLICER_CMAKE_GENERATOR for Slicer, $DEPS_CMAKE_GENERATOR for deps"
+echo " - OSX_DEPLOYMENT_TARGET: $OSX_DEPLOYMENT_TARGET"
+echo
+
+# if which -s brew; then
+# 	brew --prefix libiconv
+# 	brew --prefix zstd
+# 	export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
+# elif which -s port; then
+# 	port install libiconv
+# 	port install zstd
+# 	export LIBRARY_PATH=$LIBRARY_PATH:/opt/local/lib
+# else
+# 	echo "Need either brew or macports to successfully build deps"
+# 	exit 1
 # fi
 
+PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
+DEPS_DIR="$PROJECT_DIR/deps"
+DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
+DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
 
-# zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app
+# Fix for Multi-config generators
+if [ "$SLICER_CMAKE_GENERATOR" == "Xcode" ]; then
+    export BUILD_DIR_CONFIG_SUBDIR="/$BUILD_CONFIG"
+else
+    export BUILD_DIR_CONFIG_SUBDIR=""
+fi
+
+function build_deps() {
+    echo "Building deps..."
+    (
+        set -x
+        mkdir -p "$DEPS"
+        cd "$DEPS_BUILD_DIR"
+        if [ "1." != "$BUILD_ONLY". ]; then
+            cmake .. \
+                -G "${DEPS_CMAKE_GENERATOR}" \
+                -DDESTDIR="$DEPS" \
+                -DOPENSSL_ARCH="darwin64-${ARCH}-cc" \
+                -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
+                -DCMAKE_OSX_ARCHITECTURES:STRING="${ARCH}" \
+                -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
+        fi
+        cmake --build . --config "$BUILD_CONFIG" --target deps
+    )
+}
+
+function pack_deps() {
+    echo "Packing deps..."
+    (
+        set -x
+        mkdir -p "$DEPS"
+        cd "$DEPS_BUILD_DIR"
+        tar -zcvf "OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "OrcaSlicer_dep_$ARCH"
+    )
+}
+
+function build_slicer() {
+    echo "Building slicer..."
+    (
+        set -x
+        mkdir -p "$PROJECT_BUILD_DIR"
+        cd "$PROJECT_BUILD_DIR"
+        if [ "1." != "$BUILD_ONLY". ]; then
+            cmake .. \
+                -G "${SLICER_CMAKE_GENERATOR}" \
+                -DBBL_RELEASE_TO_PUBLIC=1 \
+                -DCMAKE_PREFIX_PATH="$DEPS/usr/local" \
+                -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" \
+                -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
+                -DCMAKE_MACOSX_RPATH=ON \
+                -DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \
+                -DCMAKE_MACOSX_BUNDLE=ON \
+                -DCMAKE_OSX_ARCHITECTURES="${ARCH}" \
+                -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
+        fi
+        cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
+    )
+
+    echo "Verify localization with gettext..."
+    (
+        cd "$PROJECT_DIR"
+        ./run_gettext.sh
+    )
+
+    echo "Fix macOS app package..."
+    (
+        cd "$PROJECT_BUILD_DIR"
+        mkdir -p OrcaSlicer
+        cd OrcaSlicer
+        # remove previously built app
+        rm -rf ./OrcaSlicer.app
+        # fully copy newly built app
+        cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer.app" ./OrcaSlicer.app
+        # fix resources
+        resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
+        rm ./OrcaSlicer.app/Contents/Resources
+        cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources
+        # delete .DS_Store file
+        find ./OrcaSlicer.app/ -name '.DS_Store' -delete
+    )
+
+    # extract version
+    # export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+    # ver="_V${ver//\"}"
+    # echo $PWD
+    # if [ "1." != "$NIGHTLY_BUILD". ];
+    # then
+    #     ver=${ver}_dev
+    # fi
+
+    # zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app
+}
+
+case "${BUILD_TARGET}" in
+    all)
+        build_deps
+        build_slicer
+        ;;
+    deps)
+        build_deps
+        ;;
+    slicer)
+        build_slicer
+        ;;
+    *)
+        echo "Unknown target: $BUILD_TARGET. Available targets: deps, slicer, all."
+        exit 1
+        ;;
+esac
+
+if [ "1." == "$PACK_DEPS". ]; then
+    pack_deps
+fi

build_release_vs2022.bat

@@ -13,10 +13,30 @@ if "%1"=="pack" (
     exit /b 0
 )
 
+set debug=OFF
+set debuginfo=OFF
+if "%1"=="debug" set debug=ON
+if "%2"=="debug" set debug=ON
+if "%1"=="debuginfo" set debuginfo=ON
+if "%2"=="debuginfo" set debuginfo=ON
+if "%debug%"=="ON" (
+    set build_type=Debug
+    set build_dir=build-dbg
+) else (
+    if "%debuginfo%"=="ON" (
+        set build_type=RelWithDebInfo
+        set build_dir=build-dbginfo
+    ) else (
+        set build_type=Release
+        set build_dir=build
+    )
+)
+echo build type set to %build_type%
+
 setlocal DISABLEDELAYEDEXPANSION 
 cd deps
-mkdir build
-cd build
+mkdir %build_dir%
+cd %build_dir%
 set DEPS=%CD%/OrcaSlicer_dep
 
 if "%1"=="slicer" (
@@ -24,22 +44,22 @@ if "%1"=="slicer" (
 )
 echo "building deps.."
 
-
-cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config Release --target deps -- -m
+echo cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake --build . --config %build_type% --target deps -- -m
 
 if "%1"=="deps" exit /b 0
 
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir build 
-cd build
+mkdir %build_dir%
+cd %build_dir%
 
-echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release
-cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0"
-cmake --build . --config Release --target ALL_BUILD -- -m
+echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type%
+cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0"
+cmake --build . --config %build_type% --target ALL_BUILD -- -m
 cd ..
 call run_gettext.bat
-cd build
-cmake --build . --target install --config Release
+cd %build_dir%
+cmake --build . --target install --config %build_type%

cmake/modules/FindGLEW.cmake

@@ -64,16 +64,6 @@ This module defines the following variables:
 
 include(FindPackageHandleStandardArgs)
 
-find_package(GLEW CONFIG QUIET)
-
-if(GLEW_FOUND)
-  find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_CONFIG)
-  return()
-endif()
-
-if(GLEW_VERBOSE)
-  message(STATUS "FindGLEW: did not find GLEW CMake config file. Searching for libraries.")
-endif()
 
 if(APPLE)
   find_package(OpenGL QUIET)

cmake/modules/MacOSXBundleInfo.plist.in

@@ -26,6 +26,17 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+  <key>CFBundleURLTypes</key>
+  <array>
+    <dict>
+      <key>CFBundleURLName</key>
+      <string>orcasliceropen url</string>
+      <key>CFBundleURLSchemes</key>
+      <array>
+        <string>orcasliceropen</string>
+      </array>
+    </dict>
+  </array>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -35,7 +46,7 @@
 			<string>STL</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>stl.icns</string>
+			<string>images/stl.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>STL</string>
 			<key>CFBundleTypeRole</key>
@@ -52,7 +63,7 @@
 			<string>OBJ</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>OrcaSlicer.icns</string>
+			<string>images/OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>STL</string>
 			<key>CFBundleTypeRole</key>
@@ -69,7 +80,7 @@
 			<string>AMF</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>OrcaSlicer.icns</string>
+			<string>images/OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>AMF</string>
 			<key>CFBundleTypeRole</key>
@@ -86,7 +97,7 @@
 			<string>3MF</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>OrcaSlicer.icns</string>
+			<string>images/OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>3MF</string>
 			<key>CFBundleTypeRole</key>
@@ -103,7 +114,7 @@
 			<string>GCODE</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>gcode.icns</string>
+			<string>images/gcode.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>GCODE</string>
 			<key>CFBundleTypeRole</key>

deps/Boost/Boost.cmake

@@ -1,203 +1,25 @@
-include(ExternalProject)
 
-# Use boost 1.78 for Windows, to support VS2022
-if (WIN32)
-	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.gz")
-	set(_boost_hash 94CED8B72956591C4775AE2207A9763D3600B30D9D7446562C552F0A14A63BE7)
-    set(_bootstrap_cmd bootstrap.bat)
-    set(_build_cmd  b2.exe)
-else()
-	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz")
-	set(_boost_hash AEB26F80E80945E82EE93E5939BAEBDCA47B9DEE80A07D3144BE1E1A6A66DD6A)
-    set(_bootstrap_cmd ./bootstrap.sh)
-    set(_build_cmd ./b2)
-endif()
-
-set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam)
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
-    set(_boost_toolset gcc)
-    set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    # https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
-    if (MSVC_VERSION EQUAL 1800)
-    # 1800      = VS 12.0 (v120 toolset)
-        set(_boost_toolset "msvc-12.0")
-    elseif (MSVC_VERSION EQUAL 1900)
-    # 1900      = VS 14.0 (v140 toolset)
-        set(_boost_toolset "msvc-14.0")
-    elseif (MSVC_VERSION LESS 1920)
-    # 1910-1919 = VS 15.0 (v141 toolset)
-        set(_boost_toolset "msvc-14.1")
-    elseif (MSVC_VERSION LESS 1930)
-    # 1920-1929 = VS 16.0 (v142 toolset)
-        set(_boost_toolset "msvc-14.2")
-    elseif (MSVC_VERSION LESS 1940)
-    # 1930-1939 = VS 17.0 (v143 toolset)
-        set(_boost_toolset "msvc-14.3")
-    else ()
-        message(FATAL_ERROR "Unsupported MSVC version")
+set(_context_abi_line "")
+set(_context_arch_line "")
+if (APPLE AND CMAKE_OSX_ARCHITECTURES)
+    if (CMAKE_OSX_ARCHITECTURES MATCHES "x86")
+        set(_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=sysv")
+    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "arm")
+        set (_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=aapcs")
     endif ()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    if (WIN32)
-        set(_boost_toolset "clang-win")
-    else()
-        set(_boost_toolset "clang")
-    endif()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-    set(_boost_toolset "intel")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-    set(_boost_toolset "clang")
-endif()
-
-message(STATUS "Deduced boost toolset: ${_boost_toolset} based on ${CMAKE_CXX_COMPILER_ID} compiler")
-
-set(_libs "")
-foreach(_comp ${DEP_Boost_COMPONENTS})
-    list(APPEND _libs "--with-${_comp}")
-endforeach()
-
-if (BUILD_SHARED_LIBS)
-    set(_link shared)
-else()
-    set(_link static)
-endif()
-
-set(_bits "")
-if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-    set(_bits 64)
-elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
-    set(_bits 32)
+    set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
 endif ()
 
-include(ProcessorCount)
-ProcessorCount(NPROC)
-file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)
-
-
-set(_boost_variants "")
-if(CMAKE_BUILD_TYPE)
-    list(APPEND CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
-    list(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES)
-endif()
-list(FIND CMAKE_CONFIGURATION_TYPES "Release" _cfg_rel)
-list(FIND CMAKE_CONFIGURATION_TYPES "RelWithDebInfo" _cfg_relwdeb)
-list(FIND CMAKE_CONFIGURATION_TYPES "MinSizeRel" _cfg_minsizerel)
-list(FIND CMAKE_CONFIGURATION_TYPES "Debug" _cfg_deb)
-
-if (_cfg_rel GREATER -1 OR _cfg_relwdeb GREATER -1 OR _cfg_minsizerel GREATER -1)
-    list(APPEND _boost_variants release)
-endif()
-
-if (MSVC AND ${DEP_DEBUG} )
-    list(APPEND _boost_variants debug)
-endif()
-
-if (NOT _boost_variants)
-    set(_boost_variants release)
-endif()
-
-if (IS_CROSS_COMPILE AND APPLE)
-    if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
-        message(STATUS "Compiling Boost for arm64.")
-        message(STATUS "Compiling Boost with toolset ${_boost_toolset}.")
-        message(STATUS "Compiling Boost with libs ${_libs}.")
-        message(STATUS "Compiling Boost with variant ${_boost_variants}.")
-        message(STATUS "Compiling Boost with _bootstrap_cmd ${_bootstrap_cmd}.")
-        message(STATUS "_boost_linkflags = ${_boost_linkflags}")
-        set(_arch_flags "-arch arm64")
-        set(_boost_linkflags "linkflags=${_arch_flags}")
-        message(STATUS "_cmake_args_osx_arch = '${_cmake_args_osx_arch}'")
-    elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
-        message(STATUS "Compiling Boost for x86_64.")
-        set(_arch_flags "-arch x86_64")
-    endif()
-    set(_boost_linkflags "linkflags=${_arch_flags}")
-endif ()
-
-set(_boost_flags "")
-if(APPLE)
-    set(_boost_flags 
-        "cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}") 
-elseif (UNIX)
-    set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
-endif()
-
-set(_build_cmd ${_build_cmd}
-               ${_boost_flags}
-               ${_boost_linkflags}
-               -j${NPROC}
-               ${_libs}
-               --layout=versioned
-               --debug-configuration
-               toolset=${_boost_toolset}
-               address-model=${_bits}
-               link=${_link}
-               threading=multi
-               boost.locale.icu=off
-               --disable-icu
-               ${_boost_variants}
-               stage)
-
-set(_install_cmd ${_build_cmd} --prefix=${_prefix} install)
-
-if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS)
-    message(STATUS "Standard boost build with bootstrap command '${_bootstrap_cmd}'")
-    message(STATUS "Standard boost build with patch command '${_patch_command}'")
-    message(STATUS "Standard boost build with build command '${_build_cmd}'")
-    message(STATUS "Standard boost build with install command '${_install_cmd}'")
-ExternalProject_Add(
-    dep_Boost
-	URL ${_boost_url}
-    URL_HASH SHA256=${_boost_hash}
-    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
-    CONFIGURE_COMMAND "${_bootstrap_cmd}"
-    PATCH_COMMAND ${_patch_command}
-    BUILD_COMMAND "${_build_cmd}"
-    BUILD_IN_SOURCE    ON
-    INSTALL_COMMAND "${_install_cmd}"
+orcaslicer_add_cmake_project(Boost
+    URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz"
+    URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95
+    LIST_SEPARATOR |
+    CMAKE_ARGS
+        -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
+        -DBOOST_LOCALE_ENABLE_ICU:BOOL=OFF # do not link to libicu, breaks compatibility between distros
+        -DBUILD_TESTING:BOOL=OFF
+        "${_context_abi_line}"
+        "${_context_arch_line}"
 )
 
-else()
-
-ExternalProject_Add(
-    dep_Boost
-	URL ${_boost_url}
-    URL_HASH SHA256=${_boost_hash}
-    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
-    CONFIGURE_COMMAND ./bootstrap.sh
-        --with-toolset=clang
-        --with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread
-        "--prefix=${DESTDIR}/usr/local"
-#    PATCH_COMMAND ${_patch_command}
-    BUILD_COMMAND "${_build_cmd}"
-    BUILD_IN_SOURCE    ON
-    INSTALL_COMMAND "${_install_cmd}"
-)
-endif()
-
-if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-    message(STATUS "Patch the boost::polygon library with a custom one.")
-    # Patch the boost::polygon library with a custom one.
-    ExternalProject_Add(dep_boost_polygon
-        EXCLUDE_FROM_ALL ON
-        # GIT_REPOSITORY "https://github.com/prusa3d/polygon"
-        # GIT_TAG prusaslicer_gmp
-        URL https://github.com/prusa3d/polygon/archive/refs/heads/prusaslicer_gmp.zip
-        URL_HASH SHA256=abeb9710f0a7069fb9b22181ae5c56f6066002f125db210e7ffb27032aed6824
-        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/boost_polygon
-        DEPENDS dep_Boost
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        ${_cmake_args_osx_arch}
-        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${CMAKE_CURRENT_BINARY_DIR}/dep_boost_polygon-prefix/src/dep_boost_polygon/include/boost/polygon"
-            "${DESTDIR}/usr/local/include/boost/polygon"
-    )
-    # Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms.
-    list(APPEND _dep_list "dep_boost_polygon")
-endif ()
+set(DEP_Boost_DEPENDS ZLIB)

deps/CGAL/CGAL.cmake

@@ -1,31 +1,11 @@
 orcaslicer_add_cmake_project(
     CGAL
-     GIT_REPOSITORY https://github.com/CGAL/cgal.git
-     GIT_TAG        caacd806dc55c61cc68adaad99f2240f00493b29 # releases/CGAL-5.3
+    # GIT_REPOSITORY https://github.com/CGAL/cgal.git
+    # GIT_TAG        bec70a6d52d8aacb0b3d82a7b4edc3caa899184b # releases/CGAL-5.0
     # For whatever reason, this keeps downloading forever (repeats downloads if finished)
-    #URL      https://github.com/CGAL/cgal/archive/releases/CGAL-5.0.zip
-    #URL_HASH SHA256=c2b035bd078687b6d8c0fb6371a7443adcdb647856af9969532c4050cd5f48e5
+    URL      https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip
+    URL_HASH SHA256=d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0
     DEPENDS dep_Boost dep_GMP dep_MPFR
 )
 
 include(GNUInstallDirs)
-
-# CGAL, for whatever reason, makes itself non-relocatable by writing the build directory into
-# CGALConfig-installation-dirs.cmake and including it in configure time.
-# If this file is not present, it will not consider the stored absolute path
-ExternalProject_Add_Step(dep_CGAL dep_CGAL_relocation_fix
-    DEPENDEES install
-
-    COMMAND ${CMAKE_COMMAND} -E remove CGALConfig-installation-dirs.cmake
-    WORKING_DIRECTORY "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL"
-)
-
-# Again, for whatever reason, CGAL thinks that its version is not relevant if
-# configured as a header only library. Fixing it by placing a cmake version file
-# besides the installed config file.
-ExternalProject_Add_Step(dep_CGAL dep_CGAL_version_fix
-    DEPENDEES install
-
-    COMMAND ${CMAKE_COMMAND} -E copy cgal/CGALConfigVersion.cmake "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL/CGALConfigVersion.cmake"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
-)

deps/CMakeLists.txt

@@ -20,8 +20,17 @@
 # therefore, unfortunatelly, the installation cannot be copied/moved elsewhere without re-installing wxWidgets.
 #
 
-project(OrcaSlicer-deps)
 cmake_minimum_required(VERSION 3.2)
+if (APPLE)
+    # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
+    if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
+    endif ()
+    message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+
+endif ()
+
+project(OrcaSlicer-deps)
 
 include(ExternalProject)
 include(ProcessorCount)
@@ -32,9 +41,14 @@ if (NPROC EQUAL 0)
 endif ()
 
 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
-set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path for downloaded source packages.")
+set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../DL_CACHE CACHE PATH "Path for downloaded source packages.")
 
-option(DEP_DEBUG "Build debug variants (only applicable on Windows)" OFF)
+get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+
+if (_is_multi)
+    option(DEP_DEBUG "Build debug variants (only applicable on Windows)" OFF)
+    option(ORCA_INCLUDE_DEBUG_INFO "Includes debug information in a release build (like RelWithDebInfo) in a way that works with multi-configuration generators and incompatible dependencies. DEP_DEBUG option takes priority over this." OFF)
+endif ()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
@@ -78,8 +92,6 @@ find_package(Git REQUIRED)
 # The default command line for patching. Only works for newer 
 set(PATCH_CMD ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix)
 
-get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-
 if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
     message(STATUS "Forcing CMAKE_BUILD_TYPE to Release as it was not specified.")
@@ -90,7 +102,11 @@ function(orcaslicer_add_cmake_project projectname)
 
     set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
     if (_is_multi OR MSVC)
-        set(_configs_line "")
+        if (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG)
+            set(_configs_line "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO} -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+        else ()
+            set(_configs_line "")
+        endif ()
     endif ()
 
     set(_gen "")
@@ -133,6 +149,7 @@ else()
         ${_gen}
         CMAKE_ARGS
             -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
+            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
             -DBUILD_SHARED_LIBS:BOOL=OFF
             ${_cmake_osx_arch}
             "${_configs_line}"
@@ -162,7 +179,6 @@ if (MSVC)
     endif ()
 elseif (APPLE)
     message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
     if (CMAKE_OSX_DEPLOYMENT_TARGET)
         set(DEP_OSX_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}")
         message("OS X Deployment Target: ${DEP_OSX_TARGET}")

deps/Cereal/Cereal.cmake

@@ -1,6 +1,12 @@
+#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 orcaslicer_add_cmake_project(Cereal
-    URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
-    URL_HASH SHA256=1921f26d2e1daf9132da3c432e2fd02093ecaedf846e65d7679ddf868c7289c4
+    URL "https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.0.zip"
+    URL_HASH SHA256=71642cb54658e98c8f07a0f0d08bf9766f1c3771496936f6014169d3726d9657
     CMAKE_ARGS
-        -DJUST_INSTALL_CEREAL=on
+        -DJUST_INSTALL_CEREAL=ON
+        -DSKIP_PERFORMANCE_COMPARISON=ON
+        -DBUILD_TESTS=OFF
 )

deps/JPEG/JPEG.cmake

@@ -12,8 +12,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 endif()
 
 orcaslicer_add_cmake_project(JPEG
-    URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.0.6.zip
-    URL_HASH SHA256=017bdc33ff3a72e11301c0feb4657cb27719d7f97fa67a78ed506c594218bbf1
+    URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.0.1.zip
+    URL_HASH SHA256=d6d99e693366bc03897677650e8b2dfa76b5d6c54e2c9e70c03f0af821b0a52f
     DEPENDS ${ZLIB_PKG}
     CMAKE_ARGS
         -DENABLE_SHARED=OFF

deps/MPFR/MPFR.cmake

@@ -26,11 +26,12 @@ else ()
     endif ()
 
     ExternalProject_Add(dep_MPFR
-        URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2  # mirrors are allowed
-        URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
+        URL https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2
+        URL_HASH SHA256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
         BUILD_IN_SOURCE ON
-        CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
+        CONFIGURE_COMMAND autoreconf -f -i && 
+                          env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         DEPENDS dep_GMP

deps/NanoSVG/NanoSVG.cmake

@@ -0,0 +1,10 @@
+# In PrusaSlicer 2.6.0 we switched from https://github.com/memononen/nanosvg to its fork https://github.com/fltk/nanosvg
+# because this last implements the new function nsvgRasterizeXY() which we now use in GLTexture::load_from_svg()
+# for rasterizing svg files from their original size to a squared power of two texture on Windows systems using
+# AMD Radeon graphics cards
+
+orcaslicer_add_cmake_project(NanoSVG
+    DEPENDS dep_Boost
+    URL https://github.com/SoftFever/nanosvg/archive/863f6aa97ef62028126fa2c19bd4350394c2e15e.zip
+        URL_HASH SHA256=8d9c1624ad6518dd6dfa31e4f8dc7da9ec243d88bae595c7a037450617fec851
+)

deps/OpenSSL/OpenSSL.cmake

@@ -19,7 +19,7 @@ if(WIN32)
     set(_install_cmd nmake install_sw )
 else()
     if(APPLE)
-        set(_conf_cmd ./Configure )
+        set(_conf_cmd export MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} && ./Configure -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET})
     else()
         set(_conf_cmd "./config")
     endif()

deps/TIFF/TIFF.cmake

@@ -11,6 +11,7 @@ if (APPLE)
             -Dwebp:BOOL=OFF
             -Djbig:BOOL=OFF
             -Dzstd:BOOL=OFF
+            -Dlibdeflate:BOOL=OFF
             -Dpixarlog:BOOL=OFF
     )
 else()

deps/wxWidgets/0001-patch-v3.2.1-for-OrcaSlicer.patch

@@ -0,0 +1,683 @@
+From f4fef135f0a58ca2916c45cd539923ab096935b6 Mon Sep 17 00:00:00 2001
+From: Ocraftyone <Ocraftyone@users.noreply.github.com>
+Date: Thu, 30 Nov 2023 03:25:54 -0500
+Subject: [PATCH] patch v3.2.1 for OrcaSlicer
+
+---
+ build/cmake/lib/webview/CMakeLists.txt |  4 +-
+ include/wx/fontutil.h                  | 15 +++++++-
+ include/wx/gdicmn.h                    |  3 ++
+ include/wx/generic/grid.h              |  4 +-
+ include/wx/msw/font.h                  |  2 +-
+ include/wx/msw/tooltip.h               |  4 +-
+ include/wx/osx/app.h                   |  2 +-
+ src/common/combocmn.cpp                | 11 +++++-
+ src/common/datavcmn.cpp                |  6 ++-
+ src/common/dcbufcmn.cpp                |  6 +++
+ src/common/gdicmn.cpp                  | 14 +++++++
+ src/common/image.cpp                   |  6 +--
+ src/generic/grid.cpp                   | 50 ++++++++++++++++++++-----
+ src/msw/bmpcbox.cpp                    |  9 ++++-
+ src/msw/font.cpp                       | 14 +++----
+ src/msw/menuitem.cpp                   |  2 +
+ src/msw/window.cpp                     | 52 +++++++++++++++++---------
+ src/osx/cocoa/dataview.mm              | 26 +++++++++++--
+ src/osx/cocoa/settings.mm              |  6 +--
+ src/osx/cocoa/window.mm                |  4 ++
+ 20 files changed, 184 insertions(+), 56 deletions(-)
+
+diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
+index 085381d785..62146abc04 100644
+--- a/build/cmake/lib/webview/CMakeLists.txt
++++ b/build/cmake/lib/webview/CMakeLists.txt
+@@ -46,9 +46,9 @@ if(APPLE)
+ elseif(WXMSW)
+     if(wxUSE_WEBVIEW_EDGE)
+         # Update the following variables if updating WebView2 SDK
+-        set(WEBVIEW2_VERSION "1.0.705.50")
++        set(WEBVIEW2_VERSION "1.0.1418.22")
+         set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}")
+-        set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d")
++        set(WEBVIEW2_SHA256 "51d2ef56196e2a9d768a6843385bcb9c6baf9ed34b2603ddb074fb4995543a99")
+ 
+         set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")
+ 
+diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
+index 30529db8ce..e6a12366d5 100644
+--- a/include/wx/fontutil.h
++++ b/include/wx/fontutil.h
+@@ -294,7 +294,11 @@ public:
+     wxFontEncoding GetEncoding() const;
+ 
+     void SetPointSize(int pointsize);
+-    void SetFractionalPointSize(double pointsize);
++    void SetFractionalPointSize(double pointsize
++#if defined(__WXMSW__)
++    	, const wxWindow *window = nullptr
++#endif
++    	);
+     void SetPixelSize(const wxSize& pixelSize);
+     void SetStyle(wxFontStyle style);
+     void SetNumericWeight(int weight);
+@@ -307,12 +311,19 @@ public:
+ 
+     // Helper used in many ports: use the normal font size if the input is
+     // negative, as we handle -1 as meaning this for compatibility.
+-    void SetSizeOrDefault(double size)
++    void SetSizeOrDefault(double size
++#if defined(__WXMSW__)
++    	, const wxWindow *window = nullptr
++#endif
++    	)
+     {
+         SetFractionalPointSize
+         (
+             size < 0 ? wxNORMAL_FONT->GetFractionalPointSize()
+                      : size
++#if defined(__WXMSW__)
++            ,window
++#endif
+         );
+     }
+ 
+diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
+index 2f5f8ee99f..39e9317d40 100644
+--- a/include/wx/gdicmn.h
++++ b/include/wx/gdicmn.h
+@@ -38,6 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxRegion;
+ class WXDLLIMPEXP_FWD_BASE wxString;
+ class WXDLLIMPEXP_FWD_CORE wxIconBundle;
+ class WXDLLIMPEXP_FWD_CORE wxPoint;
++class WXDLLIMPEXP_FWD_CORE wxWindow;
+ 
+ // ---------------------------------------------------------------------------
+ // constants
+@@ -1106,7 +1107,9 @@ extern int WXDLLIMPEXP_CORE wxDisplayDepth();
+ 
+ // get the display size
+ extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height);
++extern void WXDLLIMPEXP_CORE wxDisplaySize(const wxWindow *window, int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
++extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(const wxWindow *window);
+ extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI();
+diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
+index 1bd58bbf04..903cb81319 100644
+--- a/include/wx/generic/grid.h
++++ b/include/wx/generic/grid.h
+@@ -3029,9 +3029,11 @@ private:
+     // Update the width/height of the column/row being drag-resized.
+     // Should be only called when m_dragRowOrCol != -1, i.e. dragging is
+     // actually in progress.
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     void DoGridDragResize(const wxPoint& position,
+                           const wxGridOperations& oper,
+-                          wxGridWindow* gridWindow);
++                          wxGridWindow* gridWindow,
++                          CursorMode mode);
+ 
+     // process different clicks on grid cells
+     void DoGridCellLeftDown(wxMouseEvent& event,
+diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
+index 0f9768b44e..094d774918 100644
+--- a/include/wx/msw/font.h
++++ b/include/wx/msw/font.h
+@@ -23,7 +23,7 @@ public:
+     // ctors and such
+     wxFont() { }
+ 
+-    wxFont(const wxFontInfo& info);
++    wxFont(const wxFontInfo& info, const wxWindow *window = nullptr);
+ 
+     wxFont(int size,
+            wxFontFamily family,
+diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
+index 4c3be08cec..96fb378d01 100644
+--- a/include/wx/msw/tooltip.h
++++ b/include/wx/msw/tooltip.h
+@@ -91,10 +91,10 @@ private:
+     // the one and only one tooltip control we use - never access it directly
+     // but use GetToolTipCtrl() which will create it when needed
+     static WXHWND ms_hwndTT;
+-
++public:
+     // create the tooltip ctrl if it doesn't exist yet and return its HWND
+     static WXHWND GetToolTipCtrl();
+-
++private:
+     // to be used in wxModule for deleting tooltip ctrl window when exiting mainloop
+     static void DeleteToolTipCtrl();
+ 
+diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
+index 317a0ca96f..58014ec1d4 100644
+--- a/include/wx/osx/app.h
++++ b/include/wx/osx/app.h
+@@ -161,7 +161,7 @@ private:
+ 
+ public:
+     bool                OSXInitWasCalled() { return m_inited; }
+-    void                OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
++    virtual void        OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
+     void                OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
+     void                OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
+ #endif
+diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
+index 80408c6677..aa07caebdc 100644
+--- a/src/common/combocmn.cpp
++++ b/src/common/combocmn.cpp
+@@ -2061,6 +2061,9 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     SetFocus();
+ 
++    //int displayIdx = wxDisplay::GetFromWindow(this);
++    //wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
++
+     // Space above and below
+     int screenHeight;
+     wxPoint scrPos;
+@@ -2183,9 +2186,13 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     int showFlags = CanDeferShow;
+ 
+-    if ( spaceBelow < szp.y )
++    int anchorSideVertical = m_anchorSide & (wxUP | wxDOWN);
++    if (// Pop up as asked for by the library user.
++        (anchorSideVertical & wxUP) ||
++        // Automatic: Pop up if it does not fit down.
++        (anchorSideVertical == 0 && spaceBelow < szp.y ))
+     {
+-        popupY = scrPos.y - szp.y;
++        popupY = scrPos.y - szp.y + displayRect.GetTop();
+         showFlags |= ShowAbove;
+     }
+ 
+diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
+index 0a1e43ad51..6c492aedab 100644
+--- a/src/common/datavcmn.cpp
++++ b/src/common/datavcmn.cpp
+@@ -1334,7 +1334,11 @@ wxDataViewItem wxDataViewCtrlBase::GetSelection() const
+ 
+     wxDataViewItemArray selections;
+     GetSelections(selections);
+-    return selections[0];
++    // BBS
++    if (!selections.empty())
++        return selections[0];
++    else
++        return wxDataViewItem(0);
+ }
+ 
+ namespace
+diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
+index 9b1c1f3159..ef5865ed4b 100644
+--- a/src/common/dcbufcmn.cpp
++++ b/src/common/dcbufcmn.cpp
+@@ -83,9 +83,15 @@ private:
+         const double scale = dc ? dc->GetContentScaleFactor() : 1.0;
+         wxBitmap* const buffer = new wxBitmap;
+ 
++#if __WXMSW__
++        // we must always return a valid bitmap but creating a bitmap of
++        // size 0 would fail, so create a 1*1 bitmap in this case
++        buffer->Create(wxMax(w, 1), wxMax(h, 1), 24);
++#else
+         // we must always return a valid bitmap but creating a bitmap of
+         // size 0 would fail, so create a 1*1 bitmap in this case
+         buffer->CreateWithDIPSize(wxMax(w, 1), wxMax(h, 1), scale);
++#endif
+ 
+         return buffer;
+     }
+diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
+index db8a01f961..162c1ce2dc 100644
+--- a/src/common/gdicmn.cpp
++++ b/src/common/gdicmn.cpp
+@@ -863,11 +863,25 @@ void wxDisplaySize(int *width, int *height)
+         *height = size.y;
+ }
+ 
++void wxDisplaySize(const wxWindow *window, int *width, int *height)
++{
++    const wxSize size = wxGetDisplaySize(window);
++    if ( width )
++        *width = size.x;
++    if ( height )
++        *height = size.y;    
++}
++
+ wxSize wxGetDisplaySize()
+ {
+     return wxDisplay().GetGeometry().GetSize();
+ }
+ 
++wxSize wxGetDisplaySize(const wxWindow *window)
++{
++    return window ? wxDisplay(window).GetGeometry().GetSize() : wxDisplay().GetGeometry().GetSize();
++}
++
+ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+ {
+     const wxRect rect = wxGetClientDisplayRect();
+diff --git a/src/common/image.cpp b/src/common/image.cpp
+index 19fe34ec91..a449b60930 100644
+--- a/src/common/image.cpp
++++ b/src/common/image.cpp
+@@ -390,11 +390,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
+                     unsigned char red = pixel[0] ;
+                     unsigned char green = pixel[1] ;
+                     unsigned char blue = pixel[2] ;
+-                    unsigned char alpha = 255  ;
+-                    if ( source_alpha )
+-                        alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                     if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
+                     {
++                        unsigned char alpha = 255  ;
++                        if ( source_alpha )
++                            alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                         if ( alpha > 0 )
+                         {
+                             avgRed += red ;
+diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
+index ed3d988994..d71cda122d 100644
+--- a/src/generic/grid.cpp
++++ b/src/generic/grid.cpp
+@@ -4068,7 +4068,8 @@ void wxGrid::ProcessRowColLabelMouseEvent( const wxGridOperations &oper, wxMouse
+         {
+             if ( m_cursorMode == oper.GetCursorModeResize() )
+             {
+-                DoGridDragResize(event.GetPosition(), oper, gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), oper, gridWindow, m_cursorMode);
+             }
+             else if ( m_cursorMode == oper.GetCursorModeSelect() && line >=0 )
+             {
+@@ -4691,12 +4692,14 @@ bool wxGrid::DoGridDragEvent(wxMouseEvent& event,
+ 
+         case WXGRID_CURSOR_RESIZE_ROW:
+             if ( m_dragRowOrCol != -1 )
+-                DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+             break;
+ 
+         case WXGRID_CURSOR_RESIZE_COL:
+             if ( m_dragRowOrCol != -1 )
+-                DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+             break;
+ 
+         default:
+@@ -4791,6 +4794,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
+                             case wxGridSelectCells:
+                             case wxGridSelectRowsOrColumns:
+                                 // nothing to do in these cases
++                                //BBS: select this cell when first click
++                                m_selection->SelectBlock(coords.GetRow(), coords.GetCol(), coords.GetRow(), coords.GetCol(), event);
+                                 break;
+ 
+                             case wxGridSelectRows:
+@@ -5049,9 +5054,11 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event, wxGridWindow *eventG
+     }
+ }
+ 
++//BBS: add cursor mode for DoGridDragResize's paremeters
+ void wxGrid::DoGridDragResize(const wxPoint& position,
+                               const wxGridOperations& oper,
+-                              wxGridWindow* gridWindow)
++                              wxGridWindow* gridWindow,
++                              CursorMode mode)
+ {
+     wxCHECK_RET( m_dragRowOrCol != -1,
+                  "shouldn't be called when not drag resizing" );
+@@ -5064,10 +5071,28 @@ void wxGrid::DoGridDragResize(const wxPoint& position,
+     // orthogonal direction.
+     const int linePos = oper.Dual().Select(logicalPos);
+ 
+-    const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
+-    oper.SetLineSize(this, m_dragRowOrCol,
++    //BBS: add logic for resize multiplexed cols
++    if (mode == WXGRID_CURSOR_RESIZE_COL) {
++        int col_to_resize = m_dragRowOrCol;
++        int num_rows, num_cols;
++        this->GetCellSize(0, m_dragRowOrCol, &num_rows, &num_cols);
++        if (num_cols < 1)
++            col_to_resize = m_dragRowOrCol - 1;
++
++        const int lineEnd = oper.GetLineEndPos(this, m_dragRowOrCol);
++        const int lineSize = oper.GetLineSize(this, col_to_resize);
++        int size = linePos - lineEnd + lineSize;
++        oper.SetLineSize(this, col_to_resize,
++                     wxMax(size,
++                           oper.GetMinimalLineSize(this, col_to_resize)));
++    }
++    else {
++        const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
++
++        oper.SetLineSize(this, m_dragRowOrCol,
+                      wxMax(linePos - lineStart,
+                            oper.GetMinimalLineSize(this, m_dragRowOrCol)));
++    }
+ 
+     // TODO: generate RESIZING event, see #10754, if the size has changed.
+ }
+@@ -5090,7 +5115,8 @@ wxPoint wxGrid::GetPositionForResizeEvent(int width) const
+ 
+ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+ 
+     SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, event);
+ 
+@@ -5099,7 +5125,8 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWin
+ 
+ void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+ 
+     SendGridSizeEvent(wxEVT_GRID_COL_SIZE, m_dragRowOrCol, event);
+ 
+@@ -5113,9 +5140,10 @@ void wxGrid::DoHeaderStartDragResizeCol(int col)
+ 
+ void wxGrid::DoHeaderDragResizeCol(int width)
+ {
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     DoGridDragResize(GetPositionForResizeEvent(width),
+                      wxGridColumnOperations(),
+-                     m_gridWin);
++                     m_gridWin, WXGRID_CURSOR_RESIZE_COL);
+ }
+ 
+ void wxGrid::DoHeaderEndDragResizeCol(int width)
+@@ -6013,6 +6041,10 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
+                     DisableCellEditControl();
+ 
+                     MoveCursorDown( event.ShiftDown() );
++                    //BBS: select this cell when first click
++                    m_selection->SelectBlock(m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             event);
+                 }
+                 break;
+ 
+diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
+index 011bd4f534..17e7f18740 100644
+--- a/src/msw/bmpcbox.cpp
++++ b/src/msw/bmpcbox.cpp
+@@ -156,13 +156,20 @@ void wxBitmapComboBox::RecreateControl()
+ 
+     wxComboBox::DoClear();
+ 
+-    HWND hwnd = GetHwnd();
++    WNDPROC wndproc_edit = nullptr;
++	WinStruct<COMBOBOXINFO> combobox_info;
++	HWND hwnd = GetHwnd();
++if (::GetComboBoxInfo(hwnd, &combobox_info))
++		wndproc_edit = (WNDPROC)wxGetWindowProc(combobox_info.hwndItem);
+     DissociateHandle();
+     ::DestroyWindow(hwnd);
+ 
+     if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) )
+         return;
+ 
++if (::GetComboBoxInfo(GetHwnd(), &combobox_info))
++    wxSetWindowProc(combobox_info.hwndItem, wndproc_edit);
++
+     // initialize the controls contents
+     for ( i = 0; i < numItems; i++ )
+     {
+diff --git a/src/msw/font.cpp b/src/msw/font.cpp
+index 434876939c..91d4603018 100644
+--- a/src/msw/font.cpp
++++ b/src/msw/font.cpp
+@@ -54,7 +54,7 @@ static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH;
+ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
+ {
+ public:
+-    wxFontRefData(const wxFontInfo& info = wxFontInfo());
++    wxFontRefData(const wxFontInfo& info = wxFontInfo(), const wxWindow* window = nullptr);
+ 
+     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+     {
+@@ -324,7 +324,7 @@ protected:
+ // wxFontRefData
+ // ----------------------------------------------------------------------------
+ 
+-wxFontRefData::wxFontRefData(const wxFontInfo& info)
++wxFontRefData::wxFontRefData(const wxFontInfo& info, const wxWindow *window)
+ {
+     m_hFont = NULL;
+ 
+@@ -335,7 +335,7 @@ wxFontRefData::wxFontRefData(const wxFontInfo& info)
+     }
+     else
+     {
+-        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize());
++        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize(), window);
+     }
+ 
+     SetStyle(info.GetStyle());
+@@ -518,12 +518,12 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
+     return wxGetFontEncFromCharSet(lf.lfCharSet);
+ }
+ 
+-void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew)
++void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew, const wxWindow *window)
+ {
+     // We don't have the correct DPI to use here, so use that of the
+     // primary screen and rely on WXAdjustToPPI() changing it later if
+     // necessary.
+-    const int ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
++    const int ppi = window ? window->GetDPI().GetY() : ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+     lf.lfHeight = GetLogFontHeightAtPPI(pointSizeNew, ppi);
+ 
+     pointSize = pointSizeNew;
+@@ -812,9 +812,9 @@ wxFont::wxFont(const wxString& fontdesc)
+         (void)Create(info);
+ }
+ 
+-wxFont::wxFont(const wxFontInfo& info)
++wxFont::wxFont(const wxFontInfo& info, const wxWindow *window)
+ {
+-    m_refData = new wxFontRefData(info);
++    m_refData = new wxFontRefData(info, window);
+ }
+ 
+ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
+diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
+index 0bd017a36a..3b98bf1678 100644
+--- a/src/msw/menuitem.cpp
++++ b/src/msw/menuitem.cpp
+@@ -368,6 +368,8 @@ void MenuDrawData::Init(wxWindow const* window)
+         // native menu uses small top margin for separator
+         if ( SeparatorMargin.cyTopHeight >= 2 )
+             SeparatorMargin.cyTopHeight -= 2;
++
++        SeparatorSize.cy = 0;
+     }
+     else
+ #endif // wxUSE_UXTHEME
+diff --git a/src/msw/window.cpp b/src/msw/window.cpp
+index c529a4fa3b..7e547c64df 100644
+--- a/src/msw/window.cpp
++++ b/src/msw/window.cpp
+@@ -4809,33 +4809,49 @@ static wxSize GetWindowDPI(HWND hwnd)
+ }
+ 
+ /*extern*/
+-int wxGetSystemMetrics(int nIndex, const wxWindow* window)
++int wxGetSystemMetrics(int nIndex, const wxWindow* win)
+ {
+ #if wxUSE_DYNLIB_CLASS
+-    if ( !window )
+-        window = wxApp::GetMainTopWindow();
++    const wxWindow* window = (!win && wxTheApp) ? wxTheApp->GetTopWindow() : win;
+ 
+-    if ( window )
++    if (window)
+     {
+-        typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
+-        static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
+-        static bool s_initDone = false;
+-
+-        if ( !s_initDone )
+-        {
+-            wxLoadedDLL dllUser32("user32.dll");
+-            wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
+-            s_initDone = true;
++#if 1
++        if (window->GetHWND() && (nIndex == SM_CXSCREEN || nIndex == SM_CYSCREEN)) {
++            HDC hdc = GetDC(window->GetHWND());
++#if 0
++            double dim = GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES);
++            ReleaseDC(window->GetHWND(), hdc);
++            wxSize dpi = window->GetDPI();
++            dim *= 96.0 / (nIndex == SM_CXSCREEN ? dpi.x : dpi.y);
++            return int(dim + 0.5);
++#else
++            return int(GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES));
++#endif
+         }
+-
+-        if ( s_pfnGetSystemMetricsForDpi )
++        else
++#endif
+         {
+-            const int dpi = window->GetDPI().y;
+-            return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
++            static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
++            static bool s_initDone = false;
++
++            if ( !s_initDone )
++            {
++                wxLoadedDLL dllUser32("user32.dll");
++                wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
++                s_initDone = true;
++            }
++
++            if ( s_pfnGetSystemMetricsForDpi )
++            {
++                const int dpi = window->GetDPI().y;
++                return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            }
+         }
+     }
+ #else
+-    wxUnusedVar(window);
++    wxUnusedVar(win);
+ #endif // wxUSE_DYNLIB_CLASS
+ 
+     return ::GetSystemMetrics(nIndex);
+diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
+index f188e61089..7b867002d1 100644
+--- a/src/osx/cocoa/dataview.mm
++++ b/src/osx/cocoa/dataview.mm
+@@ -1604,6 +1604,15 @@ outlineView:(NSOutlineView*)outlineView
+     }
+ }
+ 
++//FIXME Vojtech: This is a workaround to get at least the "mouse move" events at the wxDataViewControl,
++// so we can show the tooltips. The "mouse move" events are being send only if the wxDataViewControl
++// has focus, which is a limitation of wxWidgets. We may grab focus on "mouse entry" though.
++- (void)mouseMoved:(NSEvent *)event
++{
++if (! implementation->DoHandleMouseEvent(event))
++        [super mouseMoved:event];
++}
++
+ //
+ // contextual menus
+ //
+@@ -2006,7 +2015,8 @@ void wxCocoaDataViewControl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd
+         if ( !dvc->GetEventHandler()->ProcessEvent(eventDV) )
+             wxWidgetCocoaImpl::keyEvent(event, slf, _cmd);
+     }
+-    else
++    //FIXME Vojtech's hack to get the accelerators assigned to the wxDataViewControl working.
++    else if (! DoHandleKeyEvent(event))
+     {
+         wxWidgetCocoaImpl::keyEvent(event, slf, _cmd);  // all other keys
+     }
+@@ -2540,12 +2550,22 @@ void wxCocoaDataViewControl::DoSetIndent(int indent)
+ 
+ void wxCocoaDataViewControl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
+ {
+-    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),point);
++    NSTableHeaderView *headerView = [m_OutlineView headerView];
++    if (headerView && point.y < headerView.visibleRect.size.height) {
++    // The point is inside the header area.
++            columnPtr = NULL;
++            item      = wxDataViewItem();
++    return;
++        }
++    // Convert from the window coordinates to the virtual scrolled view coordinates.
++    NSScrollView *scrollView = [m_OutlineView enclosingScrollView];
++    const NSRect &visibleRect = scrollView.contentView.visibleRect;
++    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),
++    wxPoint(point.x + visibleRect.origin.x, point.y + visibleRect.origin.y));
+ 
+     int indexColumn;
+     int indexRow;
+ 
+-
+     indexColumn = [m_OutlineView columnAtPoint:nativePoint];
+     indexRow    = [m_OutlineView rowAtPoint:   nativePoint];
+     if ((indexColumn >= 0) && (indexRow >= 0))
+diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
+index c819deeb0c..dc3c3b0b53 100644
+--- a/src/osx/cocoa/settings.mm
++++ b/src/osx/cocoa/settings.mm
+@@ -222,7 +222,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
+ // ----------------------------------------------------------------------------
+ 
+ // Get a system metric, e.g. scrollbar size
+-int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
++int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* win)
+ {
+     int value;
+ 
+@@ -257,11 +257,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUN
+         // TODO case wxSYS_WINDOWMIN_Y:
+ 
+         case wxSYS_SCREEN_X:
+-            wxDisplaySize(&value, NULL);
++            wxDisplaySize(win, &value, NULL);
+             return value;
+ 
+         case wxSYS_SCREEN_Y:
+-            wxDisplaySize(NULL, &value);
++            wxDisplaySize(win, NULL, &value);
+             return value;
+ 
+         // TODO case wxSYS_FRAMESIZE_X:
+diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
+index 635ea286d4..42ae67e27a 100644
+--- a/src/osx/cocoa/window.mm
++++ b/src/osx/cocoa/window.mm
+@@ -191,6 +191,9 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
+ - (BOOL)isEnabled;
+ - (void)setEnabled:(BOOL)flag;
+ 
++- (BOOL)clipsToBounds;
++- (void)setClipsToBounds:(BOOL)clipsToBounds;
++
+ - (void)setImage:(NSImage *)image;
+ - (void)setControlSize:(NSControlSize)size;
+ 
+@@ -2559,6 +2562,7 @@ wxWidgetImpl( peer, flags )
+     if ( m_osxView )
+         CFRetain(m_osxView);
+     [m_osxView release];
++    m_osxView.clipsToBounds = YES;
+ }
+ 
+ 
+-- 
+2.42.0.windows.2
+

deps/wxWidgets/0001-wx-3.1.5-patch-for-Orca.patch

@@ -1,3 +1,33 @@
+From 5e82980ed1762338794d06b3f9f22fa10e050622 Mon Sep 17 00:00:00 2001
+From: SoftFever <softfeverever@gmail.com>
+Date: Sat, 23 Dec 2023 20:08:41 +0800
+Subject: [PATCH] wx 3.1.5 patch for Orca
+
+---
+ build/cmake/init.cmake                 |  4 ++
+ build/cmake/lib/webview/CMakeLists.txt |  4 +-
+ include/wx/fontutil.h                  | 15 +++++++-
+ include/wx/gdicmn.h                    |  3 ++
+ include/wx/generic/grid.h              |  4 +-
+ include/wx/msw/font.h                  |  2 +-
+ include/wx/msw/tooltip.h               |  4 +-
+ include/wx/osx/app.h                   |  2 +-
+ src/common/combocmn.cpp                | 13 +++++--
+ src/common/datavcmn.cpp                |  6 ++-
+ src/common/dcbufcmn.cpp                |  8 +++-
+ src/common/gdicmn.cpp                  | 14 +++++++
+ src/common/image.cpp                   |  6 +--
+ src/common/intl.cpp                    |  7 ++++
+ src/generic/grid.cpp                   | 53 +++++++++++++++++++++-----
+ src/msw/bmpcbox.cpp                    |  9 ++++-
+ src/msw/font.cpp                       | 14 +++----
+ src/msw/menuitem.cpp                   |  2 +
+ src/msw/window.cpp                     | 52 ++++++++++++++++---------
+ src/osx/cocoa/dataview.mm              | 26 +++++++++++--
+ src/osx/cocoa/settings.mm              |  6 +--
+ src/osx/cocoa/window.mm                |  4 ++
+ 22 files changed, 199 insertions(+), 59 deletions(-)
+
 diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
 index 0bc4f934b9..479431a69c 100644
 --- a/build/cmake/init.cmake
@@ -15,10 +45,10 @@ index 0bc4f934b9..479431a69c 100644
                  if(WAYLANDEGL_FOUND AND wxHAVE_GDK_WAYLAND)
                      list(APPEND OPENGL_LIBRARIES ${WAYLANDEGL_LIBRARIES})
 diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
-index cc3298ff33..8adbeaea4f 100644
+index cc3298ff33..aa103ae474 100644
 --- a/build/cmake/lib/webview/CMakeLists.txt
 +++ b/build/cmake/lib/webview/CMakeLists.txt
-@@ -56,7 +56,7 @@ if(APPLE)
+@@ -56,9 +56,9 @@ if(APPLE)
  elseif(WXMSW)
      if(wxUSE_WEBVIEW_EDGE)
          # Update the following variables if updating WebView2 SDK
@@ -31,7 +61,7 @@ index cc3298ff33..8adbeaea4f 100644
          set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")
  
 diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
-index 09ad8c8ef3..3c0c2d8f7e 100644
+index 09ad8c8ef3..c228e167d7 100644
 --- a/include/wx/fontutil.h
 +++ b/include/wx/fontutil.h
 @@ -294,7 +294,11 @@ public:
@@ -41,9 +71,9 @@ index 09ad8c8ef3..3c0c2d8f7e 100644
 -    void SetFractionalPointSize(double pointsize);
 +    void SetFractionalPointSize(double pointsize
 +#if defined(__WXMSW__)
-+    	, const wxWindow *window = nullptr
++	, const wxWindow *window = nullptr
 +#endif
-+    	);
++	);
      void SetPixelSize(const wxSize& pixelSize);
      void SetStyle(wxFontStyle style);
      void SetNumericWeight(int weight);
@@ -54,9 +84,9 @@ index 09ad8c8ef3..3c0c2d8f7e 100644
 -    void SetSizeOrDefault(double size)
 +    void SetSizeOrDefault(double size
 +#if defined(__WXMSW__)
-+    	, const wxWindow *window = nullptr
++	, const wxWindow *window = nullptr
 +#endif
-+    	)
++	)
      {
          SetFractionalPointSize
          (
@@ -151,7 +181,7 @@ index 317a0ca96f..58014ec1d4 100644
      void                OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
  #endif
 diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
-index b61aac35bf..d12b745e8c 100644
+index b61aac35bf..7cfc97d2f8 100644
 --- a/src/common/combocmn.cpp
 +++ b/src/common/combocmn.cpp
 @@ -2141,7 +2141,7 @@ void wxComboCtrlBase::CreatePopup()
@@ -180,7 +210,7 @@ index b61aac35bf..d12b745e8c 100644
 -    if ( spaceBelow < szp.y )
 +    int anchorSideVertical = m_anchorSide & (wxUP | wxDOWN);
 +    if (// Pop up as asked for by the library user.
-+        (anchorSideVertical & wxUP) || 
++        (anchorSideVertical & wxUP) ||
 +        // Automatic: Pop up if it does not fit down.
 +        (anchorSideVertical == 0 && spaceBelow < szp.y ))
      {
@@ -228,7 +258,7 @@ index 74958fce10..59844f4526 100644
          return buffer;
      }
 diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
-index 20442bbc73..9a24951ec7 100644
+index 20442bbc73..bc2c35bee6 100644
 --- a/src/common/gdicmn.cpp
 +++ b/src/common/gdicmn.cpp
 @@ -863,11 +863,25 @@ void wxDisplaySize(int *width, int *height)
@@ -241,7 +271,7 @@ index 20442bbc73..9a24951ec7 100644
 +    if ( width )
 +        *width = size.x;
 +    if ( height )
-+        *height = size.y;    
++        *height = size.y;
 +}
 +
  wxSize wxGetDisplaySize()
@@ -257,8 +287,27 @@ index 20442bbc73..9a24951ec7 100644
  void wxClientDisplayRect(int *x, int *y, int *width, int *height)
  {
      const wxRect rect = wxGetClientDisplayRect();
+diff --git a/src/common/image.cpp b/src/common/image.cpp
+index 78fe5b82a3..46db8722ce 100644
+--- a/src/common/image.cpp
++++ b/src/common/image.cpp
+@@ -383,11 +383,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
+                     unsigned char red = pixel[0] ;
+                     unsigned char green = pixel[1] ;
+                     unsigned char blue = pixel[2] ;
+-                    unsigned char alpha = 255  ;
+-                    if ( source_alpha )
+-                        alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                     if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
+                     {
++                        unsigned char alpha = 255  ;
++                        if ( source_alpha )
++                            alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                         if ( alpha > 0 )
+                         {
+                             avgRed += red ;
 diff --git a/src/common/intl.cpp b/src/common/intl.cpp
-index 0b0d8798f4..7072fab18a 100644
+index 0b0d8798f4..294f542b1f 100644
 --- a/src/common/intl.cpp
 +++ b/src/common/intl.cpp
 @@ -1628,6 +1628,12 @@ GetInfoFromLCID(LCID lcid,
@@ -266,7 +315,7 @@ index 0b0d8798f4..7072fab18a 100644
                  str = buf;
  
 +//FIXME Vojtech: We forcefully set the locales for a decimal point to "C", but this
-+// is not possible for the Win32 locales, therefore there is a discrepancy. 
++// is not possible for the Win32 locales, therefore there is a discrepancy.
 +// It looks like we live with the discrepancy for at least half a year, so we will
 +// suppress the assert until we fix Slic3r to properly switch to "C" locales just
 +// for file import / export.
@@ -667,3 +716,28 @@ index de5f52860c..a9581174a4 100644
              return value;
  
          // TODO case wxSYS_FRAMESIZE_X:
+diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
+index b322e582c5..79de567333 100644
+--- a/src/osx/cocoa/window.mm
++++ b/src/osx/cocoa/window.mm
+@@ -190,6 +190,9 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
+ - (BOOL)isEnabled;
+ - (void)setEnabled:(BOOL)flag;
+ 
++- (BOOL)clipsToBounds;
++- (void)setClipsToBounds:(BOOL)clipsToBounds;
++
+ - (void)setImage:(NSImage *)image;
+ - (void)setControlSize:(NSControlSize)size;
+ 
+@@ -2505,6 +2508,7 @@ wxWidgetImpl( peer, flags )
+     if ( m_osxView )
+         CFRetain(m_osxView);
+     [m_osxView release];
++    m_osxView.clipsToBounds = YES;
+ }
+ 
+ 
+-- 
+2.41.0.windows.2
+

deps/wxWidgets/wxWidgets.cmake

@@ -1,12 +1,16 @@
-set(_wx_git_tag v3.1.5)
+set(_wx_version 3.1.5)
+set(_wx_git_tag v${_wx_version})
 
 set(_wx_toolkit "")
-    set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
-    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(_gtk_ver 2)
+
     if (DEP_WX_GTK3)
         set(_gtk_ver 3)
     endif ()
+
     set(_wx_toolkit "-DwxBUILD_TOOLKIT=gtk${_gtk_ver}")
 endif()
 
@@ -16,20 +20,35 @@ else ()
     set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF")
 endif ()
 
+set(_wx_orcaslicer_patch "${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch")
 if (MSVC)
-    set(_patch_cmd if not exist WXWIDGETS_PATCHED ( "${GIT_EXECUTABLE}" apply --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch && type nul > WXWIDGETS_PATCHED ) )
+    set(_patch_cmd if not exist WXWIDGETS_PATCHED ( "${GIT_EXECUTABLE}" apply --verbose --ignore-space-change --whitespace=fix ${_wx_orcaslicer_patch} && type nul > WXWIDGETS_PATCHED ) )
 else ()
-    set(_patch_cmd test -f WXWIDGETS_PATCHED || ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch && touch WXWIDGETS_PATCHED)
+    set(_patch_cmd test -f WXWIDGETS_PATCHED || ${PATCH_CMD} ${_wx_orcaslicer_patch} && touch WXWIDGETS_PATCHED)
 endif ()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch)
+    set(_patch_cmd ${PATCH_CMD} ${_wx_orcaslicer_patch})
 endif ()
 
+# Note: for anybody wanting to switch to tarball fetching - this won't just work as
+# git apply expects a git repo. Either git init empty repo, or change patching method.
+# if (WIN32)
+#     # Windows requires a different tarball because of configured line endings as stated in docs.
+#     set(_wx_tarball_url https://github.com/wxWidgets/wxWidgets/releases/download/${_wx_git_tag}/wxWidgets-${_wx_version}.7z)
+#     set(_wx_tarball_hash 99f5382312e4a4aea444ada07341a72c5d4a69b58d8e76586d4b94ede7f5ef4d)
+# else()
+#     set(_wx_tarball_url https://github.com/wxWidgets/wxWidgets/releases/download/${_wx_git_tag}/wxWidgets-${_wx_version}.tar.bz2)
+#     set(_wx_tarball_hash d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224)
+# endif()
+
 orcaslicer_add_cmake_project(
     wxWidgets
     GIT_REPOSITORY "https://github.com/wxWidgets/wxWidgets"
     GIT_TAG ${_wx_git_tag}
+    GIT_SHALLOW ON
+    # URL ${_wx_tarball_url}
+    # URL_HASH SHA256=${_wx_tarball_hash}
     PATCH_COMMAND ${_patch_cmd}
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG
     CMAKE_ARGS

doc/Auxiliary-fan.md

@@ -1 +1,35 @@
-WIP
+OrcaSlicer use `M106 P2` command to control auxiliary cooling fan.
+
+If you are using Klipper, you can define a `M106` macro to control the both normal part cooling fan and auxiliary fan and exhaust fan.  
+Below is a reference configuration for Klipper.   
+*Note: Don't forget to change the pin name to the actual pin name you are using in the configuration*
+
+```
+# instead of using [fan], we define the default part cooling fan with [fan_generic] here
+# this is the default part cooling fan
+[fan_generic fan0]
+pin: PA7
+cycle_time: 0.01
+hardware_pwm: false
+
+# this is the auxiliary fan
+# comment out it if you don't have auxiliary fan
+[fan_generic fan2]
+pin: PA8
+cycle_time: 0.01
+hardware_pwm: false
+
+# this is the exhaust fan
+# comment out it if you don't have exhaust fan
+[fan_generic fan3]
+pin: PA9
+cycle_time: 0.01
+hardware_pwm: false
+
+[gcode_macro M106]
+gcode:
+    {% set fan = 'fan' + (params.P|int if params.P is defined else 0)|string %}
+    {% set speed = (params.S|float / 255 if params.S is defined else 1.0) %}
+    SET_FAN_SPEED FAN={fan} SPEED={speed}
+
+```

doc/Calibration.md

@@ -10,12 +10,13 @@
   1. [Max Volumetric speed](#Max-Volumetric-speed)
   2. [VFA]  
 
-**NOTE**: After completing the calibration process, remember to create a new project in order to exit the calibration mode.
+**NOTE**: After completing the calibration process, remember to create a new project in order to exit the calibration mode.  
+**NOTE2**: @ItsDeidara has made a webpage to help with the calculation. Check it out if those equations give you a headache [here](https://orcalibrate.com/).
 # Flow rate
  ##### *NOTE: For Bambulab X1/X1C users, make sure you do not select the 'Flow calibration' option.*  
  ![uncheck](https://user-images.githubusercontent.com/103989404/221345187-3c317a46-4d85-4221-99b9-adb5c7f48026.jpeg)  
 ----------------------------------------
-![flowrate](https://user-images.githubusercontent.com/103989404/210137579-3fd141ad-f2da-4542-a1fd-fc4b4d673908.gif)
+![flowrate](./images/flow-calibration.gif)
 Calibrating the flow rate involves a two-step process.  
 Steps
 1. Select the printer, filament, and process you would like to use for the test.
@@ -29,8 +30,8 @@ Steps
 6. Perform the `Pass 2` calibration. This process is similar to `Pass 1`, but a new project with ten blocks will be generated. The flow rate modifiers for this project will range from `-9 to 0`.
 7. Repeat steps 4 and 5. In this case, if your previous flow ratio was 1.029 and you selected the block with a flow rate modifier of -6, the new value should be calculated as follows: `1.029x(100-6)/100 = 0.96726`. ** Remember ** to save the filament profile.  
 ![pass2](https://user-images.githubusercontent.com/103989404/210139072-f2fa91a6-4e3b-4d2a-81f2-c50155e1ff6d.jpg)
-![-6](https://user-images.githubusercontent.com/103989404/210139131-ee224146-b242-4c1c-ac96-35ef0ca591f1.jpg)
-![image](https://user-images.githubusercontent.com/103989404/210139721-919be130-fbba-4e3a-aa58-8a563e8c7792.png)
+![-6](https://user-images.githubusercontent.com/103989404/210139131-ee224146-b242-4c1c-ac96-35ef0ca591f1.jpg)  
+![image](./images/flowcalibration_update_flowrate.jpg)  
 
 # Pressure Advance
 

doc/Chamber-temperature.md

@@ -1 +1,52 @@
-WIP...
+OrcaSlicer use `M141/M191` command to control active chamber heater.  
+
+If `Activate temperature control` is checked, OrcaSlicer will insert `M191` command at the beginning of the gcode(before `Machine G-code`).  
+![image](./images/activate_chamber_heater.jpg)  
+*Note: If the machine is equipped with an auxiliary fan, OrcaSlicer will automatically activate the fan during the heating period to help circulate air in the chamber.*  
+
+
+There are two chamber temperature variables available that we can use in `Machine G-code` to control the chamber temperature, if you prefer:  
+To access the chamber temperature set in the first filament, use:  
+`M191 S{chamber_temperature[0]}`  
+To use the overall chamber temperature, which is the highest chamber temperature set across all filaments, use:    
+`M191 S{overall_chamber_temperature}`
+
+
+--------------------------Klipper--------------------------  
+If you are using Klipper, you can define these macros to control the active chamber heater.  
+Bellow is a reference configuration for Klipper.   
+*Note: Don't forget to change the pin name/values to the actual values you are using in the configuration*
+
+```
+[heater_generic chamber_heater]
+heater_pin:PB10
+max_power:1.0
+# Orca note: here the temperature sensor should be the sensor you are using for chamber temperature, not the PTC sensor
+sensor_type:NTC 100K MGB18-104F39050L32
+sensor_pin:PA1
+control = pid
+pid_Kp = 63.418 
+pid_ki = 0.960
+pid_kd = 1244.716
+min_temp:0
+max_temp:70
+
+[gcode_macro M141]
+gcode:
+    SET_HEATER_TEMPERATURE HEATER=chamber_heater TARGET={params.S|default(0)}
+
+[gcode_macro M191]
+gcode:
+    {% set s = params.S|float %}
+    {% if s == 0 %}
+        # If target temperature is 0, do nothing
+        M117 Chamber heating cancelled
+    {% else %}
+        SET_HEATER_TEMPERATURE HEATER=chamber_heater TARGET={s}
+        # Orca: uncomment the following line if you want to use heat bed to assist chamber heating
+        # M140 S100
+        TEMPERATURE_WAIT SENSOR="heater_generic chamber_heater" MINIMUM={s-1} MAXIMUM={s+1}
+        M117 Chamber at target temperature
+    {% endif %}
+
+```

doc/Extrusion-rate-smoothing.md

@@ -0,0 +1,181 @@
+<h1>Extrusion rate smoothing</h1>
+
+Extrusion rate smoothing (ERS), also known as pressure equalizer in Prusa Slicer, aims to **limit the rate of extrusion volume change to be below a user set threshold (the ERS value).** It aims to assist the printer firmware internal motion planners, pressure advance in achieving the desired nozzle flow and reducing deviations against the ideal flow. 
+
+This happens by reducing the stresses put on the extrusion system as well as reducing the absolute deviations from the ideal extrusion flow caused by pressure advance smooth time. 
+
+This feature is especially helpful when printing at high accelerations and large flow rates as the deviations are larger in these cases.
+
+![Screenshot 2023-09-18 at 22 44 26](https://github.com/SoftFever/OrcaSlicer/assets/59056762/281b9c78-9f5c-428e-86b9-509de099a3e7)
+
+<h2>Theory</h2>
+
+Enabling this feature creates a small **speed "ramp"** by slowing down and ramping up print speeds prior to and after the features causing a sudden change in extrusion flow rate needs, such as overhangs and overhang perimeters. 
+
+This works by breaking down the printed line segments into smaller "chunks", proportional to the ERS segment length, and reduces the print speed of these segments so that the **requested extrusion volumetric flow rate change is less than or equal to the ERS threshold**.
+
+In summary, **it takes the "edge" off rapid extrusion changes caused by acceleration/deceleration as these are now spread over a longer distance and time.** Therefore, it can reduce wall artefacts that show when the print speeds change suddenly. These artefacts are occuring because the extruder and firmware cannot perfectly adhere to the requested by the slicer flow rates, especially when the extrusion rate is changing rapidly. 
+
+**The example below shows the artefact that is mitigated by ERS.**
+![ERS Disabled](https://github.com/SoftFever/OrcaSlicer/assets/59056762/31fdbf91-2067-4286-8bc1-4f7de4a628b6)
+
+The bulging visible above is due to the extruder not being able to respond fast enough against the required speed change when printing with high accelerations and high speeds and requested to slow down for an overhang. 
+
+In the above scenario, the printer (Bambu Lab X1 Carbon) was requested to slow down from a 200mm/sec print speed to 40mm/sec at an acceleration of 5k/sec2. **The extruder could not keep up with the pressure change, resulting in a slight bump ahead at the point of speed change.**
+
+This parameter interacts with the below printer kinematic settings and physical limits:
+
+
+**1. The limits of the extruder system** - how fast can it change pressure in the nozzle
+
+**2. The configured pressure advance values** - that also affect pressure changes in the nozzle
+
+**3. The acceleration profile of the printer** - higher accelerations mean higher pressure changes
+
+**4. The pressure advance smooth time (klipper)** - higher smooth time means higher deviation from ideal extrusion, hence more opportunity for this feature to be useful.
+
+
+<h3>Acceleration vs. Extrusion rate smoothing</h3>
+A printer's motion system does not exactly follow the speed changes seen in the gcode preview screen of Orca slicer. 
+
+
+When a speed change is requested, the firmware look ahead planner calculates the slow down needed to achieve the target speed. The rate of slowdown is limited by the move's acceleration value. 
+
+**Lets consider an example.** Assume printing an overhang wall with **2k external wall acceleration**, were the printer is called to slow down from **200mm/sec to 40mm/sec**.
+
+This deceleration move would happen over approximately 9.6mm. This is derived from the following equation:
+
+![image](https://github.com/igiannakas/OrcaSlicer/assets/59056762/4ba0356b-49ab-428c-ab10-f2c88bcc1bcb)
+
+![image](https://github.com/igiannakas/OrcaSlicer/assets/59056762/3958deb5-fbc3-4d07-8903-4575033717fd)
+
+The time taken to decelerate to this new speed would be approx. 0.08 seconds, derived from the following equation:
+
+![image](https://github.com/igiannakas/OrcaSlicer/assets/59056762/ea9f19b4-defe-4656-9ecc-a6576c87d8e0)
+
+A printer printing at 200mm/sec with a 0.42 line width and 0.16 layer height would be extruding plastic at approx. 12.16mm3/sec, as can also be seen from the below visual.
+
+![image](https://github.com/igiannakas/OrcaSlicer/assets/59056762/83242b26-7174-4da1-b815-d9fcec767bcd)
+
+When the printer is extruding at 40mm/sec with the same line width and layer height as above, the flow rate is 2.43mm3/sec.
+
+So what we are asking the extruder to do in this example is **slow down from 12.16mm3/sec flow to 2.43mm3/sec flow in 0.08 seconds** or an extrusion change rate of 121mm3/sec2. 
+
+**This value is proportional to the acceleration of the printer. At 4k this value doubles, at 1k it is half and is independent of the speed of movement or starting and ending speeds.**
+
+**This value is also proportional to the line width - double the line width will result in double the extrusion rate change and vice versa. Same for layer height.**
+
+So, continuing with the worked example, a 2k acceleration produces an extrusion rate change ramp of 121mm3/sec2. **Therefore, setting a value higher than this would not bring any benefit to the print quality as the motion system would slow down less aggressively based on its acceleration settings.**
+
+**Therefore, the acceleration values act as a meaningfull upper limit to this setting.** An indicative set of values has been provided later in this page.
+
+<h3>Pressure advance vs extrusion rate smoothing</h3>
+
+Then we need to consider pressure advance and smooth time as factors that influence extrusion rate.
+
+**Pressure Advance** adjusts the extruder's speed to account for the pressure changes inside the hot end’s melt zone. When the print head moves and extrudes filament, there's a delay between the movement of the extruder gear and the plastic being extruded due to the compressibility of the molten plastic in the hot end. This delay can cause too much plastic to be extruded when the print head starts moving or not enough plastic when the print head stops, leading to issues like blobbing or under-extrusion.
+
+**Pressure Advance Smooth time** helps to mitigate potential negative effects on print quality due to the rapid changes in extruder flow rate, which are controlled by the Pressure Advance algorithm. This parameter essentially adds a smoothing effect to the adjustments made by Pressure Advance, aiming to prevent sharp or sudden changes in the extrusion rate.
+
+When Pressure Advance adjusts the extruder speed to compensate for the pressure build-up or reduction in the hot end, it can lead to abrupt changes in the flow rate. These abrupt changes can potentially cause issues like:
+
+1. Extruder motor skipping,
+2. Increased wear on the extruder gear and filament,
+3. Visible artifacts on the print surface due to non-uniform extrusion.
+
+The smooth time setting introduces a controlled delay over which the Pressure Advance adjustments are spread out. This results in a more gradual application or reduction of extrusion pressure, leading to smoother transitions in filament flow. 
+
+The trade-off is extrusion accuracy. There is a deviation between the requested extrusion amount and the actual extrusion amount due to this smoothing.
+
+**1. Increasing Smooth Time:** Leads to more gradual changes in extrusion pressure. While this can reduce artifacts and stress on the extruder system, setting it too high may diminish the effectiveness of Pressure Advance, as the compensation becomes too delayed to counteract the pressure dynamics accurately.
+
+**2. Decreasing Smooth Time:** Makes the Pressure Advance adjustments more immediate, which can improve the responsiveness of pressure compensation but may also reintroduce abrupt changes in flow rate, potentially leading to the issues mentioned above.
+
+In essence, p**ressure advance smooth time creates an intentional deviation from the ideal extruder rotation** and, therefore, extrusion amount, to allow the printer's extruder to perform within its mechanical limits. Typically, this value is set to 0.04sec, which means that when Pressure Advance adjusts the extruder's flow rate to compensate for changes in pressure within the hot end, these adjustments are spread out over a period of 0.04 seconds. 
+
+There is a great example of pressure advance smooth time induced deviations [here](https://klipper.discourse.group/t/pressure-advance-smooth-time-skews-pressure-advance/13451) that is worth a read to get more insight in this trade-off.
+
+In the worked example above, **we need to set an Extrusion Rate smoothing value enough to decrease the error introduced by pressure advance smooth time against the produced output flow.** The lower the extrusion rate smoothing value, the lower the changes in flow over time hence the lower the absolute deviation from the ideal extrusion caused by the smooth time algorithm. However, going too low will result in a material decrease in overall print speed, as the print speed will be materially reduced to achieve low extrusion deviations between features, for no real benefit after a point.
+
+**The best way to find what the lower beneficial limit is through experimentation.** Print an object with sharp overhangs that are slowed down because off the overhang print speed settings and observe for extrusion inconsistencies. 
+
+<h2>Finding the ideal Extrusion Rate smoothing value</h2>
+
+**Firstly, this value needs to be lower than the extrusion rate changes resulting from the acceleration profile of the printer.** As, generally, the greatest impact is in external wall finish, use your external perimeter acceleration as a point of reference. 
+
+**Below are some approximate ERS values for 0.42 line width and 0.16 layer height.**
+1. 30mm3/sec for 0.5k acceleration
+2. 60.5mm3/sec for 1k acceleration
+3. 121mm3/sec2 for 2k acceleration
+4. 242mm3/sec2 for 4k acceleration
+
+**Below are some approximate ERS values for 0.42 line width and 0.20 layer height.**
+1. 38mm3/sec for 0.5k acceleration
+2. 76mm3/sec for 1k acceleration
+3. 150mm3/sec2 for 2k acceleration
+4. 300mm3/sec2 for 4k acceleration
+
+**Below are some approximate ERS values for 0.45 line width and 0.16 layer height.**
+1. 32mm3/sec for 0.5k acceleration
+2. 65mm3/sec for 1k acceleration
+3. 129mm3/sec2 for 2k acceleration
+4. 260mm3/sec2 for 4k acceleration
+
+**So, your tuning starting point needs to be an ERS value that is less than this.** A good point experiment with test prints would be **a value of 60-80%** of the above maximum values. This will give some meaningful assistance to pressure advance, reducing the deviation introduced by pressure advance smooth time. The greater the smooth time, the greater the quality benefit will be.
+
+Therefore, for a **0.42 line width and 0.16 layer height**, the below are a recommended set of starting ERS values
+1. 18-25mm3/sec for 0.5k acceleration
+2. 35-50mm3/sec for 1k acceleration
+3. 70-100mm3/sec2 for 2k acceleration
+4. 145-200mm3/sec2 for 4k acceleration
+
+If you are printing with a 0.2 layer height, you can increase these values by 25% and similarly reduce if printing with lower.
+
+**The second factor is your extruder's mechanical abilities.** Direct drive extruders with a good grip on the filament typically are more responsive to extrusion rate changes. Similarly with stiff filaments. So, a Bowden printer or when printing softer material like TPU or soft PLAs like polyterra there is more opportunity for the extruder to slip or deviate from the desired extrusion amount due to mechanical grip or material deformation or just delay in propagating the pressure changes (in a Bowden setup).
+
+**The final factor is the deviation introduced by pressure advance smooth time**, or equivalents in closed source firmware. The higher this value the larger the extrusion deviation from ideal. If you are using a direct drive extruder, reduce this value to 0.02 in your klipper firmware before tuning ERS, as a lower value results in lower deviations to mitigate. Then proceed to experimentaly tune ERS. 
+
+**So where does that leave us?**
+
+Perform a test print with the above ERS settings as a starting point and adjust to your liking! If you notice budging on sharp overhangs where speed changes, like the hull of the benchy, reduce this value by 10% and try again. 
+
+If you're not noticing any artefacts, increase by 10%, but don’t go over the maximum values recommended above because then this feature would have no effect in your print.
+
+<h2>A note for Bowden printers using marlin without pressure advance. </h2>
+If your printer is not equipped with pressure advance and, especially, if you are using a Bowden setup, you don’t have the benefit of pressure advance dynamically adjusting your flow. 
+
+
+In this special case, ERS will be doing all the heavy lifting that pressure advance would typically perform. In this scenario a low value of 8-10mm3/sec is usually recommended, irrespective of your acceleration settings, to smooth out pressure changes in the extrusion system as much as possible without impacting print speed too much. 
+
+<h2>A note on ERS Segment length </h2>
+Ideally you want this value set to 1 to allow for the largest number of steps between each speed transition. However, this may result in a too large of a gcode, with too many commands sent to your MCU per second and it may not be able to keep up. It will also slow down the Orca slicer front end as the sliced model is more complex to render.
+
+
+For Klipper printers, a segment length of 1 works OK as the RPI or similar have enough computational power to handle the gcode command volume. 
+
+Similarly, for a Bambu lab printer, a segment length of 1 works well. **However, if you do notice your printer stuttering or stalling** (which may be the case with the lower powered P1 series printers) **or getting "Timer too close" errors** in Klipper, **increase this value to 2 or 3**. This would reduce the effectiveness of the setting but will present a more manageable load to your printer.
+
+<h2>Limitations</h2>
+
+**This feature can only work where speed changes are induced by the slicer** - for example when transitioning from fast to slow print moves when printing overhangs, bridges and from printing internal features to external features and vice versa. 
+
+However, it will not affect extruder behaviour when the printer is slowing down due to firmware commands - for example when turning around corners. 
+
+In this case, the printer slows down and then accelerates independently of what the slicer has requested. In this case, the slicer is commanding a consistent speed; however, the printer is adjusting this to operate within its printer kinematic limits (SCV/Jerk) and accelerations. As the slicer is not aware of this slow down, it cannot apply pre-emptive extrusion rate smoothing to the feature and instead, the changes are governed by the printer firmware exclusively.
+
+<h2>Credits</h2>
+
+**Original feature authors and creators:** The Prusa Slicer team, including [@bubnikv](https://github.com/bubnikv), [@hejllukas](https://github.com/hejllukas)
+
+**Enhanced by:** [@MGunlogson](https://github.com/MGunlogson), introducing the feature to external perimeters, enhancing it by taking into account travel, retraction and implementing near-contiguous extrusions pressure equalizer adjustments.
+
+**Ported to Orca:** [@igiannakas](https://github.com/igiannakas)
+
+**Enhanced by:** [@noisyfox](https://github.com/Noisyfox), per object pressure equalization and fixing calculation logic bugs
+
+**Wiki page:** [@igiannakas](https://github.com/igiannakas)
+
+**Overall Orca owner and assurance:** [@softfever](https://github.com/SoftFever)
+
+**Community testing and feedback:** [@HakunMatat4](https://github.com/HakunMatat4), [@psiberfunk](https://github.com/psiberfunk), [@u3dreal](https://github.com/u3dreal) and more
+

doc/Precise-wall.md

@@ -0,0 +1,13 @@
+The 'Precise Wall' is a distinctive feature introduced by OrcaSlicer, aimed at improving the dimensional accuracy of prints and minimizing layer inconsistencies by slightly increasing the spacing between the outer wall and the inner wall.
+
+Below is a technical explanation of how this feature works. 
+First, it's important to understand some basic concepts like flow, extrusion width, and space. Slic3r has an excellent document that covers these topics in detail. You can refer to this article: [link to article](https://manual.slic3r.org/advanced/flow-math).
+
+Now, let's dive into the specifics. Slic3r and its forks, such as PrusaSlicer, SuperSlicer, and OrcaSlicer, assume that the extrusion path has an oval shape, which accounts for the overlaps. For example, if we set the wall width to 0.4mm and the layer height to 0.2mm, the combined thickness of two walls laid side by side is 0.714mm instead of 0.8mm due to the overlapping.   
+![image](./images/precise_wall.png)   
+This approach enhances the strength of 3D-printed parts. However, it does have some side effects. For instance, when the inner-outer wall order is used, the outer wall can be pushed outside, leading to potential size inaccuracy and more layer inconsistency.
+
+It's important to keep in mind that this approach to handling flow is specific to Slic3r and it's forks. Other slicing software, such as Cura, assumes that the extrusion path is rectangular and, therefore, does not include overlapping. Two 0.4 mm walls will result in a 0.8 mm shell thickness in Cura
+
+OrcaSlicer adheres to Slic3r's approach to handling flow. To address the downsides mentioned earlier, OrcaSlicer introduced the 'Precise Wall' feature. When this feature is enabled in OrcaSlicer, the overlap between the outer wall and its adjacent inner wall is set to zero. This ensures that the overall strength of the printed part is unaffected, while the size accuracy and layer consistency are improved.
+

doc/Print-settings.md

@@ -4,4 +4,5 @@ Print settings:
 * [Axiliary fan](auxiliary-fan)
 * [Chamber temperature](chamber-temperature)
 * [Air filtration/Exhaust fan](air-filtration)
-* [Single Extruder Multimaterial](semm)
+* [Single Extruder Multimaterial](semm)
+* [Precise wall](Precise-wall)

doc/Seam.md

@@ -1,5 +1,8 @@
 WIP...
 
+### Scarf joint seam
+WIP...
+
 ### Seam gap
 ![image](https://user-images.githubusercontent.com/103989404/215331359-236874c9-ca91-4dd4-b969-3cefc70ebe1b.png)
 

doc/adaptive-bed-mesh.md

@@ -0,0 +1,42 @@
+# Adaptive Bed Mesh Support
+Orca Slicer introduces comprehensive support for adaptive bed meshing across a variety of firmware, including Marlin, Klipper, and RepRapFirmware (RRF).   
+This feature allows users to seamlessly integrate adaptive bed mesh commands within the Machine Start G-code.  
+The implementation is designed to be straightforward, requiring no additional plugins or alterations to firmware settings, thereby enhancing user experience and print quality directly from Orca Slicer.
+
+
+![Screenshot 2024-02-24 104601](https://github.com/SoftFever/OrcaSlicer/assets/103989404/8ab1f26f-987d-4419-942f-b1384270a164)  
+
+## Settings in Orca Slicer:
+`Bed mesh min`: This option sets the min point for the allowed bed mesh area. Due to the probe's XY offset, most printers are unable to probe the entire bed. To ensure the probe point does not go outside the bed area, the minimum and maximum points of the bed mesh should be set appropriately. OrcaSlicer ensures that adaptive_bed_mesh_min/adaptive_bed_mesh_max values do not exceed these min/max points. This information can usually be obtained from your printer manufacturer. The default setting is (-99999, -99999), which means there are no limits, thus allowing probing across the entire bed.
+
+`Bed mesh max`: This option sets the max point for the allowed bed mesh area. Due to the probe's XY offset, most printers are unable to probe the entire bed. To ensure the probe point does not go outside the bed area, the minimum and maximum points of the bed mesh should be set appropriately. OrcaSlicer ensures that adaptive_bed_mesh_min/adaptive_bed_mesh_max values do not exceed these min/max points. This information can usually be obtained from your printer manufacturer. The default setting is (99999, 99999), which means there are no limits, thus allowing probing across the entire bed.
+
+`Probe point distance`: This option sets the preferred distance between probe points (grid size) for the X and Y directions, with the default being 50mm for both X and Y.
+
+`Mesh margin`: This option determines the additional distance by which the adaptive bed mesh area should be expanded in the XY directions. Note for Klipper users: Orca Slicer will adjust adaptive bed mesh area according to the margin. It is recommended to set the margin to 0 in Klipper config or pass 0 when calling BED_MESH_CALIBRATE command(please refer to the example below).
+
+## Available g-code variables for Adaptive Bed Mesh Command  
+`bed_mesh_probe_count`: Represents the probe count in the X and Y directions. This value is calculated based on the size of the adaptive bed mesh area and the distance between probe points.
+
+`adaptive_bed_mesh_min`: Specifies the minimum coordinates of the adaptive bed mesh area, defining the starting point of the mesh.
+
+`adaptive_bed_mesh_max`: Determines the maximum coordinates of the adaptive bed mesh area, indicating the endpoint of the mesh.
+
+`ALGORITHM`: Identifies the algorithm used for adaptive bed mesh interpolation. This variable is useful for Klipper users. If bed_mesh_probe_count is less than 4, the algorithm is set to `lagrange`. Otherwise, it is set to `bicubic`. 
+
+## Example of Adaptive Bed Mesh usage in Orca Slicer:  
+
+### Marlin:
+```
+G29 X{bed_mesh_probe_count[0]} Y{bed_mesh_probe_count[1]} L{adaptive_bed_mesh_min[0]} R{adaptive_bed_mesh_max[0]} F{adaptive_bed_mesh_min[1]} B{adaptive_bed_mesh_max[1]} T V4
+```
+### Klipper:
+```
+; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally
+BED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=1 ADAPTIVE_MARGIN=0
+```
+### RRF:
+```
+M557 X{adaptive_bed_mesh_min[0]}:{adaptive_bed_mesh_max[0]} Y{adaptive_bed_mesh_min[1]}:{adaptive_bed_mesh_max[1]} P{bed_mesh_probe_count[0]}:{bed_mesh_probe_count[1]}  
+```  
+![Screenshot 2024-02-24 104759](https://github.com/SoftFever/OrcaSlicer/assets/103989404/ad4a8020-bec6-4361-abb9-4017ca77471f)

doc/air-filtration.md

@@ -1 +1,35 @@
-WIP
+OrcaSlicer use `M106 P3` command to control air-filtration/exhaust fan.
+
+If you are using Klipper, you can define a `M106` macro to control the both normal part cooling fan and auxiliary fan and exhaust fan.  
+Below is a reference configuration for Klipper.   
+*Note: Don't forget to change the pin name to the actual pin name you are using in the configuration*
+
+```
+# instead of using [fan], we define the default part cooling fan with [fan_generic] here
+# this is the default part cooling fan
+[fan_generic fan0]
+pin: PA7
+cycle_time: 0.01
+hardware_pwm: false
+
+# this is the auxiliary fan
+# comment out it if you don't have auxiliary fan
+[fan_generic fan2]
+pin: PA8
+cycle_time: 0.01
+hardware_pwm: false
+
+# this is the exhaust fan
+# comment out it if you don't have exhaust fan
+[fan_generic fan3]
+pin: PA9
+cycle_time: 0.01
+hardware_pwm: false
+
+[gcode_macro M106]
+gcode:
+    {% set fan = 'fan' + (params.P|int if params.P is defined else 0)|string %}
+    {% set speed = (params.S|float / 255 if params.S is defined else 1.0) %}
+    SET_FAN_SPEED FAN={fan} SPEED={speed}
+
+```

localazy.json

@@ -39,6 +39,11 @@
 				"pattern": "localization/i18n/hu/OrcaSlicer_hu.po",
 				"lang": "hu"
 			},
+			{
+				"type": "po",
+				"pattern": "localization/i18n/ja/OrcaSlicer_hu.po",
+				"lang": "it"
+			},
 			{
 				"type": "po",
 				"pattern": "localization/i18n/ja/OrcaSlicer_ja.po",
@@ -63,6 +68,11 @@
 				"type": "po",
 				"pattern": "localization/i18n/tr/OrcaSlicer_tr.po",
 				"lang": "tr"
+			},
+			{
+				"type": "po",
+				"pattern": "localization/i18n/tr/OrcaSlicer_pl.po",
+				"lang": "pl"
 			}
 		]
 	},

localization/i18n/list.txt

@@ -7,13 +7,16 @@ src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
 src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
 src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
 src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
-src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
+src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
 src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
 src/slic3r/GUI/Gizmos/GLGizmoFaceDetector.cpp
 src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
 src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
 src/slic3r/GUI/Gizmos/GLGizmoText.cpp
 src/slic3r/GUI/Gizmos/GLGizmoText.hpp
+src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
+src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
 src/slic3r/GUI/GUI.cpp
 src/slic3r/GUI/GUI_App.cpp
 src/slic3r/GUI/GUI_AuxiliaryList.cpp
@@ -35,8 +38,6 @@ src/slic3r/GUI/ImGuiWrapper.cpp
 src/slic3r/GUI/Jobs/ArrangeJob.cpp
 src/slic3r/GUI/Jobs/OrientJob.cpp
 src/slic3r/GUI/Jobs/FillBedJob.cpp
-src/slic3r/GUI/Jobs/Job.cpp
-src/slic3r/GUI/Jobs/PlaterJob.cpp
 src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
 src/slic3r/GUI/Jobs/BindJob.cpp
 src/slic3r/GUI/Jobs/PrintJob.cpp
@@ -57,6 +58,7 @@ src/slic3r/GUI/BedShapeDialog.hpp
 src/slic3r/GUI/ConfigManipulation.cpp
 src/slic3r/GUI/DeviceManager.cpp
 src/slic3r/GUI/ExtraRenderers.cpp
+src/slic3r/GUI/EditGCodeDialog.cpp
 src/slic3r/GUI/Field.cpp
 src/slic3r/GUI/GCodeViewer.cpp
 src/slic3r/GUI/GLCanvas3D.cpp
@@ -95,12 +97,14 @@ src/slic3r/GUI/Selection.cpp
 src/slic3r/GUI/SelectMachine.cpp
 src/slic3r/GUI/SendSystemInfoDialog.cpp
 src/slic3r/GUI/SendToPrinter.cpp
+src/slic3r/GUI/SlicingProgressNotification.cpp
 src/slic3r/GUI/BindDialog.cpp
 src/slic3r/GUI/Tab.cpp
 src/slic3r/GUI/Tab.hpp
 src/slic3r/GUI/UnsavedChangesDialog.cpp
 src/slic3r/GUI/Auxiliary.cpp
 src/slic3r/GUI/UpdateDialogs.cpp
+src/slic3r/GUI/UnsavedChangesDialog.cpp
 src/slic3r/GUI/WipeTowerDialog.cpp
 src/slic3r/GUI/wxExtensions.cpp
 src/slic3r/GUI/WebUserLoginDialog.cpp
@@ -141,8 +145,17 @@ src/slic3r/GUI/CalibrationWizardPresetPage.cpp
 src/slic3r/GUI/CalibrationWizardCaliPage.cpp
 src/slic3r/GUI/CaliHistoryDialog.cpp
 src/slic3r/GUI/BonjourDialog.cpp
-src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
-src/slic3r/GUI/PrintHostDialogs.cpp
 src/slic3r/GUI/calib_dlg.cpp
+src/slic3r/GUI/PrintHostDialogs.cpp
+src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
+src/slic3r/GUI/NetworkTestDialog.cpp
+src/slic3r/GUI/CreatePresetsDialog.cpp
+src/slic3r/GUI/DailyTips.cpp
+src/slic3r/Utils/CalibUtils.cpp
 src/slic3r/GUI/PhysicalPrinterDialog.cpp
-src/slic3r/Utils/CalibUtils.cpp
+src/slic3r/Utils/AstroBox.cpp
+src/slic3r/Utils/Duet.cpp
+src/slic3r/Utils/FlashAir.cpp
+src/slic3r/Utils/MKS.cpp
+src/slic3r/Utils/OctoPrint.cpp
+src/slic3r/Utils/Repetier.cpp

resources/config.json

@@ -1,131 +0,0 @@
-{
-    "printers": [
-      {
-        "display_name": "Bambu Lab P1P",
-        "func": {
-          "FUNC_CHAMBER_TEMP": false,
-          "FUNC_FIRSTLAYER_INSPECT": false,
-          "FUNC_AI_MONITORING": true,
-          "FUNC_LIDAR_CALIBRATION": false,
-          "FUNC_BUILDPLATE_MARKER_DETECT": false,
-          "FUNC_FLOW_CALIBRATION": false,
-          "FUNC_MONITORING": false,
-          "FUNC_MEDIA_FILE": false,
-          "FUNC_VIRTUAL_CAMERA": false,
-          "FUNC_PRINT_WITHOUT_SD": false,
-          "FUNC_ALTER_RESOLUTION": false,
-          "FUNC_PRINT_ALL": false,
-          "FUNC_EXTRUSION_CALI": true,
-          "FUNC_MOTOR_NOISE_CALI": false,
-          "FUNC_PROMPT_SOUND": false,
-          "FUNC_VIRTUAL_TYAY": true
-        },
-        "camera_resolution": [ "720p" ],
-        "bed_temperature_limit": 100,
-        "model_id": "C11",
-        "printer_type": "C11",
-        "compatible_machine": [ "BL-P001", "BL-P002", "C12", "C13"],
-        "ftp_folder": "sdcard/",
-        "printer_thumbnail_image": "printer_thumbnail_p1p"
-      },
- {
-        "display_name": "Bambu Lab P1S",
-        "func": {
-          "FUNC_CHAMBER_TEMP": false,
-          "FUNC_FIRSTLAYER_INSPECT": false,
-          "FUNC_AI_MONITORING": true,
-          "FUNC_LIDAR_CALIBRATION": false,
-          "FUNC_BUILDPLATE_MARKER_DETECT": false,
-          "FUNC_FLOW_CALIBRATION": false,
-          "FUNC_MONITORING": false,
-          "FUNC_MEDIA_FILE": false,
-          "FUNC_VIRTUAL_CAMERA": false,
-          "FUNC_PRINT_WITHOUT_SD": false,
-          "FUNC_ALTER_RESOLUTION": false,
-          "FUNC_PRINT_ALL": false,
-          "FUNC_MOTOR_NOISE_CALI": false,
-          "FUNC_PROMPT_SOUND": false,
-          "FUNC_VIRTUAL_TYAY": true
-        },
-        "camera_resolution": [ "720p" ],
-        "bed_temperature_limit": 100,
-        "model_id": "C12",
-        "compatible_machine":["BL-P001", "BL-P002", "C11", "C13"],
-        "printer_type": "C12",
-        "ftp_folder" : "sdcard/",
-        "printer_thumbnail_image": "printer_thumbnail_p1p"
-      },
-      {
-          "display_name": "Bambu Lab A1 mini",
-          "func": {
-            "FUNC_CHAMBER_TEMP": false,
-            "FUNC_FIRSTLAYER_INSPECT": false,
-            "FUNC_AI_MONITORING": false,
-            "FUNC_BUILDPLATE_MARKER_DETECT": false,
-            "FUNC_FLOW_CALIBRATION": true,
-            "FUNC_MONITORING": false,
-            "FUNC_MEDIA_FILE": false,
-            "FUNC_VIRTUAL_CAMERA": false,
-            "FUNC_PRINT_WITHOUT_SD": false,
-            "FUNC_ALTER_RESOLUTION": true,
-            "FUNC_CHAMBER_FAN": false,
-            "FUNC_AUX_FAN": false,
-            "FUNC_UPDATE_REMAIN": false,
-            "FUNC_EXTRUSION_CALI": false,
-            "FUNC_AUTO_LEVELING": true
-        },
-        "printer_arch" : "i3",
-        "camera_resolution": [ "720p" ],
-        "bed_temperature_limit": 100,
-        "model_id": "N1",
-        "compatible_machine":[],
-        "printer_type": "N1",
-        "ftp_folder" : "sdcard/",
-        "printer_thumbnail_image": "printer_thumbnail_n1"
-      },
-      {
-        "display_name": "Bambu Lab X1",
-        "func": {
-          "FUNC_CHAMBER_TEMP": false,
-          "FUNC_VIRTUAL_TYAY": true,
-          "FUNC_EXTRUSION_CALI": false,
-          "FUNC_MOTOR_NOISE_CALI": false,
-          "FUNC_PROMPT_SOUND": false
-        },
-        "model_id": "BL-P002",
-        "compatible_machine": [ "BL-P001", "C11", "C12", "C13"],
-        "camera_resolution": [ "720p", "1080p" ],
-        "printer_type": "3DPrinter-X1",
-        "printer_thumbnail_image": "printer_thumbnail"
-      },
-      {
-        "display_name": "Bambu Lab X1E",
-        "func": {
-          "FUNC_MOTOR_NOISE_CALI": false,
-          "FUNC_PROMPT_SOUND": false
-        },
-        "camera_resolution": [ "720p", "1080p" ],
-        "nozzle_max_temperature": 330,
-        "model_id": "C13",
-        "compatible_machine": [ "BL-P001", "BL-P002", "C11", "C12"],
-        "printer_type": "C13",
-        "printer_thumbnail_image": "printer_thumbnail"
-      },
-      {
-        "display_name": "Bambu Lab X1 Carbon",
-        "func": {
-          "FUNC_CHAMBER_TEMP": false,
-          "FUNC_VIRTUAL_TYAY": true,
-          "FUNC_EXTRUSION_CALI": false,
-          "FUNC_LOCAL_TUNNEL": false,
-          "FUNC_MOTOR_NOISE_CALI": false,
-          "FUNC_PROMPT_SOUND": false
-        },
-        "model_id": "BL-P001",
-        "compatible_machine": [ "BL-P002", "C11", "C12", "C13"],
-        "camera_resolution": [ "720p", "1080p" ],
-        "printer_type": "3DPrinter-X1-Carbon",
-        "printer_thumbnail_image": "printer_thumbnail"
-      }
-    ]
-}

resources/data/hints.ini

@@ -62,111 +62,121 @@
 # Weight must be larger or equal to 1. Default weight is 1.
 # Weight defines probability as weight : sum_of_all_weights.
 
-[hint:3D Scene Operations]
-text = 3D Scene Operations\nDid you know how to control view and object/part selection with mouse and touchpanel in the 3D scene?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/3d-scene-operations
+[hint:Precise wall]
+text = Precise wall\nDid you know that turning on precise wall can improve precision and layer consistency?
+documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Precise-wall
+
+[hint:Sandwich mode]
+text = Sandwich mode\nDid you know that you can use sandwich mode (inner-outer-inner) to improve precision and layer consistency if your model doesn't have very steep overhangs?
+
+[hint:Chamber temperature]
+text = Chamber temperature\nDid you know that OrcaSlicer supports chamber temperature?
+documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Chamber-temperature
+
+[hint:Calibration]
+text = Calibration\nDid you know that calibrating your printer can do wonders? Check out our beloved calibration solution in OrcaSlicer.
+documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Calibration
+
+[hint:Auxiliary fan]
+text = Auxiliary fan\nDid you know that OrcaSlicer supports Auxiliary part cooling fan?
+documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Auxiliary-fan
+
+[hint:Air filtration]
+text = Air filtration/Exhaust Fan\nDid you know that OrcaSlicer can support Air filtration/Exhaust Fan?
+documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/air-filtration
+
+[hint:G-code window]
+text = G-code window\nYou can turn on/off the G-code window by pressing the <b>C</b> key.
+
+[hint:Switch workspaces]
+text = Switch workspaces\nYou can switch between <b>Prepare</b> and <b>Preview</b> workspaces by pressing the <b>Tab</b> key.
+
+[hint:How to use keyboard shortcuts]
+text = How to use keyboard shortcuts\nDid you know that Orca Slicer offers a wide range of keyboard shortcuts and 3D scene operations.
+
+[hint:Reverse on odd]
+text = Reverse on odd\nDid you know that <b>Reverse on odd</b> feature can significantly improve the surface quality of your overhangs?
 
 [hint:Cut Tool]
 text = Cut Tool\nDid you know that you can cut a model at any angle and position with the cutting tool?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/cut-tool
 
 [hint:Fix Model]
-text = Fix Model\nDid you know that you can fix a corrupted 3D model to avoid a lot of slicing problems?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/fix-model
+text = Fix Model\nDid you know that you can fix a corrupted 3D model to avoid a lot of slicing problems on the Windows system?
 
 [hint:Timelapse]
 text = Timelapse\nDid you know that you can generate a timelapse video during each print?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/Timelapse
 
 [hint:Auto-Arrange]
 text = Auto-Arrange\nDid you know that you can auto-arrange all objects in your project?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/auto-arranging
 
 [hint:Auto-Orient]
 text = Auto-Orient\nDid you know that you can rotate objects to an optimal orientation for printing by a simple click?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/auto-orientation
 
 [hint:Lay on Face]
 text = Lay on Face\nDid you know that you can quickly orient a model so that one of its faces sits on the print bed? Select the \"Place on face\" function or press the <b>F</b> key.
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/lay-on-face
 
 [hint:Object List]
 text = Object List\nDid you know that you can view all objects/parts in a list and change settings for each object/part?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/object-list
 
-#[hint:Search Functionality]
-#text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Orca Slicer setting? Or use the familiar shortcut <b>Ctrl+F</b>.
+[hint:Search Functionality]
+text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Orca Slicer setting?
 
 [hint:Simplify Model]
-text = Simplify Model\nDid you know that you can reduce the number of triangles in a mesh using the Simplify mesh feature? Right-click the model and select Simplify model. Read more in the documentation.
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/simplify-model
+text = Simplify Model\nDid you know that you can reduce the number of triangles in a mesh using the Simplify mesh feature? Right-click the model and select Simplify model.
 
 [hint:Slicing Parameter Table]
 text = Slicing Parameter Table\nDid you know that you can view all objects/parts on a table and change settings for each object/part?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/parameter-table
 
 [hint:Split to Objects/Parts]
 text = Split to Objects/Parts\nDid you know that you can split a big object into small ones for easy colorizing or printing?
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/split-to-objects-parts
 
 [hint:Subtract a Part]
-text = Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Orca Slicer. Read more in the documentation.
-documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/subtract-a-part
+text = Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Orca Slicer.
 
 [hint:STEP]
 text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nOrca Slicer supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/step
 
 [hint:Z seam location]
 text = Z seam location\nDid you know that you can customize the location of the Z seam, and even paint it on your print, to have it in a less visible location? This improves the overall look of your model. Check it out!
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/Seam
 
 [hint:Fine-tuning for flow rate]
 text = Fine-tuning for flow rate\nDid you know that flow rate can be fine-tuned for even better-looking prints? Depending on the material, you can improve the overall finish of the printed model by doing some fine-tuning. 
-documentation_link= https://wiki.bambulab.com/en/x1/manual/manual-flow-rate-tuning
 
 [hint:Split your prints into plates]
 text = Split your prints into plates\nDid you know that you can split a model that has a lot of parts into individual plates ready to print? This will simplify the process of keeping track of all the parts.
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/plates_management
 
 [hint:Speed up your print with Adaptive Layer Height]
 text = Speed up your print with Adaptive Layer Height\nDid you know that you can print a model even faster, by using the Adaptive Layer Height option? Check it out!
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/adaptive-layer-height
 
 [hint:Support painting]
 text = Support painting\nDid you know that you can paint the location of your supports? This feature makes it easy to place the support material only on the sections of the model that actually need it. 
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/support-painting
 
 [hint:Different types of supports]
 text = Different types of supports\nDid you know that you can choose from multiple types of supports? Tree supports work great for organic models, while saving filament and improving print speed. Check them out!
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/support
 
 [hint:Printing Silk Filament]
 text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results.
-documentation_link= https://wiki.bambulab.com/en/x1/manual/printing-with-silk-filaments
 
 [hint:Brim for better adhesion]
 text = Brim for better adhesion\nDid you know that when printing models have a small contact interface with the printing surface, it's recommended to use a brim? 
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/auto-brim
 
 [hint:Set parameters for multiple objects]
 text = Set parameters for multiple objects\nDid you know that you can set slicing parameters for all selected objects at one time?
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/set-parameters-for-selected-objects
 
 [hint:Stack objects]
 text = Stack objects\nDid you know that you can stack objects as a whole one?
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/stacking-objects
 
 [hint:Flush into support/objects/infill]
 text = Flush into support/objects/infill\nDid you know that you can save the wasted filament by flushing them into support/objects/infill during filament change? 
-documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/reduce-wasting-during-filament-change
 
 [hint:Improve strength]
 text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model?
 
 [hint:When need to print with the printer door opened]
-text = When need to print with the printer door opened\nOpening the printer door can reduce the probability of extruder/hotend clogging when printing lower temperature filament with a higher enclosure temperature. More info about this in the Wiki.
-documentation_link= https://wiki.bambulab.com/en/filament-acc/filament/heat-creep
+text = When need to print with the printer door opened\nDid you know that opening the printer door can reduce the probability of extruder/hotend clogging when printing lower temperature filament with a higher enclosure temperature. More info about this in the Wiki.
+
+[hint:Avoid warping]
+text = Avoid warping\nDid you know that when printing materials that are prone to warping such as ABS, appropriately increasing the heatbed temperature can reduce the probability of warping.
 
 #[hint:]
 #text =