Merge pull request #494 from SoftFever/feature/logo_change

1.5.0 Build

.clang-format

@@ -0,0 +1,166 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: Right
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros:
+  - __capability
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: true
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+StatementAttributeLikeMacros:
+  - Q_EMIT
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentExternBlock: AfterExternBlock
+IndentRequires:  false
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: Both
+Standard:        Latest
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseCRLF:         false
+UseTab:          Never
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+...
+

.dockerignore

@@ -0,0 +1,28 @@
+Build
+Build.bat
+/build/
+deps/build
+MYMETA.json
+MYMETA.yml
+_build
+blib
+xs/buildtmp
+*.o
+*.log
+MANIFEST.bak
+xs/MANIFEST.bak
+xs/assertlib*
+.init_bundle.ini
+.vs/*
+local-lib
+/src/TAGS
+/.vscode/
+build-linux/*
+deps/build-linux/*
+**/.DS_Store
+install_*
+build_*/
+SVG
+Dockerfile
+DockerBuild.sh
+DockerRun.sh

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,11 +14,7 @@ A clear and concise description of what the bug is.
 If it is related to slicing, please append the 3mf file. It could be extremely helpful to solve the issue.
 
 **To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+Steps to reproduce the behavior
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -26,6 +22,8 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+**Printer model**
+
 **Desktop (please complete the following information):**
  - OS: [e.g. iOS, Windows]
  - Version [e.g. 22]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: feature
+labels: ''
 assignees: ''
 
 ---

.github/workflows/build_linux.yml

@@ -1,7 +1,13 @@
 name: Build Linux
 
-on: [pull_request]
-
+on: 
+    push:
+      branches: 
+       - SoftFever
+    pull_request:
+      branches: 
+       - SoftFever
+    
 jobs:
   appimage-builder:
     name: Linux AppImage Build
@@ -20,25 +26,28 @@ jobs:
       - name: Fix permissions
         shell: bash
         run: sudo chown $USER -R ./
-      - name: build deps
+      - name: Build deps
         id: cache_deps
         uses: actions/cache@v3
         env:
-          cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
+          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
+        name: Build deps
         working-directory: ${{ github.workspace }}
         continue-on-error: true
         run: ./BuildLinux.sh -dr
 
       - name: Build Studio
         shell: bash
-        run: ./BuildLinux.sh -isr
+        run: |
+          ./BuildLinux.sh -isr
+          chmod +x ./build/OrcaSlicer_ubu64.AppImage
+          
       - uses: actions/upload-artifact@v3
         with:
-          name: BambuStudio-SoftFever_Linux
-          path: './build/BambuStudio_ubu64.AppImage'
+          name: OrcaSlicer_Linux
+          path: './build/OrcaSlicer_ubu64.AppImage'

.github/workflows/build_mac_arm64.yml

@@ -1,10 +1,16 @@
-name: Build Mac arm64
-
-on: [pull_request]
+name: Build Mac AppleSilicon
 
+on: 
+    push:
+      branches: 
+       - SoftFever
+    pull_request:
+      branches: 
+       - SoftFever
+    
 jobs:
-  build_win64:
-    name: Build Mac arm64
+  build_osx_arm64:
+    name: Build Mac AppleSilicon
     runs-on: macos-12
 
     steps:
@@ -13,16 +19,16 @@ jobs:
       - name: Install tools
         run: |
           brew install cmake git gettext zstd
-      - run: mkdir -p ${{ github.workspace }}/deps/build
-      # - run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep
+      - run: mkdir -p ${{ github.workspace }}/deps/build_arm64
+      - run: mkdir -p ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
 
       # - name: build deps
       #   id: cache_deps
       #   uses: actions/cache@v3
       #   env:
-      #     cache-name: ${{ runner.os }}-cache-bambustudio_deps_arm64
+      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps_arm64
       #   with:
-      #     path: ${{ github.workspace }}/deps/build/BambuStudio_dep
+      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
       #     key: build-${{ env.cache-name }}
 
       # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
@@ -33,19 +39,57 @@ jobs:
       - name: Download and extract deps
         working-directory: ${{ github.workspace }}
         run: |
-          curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz
-          tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
-          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep
-          ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep
-          rm BambuStudio_dep_arm64_21-01-2023.tar.gz
+          curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
+          tar -zxf OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_arm64
+          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
+          ls -l ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
+          rm OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
 
 
       - name: Build studio
         working-directory: ${{ github.workspace }}
-        run: ./build_release_macos.sh -s -n -a arm64
+        run: |
+          ./build_release_macos.sh -s -n -a arm64
+
+      - name: Sign app
+        working-directory: ${{ github.workspace }}
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
+        run: |
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+          security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
+          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 --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_arm64/OrcaSlicer/OrcaSlicer.app
+      
+      - name: Pack app
+        working-directory: ${{ github.workspace }}
+        run: |
+          export ver=$(grep '^#define SoftFever_VERSION' ./build_arm64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+          ver="_V${ver//\"}"
+          cd ${{ github.workspace }}/build_arm64/OrcaSlicer
+          zip -FSrq OrcaSlicer${ver}_nightly_Mac_AppleSilicon_signed.zip ./OrcaSlicer.app
+
+      # (wip: staple failed, error 65)
+      # - name: Notarize the app 
+      #   run: |
+      #     cd ${{ github.workspace }}/build_arm64/OrcaSlicer
+      #     xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
+      #     ditto -c -k --keepParent "OrcaSlicer.app" "OrcaSlicer.zip"
+      #     xcrun notarytool submit "OrcaSlicer.zip" --keychain-profile "notarytool-profile" --wait
+      #     xcrun stapler staple OrcaSlicer.app
+      #     zip -FSrq OrcaSlicer_Mac_notarized.zip OrcaSlicer.app
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: BambuStudio-SoftFever_Mac
-          path: ${{ github.workspace }}/build/BambuStudio-SoftFever/BambuStudio-SoftFever*.zip
+          name: OrcaSlicer_Mac_AppleSilicon
+          path: ${{ github.workspace }}/build_arm64/OrcaSlicer/OrcaSlicer*.zip

.github/workflows/build_mac_x64.yml

@@ -1,42 +1,94 @@
-name: Build Mac x64
-
-on: [pull_request]
+name: Build Mac Intel
 
+on: 
+    push:
+      branches: 
+       - SoftFever
+    pull_request:
+      branches: 
+       - SoftFever
+    
 jobs:
-  build_win64:
-    name: Build Mac x64
-    runs-on: macos-latest
+  build_osx_x86_64:
+    name: Build Mac Intel
+    runs-on: macos-12
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Install tools
         run: |
-          brew install cmake git gettext zstd
-      - run: mkdir -p ${{ github.workspace }}/deps/build
-      - run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep
+          brew install cmake git gettext
+      - run: mkdir -p ${{ github.workspace }}/deps/build_x86_64
+      - run: mkdir -p ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
 
-      - name: build deps
-        id: cache_deps
-        uses: actions/cache@v3
-        env:
-          cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
-        with:
-          path: ${{ github.workspace }}/deps/build/BambuStudio_dep
-          key: build-${{ env.cache-name }}
+      # - name: build deps
+      #   id: cache_deps
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
+      #   with:
+      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
+      #     key: build-${{ env.cache-name }}
 
-      - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
-        name: build deps
+      # - 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 x86_64
+
+      - name: Download and extract deps
         working-directory: ${{ github.workspace }}
-        continue-on-error: true
-        run: ./build_release_macos.sh -d -a x86_64
+        run: |
+          curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
+          tar -zxf OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_x86_64
+          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
+          ls -l ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
+          rm OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
+
 
       - name: Build studio
         working-directory: ${{ github.workspace }}
         run: ./build_release_macos.sh -s -n -a x86_64
 
+      - name: Sign app
+        working-directory: ${{ github.workspace }}
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
+        run: |
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+          security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
+          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 --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_x86_64/OrcaSlicer/OrcaSlicer.app
+      
+      - name: pack app
+        working-directory: ${{ github.workspace }}
+        run: |
+          export ver=$(grep '^#define SoftFever_VERSION' ./build_x86_64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+          ver="_V${ver//\"}"
+          cd ${{ github.workspace }}/build_x86_64/OrcaSlicer
+          zip -FSrq OrcaSlicer${ver}_nightly_Mac_Intel_signed.zip OrcaSlicer.app
+
+      # (wip: staple failed, error 65)
+      # - name: Notarize the app 
+      #   run: |
+      #     xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
+      #     ditto -c -k --keepParent "OrcaSlicer.app" "OrcaSlicer.zip"
+      #     xcrun notarytool submit "OrcaSlicer.zip" --keychain-profile "notarytool-profile" --wait
+      #     xcrun stapler staple OrcaSlicer.app
+      #     zip -FSrq OrcaSlicer_Mac_notarized.zip OrcaSlicer.app
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: BambuStudio-SoftFever_Mac
-          path: ${{ github.workspace }}/build/BambuStudio-SoftFever/BambuStudio-SoftFever*.zip
+          name: OrcaSlicer_Mac_Intel
+          path: ${{ github.workspace }}/build_x86_64/OrcaSlicer/OrcaSlicer*.zip

.github/workflows/build_win.yml

@@ -1,6 +1,12 @@
 name: Build Win64
 
-on: [pull_request]
+on: 
+    push:
+      branches: 
+       - SoftFever
+    pull_request:
+      branches: 
+       - SoftFever 
 
 jobs:
   build_win64:
@@ -14,24 +20,24 @@ jobs:
         run: |
           choco install strawberryperl
       - run: mkdir ${{ github.workspace }}/deps/build
-      - run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep
+      - run: mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
       - name: download deps
         shell: powershell
-        run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_21Jan2023.zip", "$env:temp\BambuStudio_dep_21Jan2023.zip")'
+        run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_12Mar2023.zip", "$env:temp\OrcaSlicer_dep_12Mar2023.zip")'
       - name: extract deps
         working-directory: ${{ github.workspace }}/deps/build
         shell: cmd
-        run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_21Jan2023.zip'
+        run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_12Mar2023.zip'
 
-      - run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep"
+      - run: dir "${{ github.workspace }}\deps\build\OrcaSlicer_dep"
       
       # - name: build deps
       #   id: cache_deps
       #   uses: actions/cache@v3
       #   env:
-      #     cache-name: ${{ runner.os }}-cache-bambustudio_deps
+      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps
       #   with:
-      #     path: ${{ github.workspace }}/deps/build/BambuStudio_dep
+      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
       #     key: ${{ runner.os }}-build-${{ env.cache-name }}
 
       # - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
@@ -40,19 +46,19 @@ jobs:
       #   continue-on-error: true
       #   run: .\build_release.bat deps
    
-      # - run:  Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force
+      # - run:  Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force
 
       - name: Build studio
         working-directory: ${{ github.workspace }}
         run: .\build_release.bat studio
 
-      - name: pack app
-        working-directory: ${{ github.workspace }}/build
-        shell: cmd
-        run: '"C:/Program Files/7-Zip/7z.exe" a -tzip BambuStudio-SoftFever_dev_build.zip ${{ github.workspace }}/build/BambuStudio-SoftFever'
+      # - name: pack app
+      #   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: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: BambuStudio-SoftFever_Win64
-          path: ${{ github.workspace }}/build/BambuStudio-SoftFever_dev_build.zip
+          name: OrcaSlicer_Win64_nightly
+          path: ${{ github.workspace }}/build/OrcaSlicer

.gitignore

@@ -1,6 +1,6 @@
 Build
 Build.bat
-/build/
+/build*/
 deps/build
 MYMETA.json
 MYMETA.yml
@@ -20,6 +20,6 @@ local-lib
 build-linux/*
 deps/build-linux/*
 **/.DS_Store
-install_dir
-install_release
+install_*
+build_*/
 SVG

Build.PL

@@ -124,7 +124,7 @@ EOF
 }
 
 print "\n";
-print "In the next step, you need to build the BambuStudio C++ library.\n";
+print "In the next step, you need to build the OrcaSlicer C++ library.\n";
 print "1) Create a build directory and change to it\n";
 print "2) run cmake .. -DCMAKE_BUILD_TYPE=Release\n";
 print "3) run make\n";

BuildLinux.sh

@@ -15,13 +15,13 @@ function check_available_memory_and_disk() {
     MIN_DISK_KB=$((10 * 1024 * 1024))
 
     if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
-        echo -e "\nERROR: Bambu Studio Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
+        echo -e "\nERROR: Orca Slicer Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
         echo && free -h && echo
         exit 2
     fi
 
     if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then 
-        echo -e "\nERROR: Bambu Studio Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
+        echo -e "\nERROR: Orca Slicer Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
         echo && df -h . && echo
         exit 1
     fi
@@ -56,7 +56,7 @@ while getopts ":dsiuhgbr" opt; do
         echo "   -g: force gtk2 build"
         echo "   -b: build in debug mode"
         echo "   -d: build deps (optional)"
-        echo "   -s: build bambu-studio (optional)"
+        echo "   -s: build orca-slicer (optional)"
         echo "   -u: only update clock & dependency packets (optional and need sudo)"
 	echo "   -r: skip free ram check (low ram compiling)"
         echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
@@ -73,7 +73,7 @@ then
     echo "   -g: force gtk2 build"
     echo "   -b: build in debug mode"
     echo "   -d: build deps (optional)"
-    echo "   -s: build bambu-studio (optional)"
+    echo "   -s: build orca-slicer (optional)"
     echo "   -u: only update clock & dependency packets (optional and need sudo)"
     echo "   -r: skip free ram check (low ram compiling)"
     echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
@@ -192,7 +192,7 @@ then
         make -j$NCORES
         echo "done"
 
-        # rename wxscintilla # TODO: DeftDawg: Does BambuStudio need this?
+        # rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?
         # echo "[5/9] Renaming wxscintilla library..."
         # pushd destdir/usr/local/lib
         #     if [[ -z "$FOUND_GTK3_DEV" ]]
@@ -222,9 +222,9 @@ then
     fi
     if [[ -n "$BUILD_DEBUG" ]]
     then
-        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
+        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1"
     else
-        BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1"
+        BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0"
     fi
     
     # cmake
@@ -234,7 +234,7 @@ then
         
         # make Slic3r
         echo "[8/9] Building Slic3r..."
-        make -j$NCORES BambuStudio # Slic3r
+        make -j$NCORES OrcaSlicer # Slic3r
 
         # make .mo
         # make gettext_po_to_mo # FIXME: DeftDawg: complains about msgfmt not existing even in SuperSlicer, did this ever work?

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(BambuStudio)
+project(OrcaSlicer)
 
 include("version.inc")
 include(GNUInstallDirs)
@@ -23,11 +23,11 @@ else()
         endif()
 endif()
 
-option(SLIC3R_STATIC 			"Compile BambuStudio with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
-option(SLIC3R_GUI    			"Compile BambuStudio with GUI components (OpenGL, wxWidgets)" 1)
-option(SLIC3R_FHS               "Assume BambuStudio is to be installed in a FHS directory structure" 0)
+option(SLIC3R_STATIC 			"Compile OrcaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
+option(SLIC3R_GUI    			"Compile OrcaSlicer with GUI components (OpenGL, wxWidgets)" 1)
+option(SLIC3R_FHS               "Assume OrcaSlicer is to be installed in a FHS directory structure" 0)
 option(SLIC3R_WX_STABLE         "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
-option(SLIC3R_PROFILE 			"Compile BambuStudio with an invasive Shiny profiler" 0)
+option(SLIC3R_PROFILE 			"Compile OrcaSlicer with an invasive Shiny profiler" 0)
 option(SLIC3R_PCH               "Use precompiled headers" 1)
 option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
 option(SLIC3R_MSVC_PDB          "Generate PDB files on MSVC in Release mode" 1)
@@ -54,6 +54,8 @@ if (APPLE)
         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")
+
 endif ()
 
 # Proposal for C++ unit tests and sandboxes
@@ -117,7 +119,7 @@ if (MINGW)
 endif ()
 
 if (NOT MSVC)
-    # ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for BambuStudio on all platforms.
+    # ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for OrcaSlicer on all platforms.
     add_compile_options(-fsigned-char)
 endif ()
 
@@ -297,7 +299,7 @@ if(WIN32)
     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 )
-        # Force the source code encoding to UTF-8. See BambuStudio GH pull request #5583
+        # 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>")
     endif(MSVC)
@@ -309,24 +311,34 @@ add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO)
 add_definitions(-DwxNO_UNSAFE_WXSTRING_CONV)
 
 if (SLIC3R_PROFILE)
-    message("BambuStudio will be built with a Shiny invasive profiler")
+    message("OrcaSlicer will be built with a Shiny invasive profiler")
     add_definitions(-DSLIC3R_PROFILE)
 endif ()
 
-# Disable optimization even with debugging on.
-if (0)
-    message(STATUS "Perl compiled without optimization. Disabling optimization for the BambuStudio build.")
-    message("Old CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}")
-    message("Old CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELEASE}")
-    message("Old CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS_RELEASE}")
-    set(CMAKE_CXX_FLAGS_RELEASE "/MD /Od /Zi /EHsc /DWIN32 /DTBB_USE_ASSERT")
-    set(CMAKE_C_FLAGS_RELEASE "/MD /Od /Zi /DWIN32 /DTBB_USE_ASSERT")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Od /Zi /EHsc /DWIN32 /DTBB_USE_ASSERT")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MD /Od /Zi /DWIN32 /DTBB_USE_ASSERT")
-    set(CMAKE_CXX_FLAGS "/MD /Od /Zi /EHsc /DWIN32 /DTBB_USE_ASSERT")
-    set(CMAKE_C_FLAGS "/MD /Od /Zi /DWIN32 /DTBB_USE_ASSERT")
+# Disable optimization for RelWithDebInfo
+if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES "/O2")
+    string(REGEX REPLACE "/O2" "/Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 endif()
 
+if(CMAKE_CXX_FLAGS_RELWITHDEBINFO MATCHES "/O2")
+    string(REGEX REPLACE "/O2" "/Od" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+endif()
+
+if(MSVC)
+    if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES "/Ob1")
+        string(REGEX REPLACE "/Ob1" "/Ob0" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+    endif()
+    if(CMAKE_CXX_FLAGS_RELWITHDEBINFO MATCHES "/Ob1")
+        string(REGEX REPLACE "/Ob1" "/Ob0" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    endif()
+
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /RTC1")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /RTC1")
+endif()
+
+list(REMOVE_DUPLICATES CMAKE_C_FLAGS_RELWITHDEBINFO)
+list(REMOVE_DUPLICATES CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+
 # Find and configure boost
 if(SLIC3R_STATIC)
     # Use static boost libraries.
@@ -497,7 +509,7 @@ set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bbl/i18n")
 add_custom_target(gettext_make_pot
     COMMAND xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost
         -f "${BBL_L18N_DIR}/list.txt"
-        -o "${BBL_L18N_DIR}/BambuStudio.pot"
+        -o "${BBL_L18N_DIR}/OrcaSlicer.pot"
 	COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR}	
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     COMMENT "Generate pot file from strings in the source tree"
@@ -506,13 +518,13 @@ add_custom_target(gettext_merge_po_with_pot
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     COMMENT "Merge localization po with new generted pot file"
 )
-file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/BambuStudio*.po")
+file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po")
 foreach(po_file ${BBL_L10N_PO_FILES})
     GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
-    SET(po_new_file "${po_dir}/BambuStudio_.po")
+    SET(po_new_file "${po_dir}/OrcaSlicer_.po")
     add_custom_command(
         TARGET gettext_merge_po_with_pot PRE_BUILD
-        COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/BambuStudio.pot"
+        COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot"
         DEPENDS ${po_file}
     )
 endforeach()
@@ -520,11 +532,11 @@ add_custom_target(gettext_po_to_mo
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     COMMENT "Generate localization po files (binary) from mo files (texts)"
 )
-file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/BambuStudio*.po")
+file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po")
 foreach(po_file ${BBL_L10N_PO_FILES})
     GET_FILENAME_COMPONENT(SECOND_FOLDER_ABSOLUTE ${po_file} DIRECTORY)
     string(REGEX REPLACE ".*/(.*)" "\\1" po_dir "${SECOND_FOLDER_ABSOLUTE}" )
-    SET(mo_file "${L10N_DIR}/${po_dir}/BambuStudio.mo")
+    SET(mo_file "${L10N_DIR}/${po_dir}/OrcaSlicer.mo")
     add_custom_command(
         TARGET gettext_po_to_mo PRE_BUILD
         COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file}
@@ -553,7 +565,7 @@ endif ()
 
 
 set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})
-function(bambustudio_copy_dlls target config postfix output_dlls)
+function(orcaslicer_copy_dlls target config postfix output_dlls)
     if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
         set(_bits 64)
     elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
@@ -648,9 +660,9 @@ function(bambustudio_copy_dlls target config postfix output_dlls)
 endfunction()
 
 
-# libslic3r, BambuStudio GUI and the BambuStudio executable.
+# libslic3r, OrcaSlicer GUI and the OrcaSlicer executable.
 add_subdirectory(src)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT BambuStudio_app_gui)
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT OrcaSlicer_app_gui)
 
 add_dependencies(gettext_make_pot hintsToPot)
 
@@ -670,7 +682,7 @@ if(SLIC3R_BUILD_TESTS)
 endif()
 
 if (NOT WIN32 AND NOT APPLE)
-    set(SLIC3R_APP_CMD "bambu-studio")
+    set(SLIC3R_APP_CMD "orca-slicer")
     configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
 endif()
 
@@ -685,20 +697,20 @@ if (WIN32)
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 elseif (SLIC3R_FHS)
     # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
-    set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/BambuStudio")
+    set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer")
     install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES}
         PATTERN "*/udev" EXCLUDE
     )
-    install(FILES src/platform/unix/BambuStudio.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+    install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
     foreach(SIZE 32 128 192)
         install(FILES ${SLIC3R_RESOURCES_DIR}/images/BambuStudio_${SIZE}px.png
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME BambuStudio.png
         )
     endforeach()
 elseif (CMAKE_MACOSX_BUNDLE)
-    install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/BambuStudio.app/Contents/resources")
+    # install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/OrcaSlicer.app/Contents/resources")
 else ()
-    install(FILES src/platform/unix/BambuStudio.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
+    install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 endif ()
 

Containerfile

@@ -1,10 +1,10 @@
 # Build Bambu Slicer in a container
 #
 # Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md):
-# rm -rf build; podman build . -t bambu-studio-builder && podman run --rm localhost/bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
+# rm -rf build; podman build . -t orca-slicer-builder && podman run --rm localhost/orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
 #
 # Troubleshooting the build container:
-# podman run -it --name bambu-studio-builder localhost/bambu-studio-builder /bin/bash
+# podman run -it --name orca-slicer-builder localhost/orca-slicer-builder /bin/bash
 #
 # Debugging the resulting AppImage:
 #   1) Install `gdb`
@@ -13,10 +13,10 @@
 #   3) Find related issue using backtrace output for clues and add backtrace to it on github
 #
 # Docker alternative AppImage build syntax (use this if you can't install podman):
-# rm -rf build; docker build . --file Containerfile -t bambu-studio-builder; docker run --rm bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
+# rm -rf build; docker build . --file Containerfile -t orca-slicer-builder; docker run --rm orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
 #
 #
-# TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work.
+# TODO: bind mount OrcaSlicer to inside the container instead of COPY to enable faster rebuilds during dev work.
 
 FROM docker.io/ubuntu:20.04
 LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
@@ -52,9 +52,9 @@ RUN apt-get update && apt-get install  -y \
     file \
     sudo
 
-COPY ./ BambuStudio
+COPY ./ OrcaSlicer
 
-WORKDIR BambuStudio
+WORKDIR OrcaSlicer
 
 # These can run together, but we run them seperate for podman caching
 # Update System dependencies

DockerBuild.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+PROJECT_ROOT=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
+
+set -x
+
+# Wishlist hint:  For developers, creating a Docker Compose 
+# setup with persistent volumes for the build & deps directories
+# would speed up recompile times significantly.  For end users,
+# the simplicity of a single Docker image and a one-time compilation
+# seems better.
+docker build -t bambustudio \
+  --build-arg USER=$USER \
+  --build-arg UID=$(id -u) \
+  --build-arg GID=$(id -g) \
+  $PROJECT_ROOT

DockerRun.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -x
+# Just in case, here's some other things that might help:
+#  Force the container's hostname to be the same as your workstation
+#  -h $HOSTNAME \
+#  If there's problems with the X display, try this
+#  -v /tmp/.X11-unix:/tmp/.X11-unix \
+docker run \
+  `# Use the hosts networking.  Printer wifi and also dbus communication` \
+  --net=host \
+  `# Run as your workstations username to keep permissions the same` \
+  -u $USER \
+  `# Bind mount your home directory into the container for loading/saving files` \
+  -v $HOME:/home/$USER \
+  `# Pass the X display number to the container` \
+  -e DISPLAY=$DISPLAY \
+  `# It seems that libGL and dbus things need privileged mode` \
+  --privileged=true \
+  `# Attach tty for running bambu with command line things` \
+  -ti \
+  `# Pass all parameters from this script to the bambu ENTRYPOINT binary` \
+  bambustudio $* 
+  

Dockerfile

@@ -0,0 +1,92 @@
+FROM docker.io/ubuntu:20.04
+LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
+
+# Disable interactive package configuration
+RUN apt-get update && \
+    echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+# Add a deb-src
+RUN echo deb-src http://archive.ubuntu.com/ubuntu \
+    $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list 
+
+RUN apt-get update && apt-get install  -y \
+    autoconf \
+    build-essential \
+    cmake \
+    curl \
+    eglexternalplatform-dev \
+    extra-cmake-modules \
+    file \
+    git \
+    libcairo2-dev \
+    libcurl4-openssl-dev \
+    libdbus-1-dev \
+    libglew-dev \ 
+    libglu1-mesa-dev \
+    libglu1-mesa-dev \
+    libgstreamer1.0-dev \
+    libgstreamerd-3-dev \ 
+    libgstreamer-plugins-base1.0-dev \
+    libgstreamer-plugins-good1.0-dev \
+    libgtk-3-dev \
+    libgtk-3-dev \
+    libmspack-dev \
+    libosmesa6-dev \
+    libsecret-1-dev \
+    libsoup2.4-dev \
+    libssl-dev \
+    libudev-dev \
+    libwayland-dev \
+    libwebkit2gtk-4.0-dev \
+    libxkbcommon-dev \
+    locales \
+    locales-all \
+    m4 \
+    pkgconf \
+    sudo \
+    wayland-protocols \
+    wget 
+
+# Change your locale here if you want.  See the output
+# of `locale -a` to pick the correct string formatting.
+ENV LC_ALL=en_US.utf8
+RUN locale-gen $LC_ALL
+
+# Set this so that Orca Slicer doesn't complain about
+# the CA cert path on every startup
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+
+COPY ./ BambuStudio
+
+WORKDIR BambuStudio
+
+# These can run together, but we run them seperate for podman caching
+# Update System dependencies
+RUN ./BuildLinux.sh -u
+
+# Build dependencies in ./deps
+RUN ./BuildLinux.sh -d
+
+# Build slic3r
+RUN ./BuildLinux.sh -s
+
+# Build AppImage
+ENV container podman
+RUN ./BuildLinux.sh -i
+
+# It's easier to run Orca Slicer as the same username,
+# UID and GID as your workstation.  Since we bind mount
+# your home directory into the container, it's handy
+# to keep permissions the same.  Just in case, defaults
+# are root.
+SHELL ["/bin/bash", "-l", "-c"]
+ARG USER=root
+ARG UID=0
+ARG GID=0
+RUN [[ "$UID" != "0" ]] \
+  && groupadd -g $GID $USER \
+  && useradd -u $UID -g $GID $USER
+
+# Using an entrypoint instead of CMD because the binary
+# accepts several command line arguments.
+ENTRYPOINT ["/BambuStudio/build/package/bin/orca-slicer"]

README.md

@@ -1,269 +1,67 @@
 
-# Bambu Studio - SoftFever
-A modified version of Bambu Studio with many handy features.   
-It's fully compatible with Bambulab X1/X1-C/P1P printers.
-It also supports Anycubic, Anker, Creality, Prusa MK3S, RatRig and Voron printers.  
-You can download it here: https://github.com/SoftFever/BambuStudio-SoftFever/releases
-
-## BambuStudio SoftFever change notes:
-
-### [V1.4.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.2):
-- Change the color theme :)
-- Fixed a crash issue when selecting vase mode on some machines
-- Port firmware retraction and Extra length on restart retraction feature from PrusaSlicer
-- Fine-tune calibration features
-   1. Enforce max volumetric speed in PA line mode
-   2. Ensure print speeds are consistent across all blocks in the flow-rate calibration process. This is to help users calibrate those challenging filaments(such as TPU) by minimizing the influence of printing speed - thanks @psiberfunk for his input on this
-- New printer models: thanks @erebus04 and @GP3D84
-   1. Tronxy X5SA 400
-   2. Artillery Sidewinder
-- QoL:
-   1. Now allow exporting g-code for BBL printers
-   2. Fixed a bug that printer connection info was removed after loading a 3mf project
-fixed an issue that user presets were not loaded when Auto sync user preset option was off in Preference.
-   3.Germany language translation - thanks @hliebscher
-- Misc fixes:
-   1. Exit calibration mode when a new model is added to the scene(creating a new project after calibration is recommended)
-   2. Skip emitting M106 P2 command if the auxiliary fan is not enabled.
-   3. Fix an issue that previously there was a z-fighting issue when bed models are used for 3rd party printers
-   4. Fixed an issue that max volumetric speed was not correctly calculated if flow-rate was changed per object.
-   5. CICD for Linux build - thanks @fang64
-Known issues:
-
-The Calibration menu is missing on some Mac machines. Try restarting the App can usually fix it. See [#120](https://github.com/SoftFever/BambuStudio-SoftFever/issues/120)
-
-### [V1.4.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.1):
-- Added a feature for checking and displaying a notification for a new version
-- Added RatRig printer profiles, thanks @erebus04 for working this
-- Added support for the Creality CR-10 Max and Anker M5 printers.
-- Fixed the issue with profile cloud syncing for third-party printers.
-- set inner_wall_acceleration to 5000 for Bambu printers
-- Added support for the first_layer_bed_temperature and first_layer_temperature variables for better compatibility."
-- Fixed a crashing bug when adding text Mac Intel machine
-- QoL improvements for naming logic:
-   1. The filename format is now supported when exporting 3mf files.
-   2. If the project is not defined, the model name will be used as the output name.
-   3. The "Untitled" string will no longer be added if the project name is set.
-   4. The "_plate_0" string has been removed from the file name if there is only one plate.
-
-<details>
-  <summary> 👉 "Click here" for OLD Release Note</summary>   
-  
-### [V1.4.0 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.0):
-- Add Layer Time/Layer time(Log) display (NOTE: need more tweaking work for BBL printers as the layer time is skewed by the preparing time)
-- Add `sandwich`(inner-outer-inner-infill) mode support for Arachne engine.
-- Change default `wall loop` from 2 to 3
-- Fix an issue that the last used printer was not remembered after application restart. (Thanks Bambulab engineers, for the quick response and fixing)
-- Optimized layer height sanity check logic. It will check against `max_layer_height` in the printer settings now. (I can use CHT 1.8 nozzle to print 1.0 mm thick layers now ;) )
-- Add Prusa MINI+ profile
-- expose `bed_exclude_area` parameter to 3rd printers
-- Fix some 3rd party printer related issues introduced in [BambuStudio v01.04.00.17](https://github.com/bambulab/BambuStudio/releases/tag/v01.04.00.17)
-   1.  Can't send sliced files to printers
-   2.  AMS filaments were added to non-Bambulab printers
-   3. Wrong bed setting was applied
-  
-### [V1.3.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.4):
-1. Add a new printer order - sandwich mode:
-This new order is similar to the outer-wall-first mode in achieving the best dimensional accuracy. This new approach however avoids printing outer walls right after a long travel, which may cause artifacts on the surface in many cases.
-sandwich-mode1
-sandwich-mode2
-2. Support RRF firmware(experimental)
-3. Fix a compatibility issue for gcode-preview
-4. Merge upstream changes
-
-### [V1.3.3 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.3):
-1. Improve top surface quality. 
-	Fix a bug that internal solid infills didn't use monotonic when top surface is using monotonic lines
-2. New feature: filter out tiny gaps.
-	Note: for aesthetic considerations, this setting won't affect top/bottom layers. In other words, gap fills that can be seen from outside won't be filtered out
-3. PA(pressure advance) now support multi-color printing. A new PA value from the selected filament profile will be applied whenever there is 
-a filament/extruder change action. This change only affects multi-color printing.
-5. Users can now set float values of layer time in Filament->Cooling tab. 
-6. Allow to set target bed temp to 0
-7. Fix a bug that layer number is not displayed correctly in klipper UIs
-8. Force using linear PA model when manual PA override is enabled for Bambu machines
-9. Remember the last used filament
-10. Skip checking BL network plugin for third-party printers.
-### [V1.3.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.2-sf):
-1. Support device control view for 3rd party printers
-2. Port `Small perimeters` feature from PrusaSlicer. I also add an extra option to adjust the small perimeter threshold
-You might want to reduce speed for small perimeter parts to prevent failures like bellow:
-3. Add fan speed preview mode
-4. Fix an issue that print time estimation is inaccurate when `Klipper` g-code style is used.
-### [V1.3.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.1-sf):
-1. Support change bed size and nozzle diameter
-2. Allow users to specify the bridge infill direction
-3. bridge_infill_direction1
-4. bridge_infill_direction2
-5. Change to ISO view angle for preview image
-6. Add an option to change Z Hop action: NormalLift/SpiralLift
-7. Optimise g-code generation for both Bambu printers and 3rd party printers
-8. Support Klipper Exclude Objects
-9. Better support for Moonraker's metadata.
-
-### [V1.2.5.3 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5.3-sf):
-1. Label objects to support Klipper Exclude Objects feature
-2. Allow users to change output file name format
-3. Fix a bug that pressure advance value was not saved in the profile
-4. Optimize non-Bambu printer profiles
-5. Remove M900 S0 which is not necessary.
-
-### [V1.2.5 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5-sf):
-1. Add options to adjust jerk for different line types
-2. Add an option to adjust acceleration for travel. Higher acceleration for travel and lower acceleration for the outer wall makes it possible to print faster and nicer.
-3. Add an option to manually override the Pressure Advance / Linear Advance for each filament.
-
-### [V1.2.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.4-sf):
-1. Allow users to adjust accelerations for inner/outer walls separately.
-2. Allow users to adjust the bottom surface flow-rate
-3. Fix an issue that bed temperature for other layers is not set properly. This bug exists in the upstream as well. My PR here(bambulab#319)
-
-### [V1.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2-sf):
-1. Allow user to change machine limits
-2. Allow users to adjust the top surface flow-rate.
-3. Unlock some cool hidden features in BambuStudio.
-4. Fix an issue that the software connected to Bambulab's staging server by default. (Only Bambulab machines were affected)
-
-### [V1.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.1):
-1. Support third-party printers:
-   - Voron 2.4
-   - Voron Trident
-   - Voron 0.1
-   - Prusa MK3S
-2. Export to to .gcode file.
-3. Send gcode file to printer
-4. Support single wall mode on first layer
-5. Support Chamber temperature. This setting can be use in machine start G-Gcode
-6. Support thumbview for third-party printers
-</details>
-
-Demo video: https://youtu.be/vSNE9iGj2II  
- 
-## NOTE: 
-## 1. For Apple M1 users, please take a look at this [article](https://www.howtogeek.com/803598/app-is-damaged-and-cant-be-opened/ ) about how to run unsigned applications on your machine. Or better, you can build it from the source codes if you want:) 
-  Apple requires a subscription(costs 99$ yearly) for developers to sign their app. I don't do a lot of dev work on Mac, and this is a nonprofit open-source project, so I decided not to pay the money ;)   
-
-## 2. 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)  
-
-## 3. BambuStudio use G2/G3 commands by default. You need to turn on ARC support in your printer's firmware use with this slicer.
-- For Voron and any Klipper based printers:  
-You can enable gcode_arcs(G2/G3) support by adding following section into you printer.cfg file:  
-```
-[gcode_arcs]
-resolution: 0.1
-
-[gcode_macro m201]
-gcode:
-  {% if 'X' in params or 'Y' in params %}
-    {% set accel = (params.X|default(params.Y)|float,
-                    params.Y|default(params.X)|float)|min %}
-      SET_VELOCITY_LIMIT ACCEL={accel} ACCEL_TO_DECEL={accel * 0.5}
-  {% else %}
-    SET_VELOCITY_LIMIT
-  {% endif %}
-
-[gcode_macro m203]
-gcode:
-  {% if 'X' in params or 'Y' in params %}
-    {% set speed = (params.X|default(params.Y)|float,
-                       params.Y|default(params.X)|float)|min %}
-    SET_VELOCITY_LIMIT VELOCITY={speed}
-  {% else %}
-    SET_VELOCITY_LIMIT
-  {% endif %}
-
-[gcode_macro M205]
-gcode:
-  {% if 'X' in params or 'Y' in params %}
-    {% set corner_speed = (params.X|default(params.Y)|float,
-                       params.Y|default(params.X)|float)|min %}
-    SET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY={corner_speed}
-  {% else %}
-    SET_VELOCITY_LIMIT
-  {% endif %}
-
-[gcode_macro M900]
-gcode:
-      SET_PRESSURE_ADVANCE ADVANCE={params.K}
-
-```
-
-~~ It's also recommended to add followinging dummy macros to make Klipper happy ~~
-Update: latest Klipper has supported G17 command. Don't add following macro if you are running on latest Klipper.
-```
-# Make BambuStudio happy
-[gcode_macro G17]
-gcode:
-
-```
-
-- For Prusa MK3S:  
-ARC movement are supported by default.
+# Orca Slicer  
+[![Build Win64](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_win.yml/badge.svg?branch=SoftFever)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_win.yml)
+[![Build Mac AppleSilicon](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_arm64.yml/badge.svg?branch=SoftFever)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_arm64.yml)
+[![Build Mac Intel](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_x64.yml/badge.svg?branch=SoftFever)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_x64.yml)
+[![Build Linux](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_linux.yml/badge.svg?branch=SoftFever)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_linux.yml)  
+Orca Slicer is a fork of Bambu Studio. It was previously known as BambuStudio-SoftFever.  
+Bambu Studio is based on [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
 
 
-# Gallery
-![image](./SoftFever_doc/accelerations.png)
-![image](./SoftFever_doc/BambuLab.png)  
-![image](./SoftFever_doc/Anker.png)  
-![image](./SoftFever_doc/Anycubic.png)  
-![image](./SoftFever_doc/Creality.png)  
-![image](./SoftFever_doc/Prusa.png)  
-![image](./SoftFever_doc/RatRig.png)  
-![image](./SoftFever_doc/Voron_1.png)  
-![image](./SoftFever_doc/Voron_2.png) 
+Prebuilt binaries are available through the [github releases page](https://github.com/SoftFever/OrcaSlicer/releases/).  
 
 
-Image credits: 
- 1. Voron 2.4 and Trident: vorondesign.com
- 3. Voron 0.1: myself
- 4. Prusa MK3S: Prusa3d  
+# Main features
+- Auto calibrations for all printers
+- Sandwich(inner-outer-inner) mode - an improved version of the `External perimeters first` mode
+- Precise wall
+- Klipper support
+- More granular controls
+- More features can be found in [change notes](https://github.com/SoftFever/OrcaSlicer/releases/)  
 
+# How to install
+**Windows**: 
+1.  Unzip the binaries to any folder you prefer, then execute orca-slicer.exe to start the application.  
+    - *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)  
 
-=========================SPLIT=========================     
-
-![image](https://user-images.githubusercontent.com/106916061/179006347-497d24c0-9bd6-45b7-8c49-d5cc8ecfe5d7.png)
-# BambuStudio
-Bambu Studio is a cutting-edge, feature-rich slicing software.  
-It contains project-based workflows, systematically optimized slicing algorithms, and an easy-to-use graphic interface, bringing users an incredibly smooth printing experience.
-
-Prebuilt Windows, macOS 64-bit releases are available through the [github releases page](https://github.com/bambulab/BambuStudio/releases/).  
-Linux version currently is not supported.
-
-Bambu Studio is based on [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.
-
-See the [wiki](https://github.com/bambulab/BambuStudio/wiki) and the [documentation directory](https://github.com/bambulab/BambuStudio/tree/master/doc) for more informations.
-
-# What are Bambu Studio's main features?
-Key features are:
-- Basic slicing features & GCode viewer
-- Multiple plates management
-- Remote control & monitoring
-- Auto-arrange objects
-- Auto-orient objects
-- Hybrid/Tree/Normal support types, Customized support
-- multi-material printing and rich painting tools
-- multi-platform (Win/Mac/Linux) support
-- Global/Object/Part level slicing parameters
-
-Other major features are:
-- Advanced cooling logic controlling fan speed and dynamic print speed
-- Auto brim according to mechanical analysis
-- Support arc path(G2/G3)
-- Support STEP format
-- Assembly & explosion view
-- Flushing transition-filament into infill/object during filament change
+**Mac**:
+1. Download the right binaries for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.  
+2. Double click to unzip the package, move OrcaSlicer.app to Application folder.  
+3. The app is signed but not notarized at the moment due to the proptiery network plugin.  
+    We have two options to make it run on our machines  
+  - Option 1:  
+    Execute this command in terminal: `xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app`
+     ```console
+        softfever@mac:~$ xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app
+    ```
+  - Option 2:  
+      - Step 1: open the app, a warning window will pop up  
+          ![image](./SoftFever_doc/mac_cant_open.png)  
+      - Step 2: in `System Settings` -> `Privacy & Security`, click `Open Anyway`:  
+          ![image](./SoftFever_doc/mac_security_setting.png)  
 
+**Linux(Ubuntu)**:
+ 1. If you run into trouble to execute it, try this command in terminal:  
+    `chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
 # How to compile
-Following platforms are currently supported to compile:
-- Windows 64-bit, [Compile Guide](https://github.com/bambulab/BambuStudio/wiki/Windows-Compile-Guide)
-- Mac 64-bit, [Compile Guide](https://github.com/bambulab/BambuStudio/wiki/Mac-Compile-Guide)
+- Windows 64-bit  
+  - Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
+  - Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
+
+- Mac 64-bit  
+  - Tools needed: Xcode, Cmake, git, gettext
+  - run `build_release_macos.sh`
+
+- Ubuntu  
+  - run `BuildLinux.sh -udisr`
 
-# Report issue
-You can add an issue to the [github tracker](https://github.com/bambulab/BambuStudio/issues) if **it isn't already present.**
 
 # License
+Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on Bambu Studio by BambuLab.
+
 Bambu Studio is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.
 
 PrusaSlicer is licensed under the GNU Affero General Public License, version 3. PrusaSlicer is owned by Prusa Research. PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
@@ -272,5 +70,5 @@ Slic3r is licensed under the GNU Affero General Public License, version 3. Slic3
 
 The GNU Affero General Public License, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.
 
-The bambu networking plugin is based on non-free libraries. It is optional to the Bambu Studio and provides extended functionalities for users.
+The bambu networking plugin is based on non-free libraries. It is optional to the Orca Slicer and provides extended functionalities for users.
 

bbl/i18n/list.txt

@@ -16,6 +16,7 @@ src/slic3r/GUI/Gizmos/GLGizmoText.cpp
 src/slic3r/GUI/Gizmos/GLGizmoText.hpp
 src/slic3r/GUI/GUI.cpp
 src/slic3r/GUI/GUI_App.cpp
+src/slic3r/GUI/GUI_AuxiliaryList.cpp
 src/slic3r/GUI/GUI_Init.cpp
 src/slic3r/GUI/GUI_Factories.cpp
 src/slic3r/GUI/GUI_ObjectList.cpp
@@ -39,6 +40,7 @@ src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
 src/slic3r/GUI/Jobs/BindJob.cpp
 src/slic3r/GUI/Jobs/PrintJob.cpp
 src/slic3r/GUI/Jobs/SendJob.cpp
+src/slic3r/GUI/Jobs/SLAImportJob.cpp
 src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
 src/slic3r/GUI/AboutDialog.cpp
 src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -83,6 +85,8 @@ src/slic3r/GUI/Preferences.cpp
 src/slic3r/GUI/PresetComboBoxes.cpp
 src/slic3r/GUI/PresetHints.cpp
 src/slic3r/GUI/ProgressStatusBar.cpp
+src/slic3r/GUI/PlateSettingsDialog.cpp
+src/slic3r/GUI/PrivacyUpdateDialog.cpp
 src/slic3r/GUI/PublishDialog.cpp
 src/slic3r/GUI/SavePresetDialog.cpp
 src/slic3r/GUI/Search.cpp
@@ -90,7 +94,6 @@ src/slic3r/GUI/Selection.cpp
 src/slic3r/GUI/SelectMachine.cpp
 src/slic3r/GUI/SendSystemInfoDialog.cpp
 src/slic3r/GUI/SendToPrinter.cpp
-src/slic3r/GUI/SetBedTypeDialog.cpp
 src/slic3r/GUI/BindDialog.cpp
 src/slic3r/GUI/Tab.cpp
 src/slic3r/GUI/Tab.hpp
@@ -106,6 +109,7 @@ src/slic3r/GUI/KBShortcutsDialog.cpp
 src/slic3r/GUI/ReleaseNote.cpp
 src/slic3r/GUI/ReleaseNote.hpp
 src/slic3r/GUI/UpgradePanel.cpp
+src/slic3r/GUI/UnsavedChangesDialog.cpp
 src/slic3r/Utils/FixModelByWin10.cpp
 src/slic3r/Utils/PresetUpdater.cpp
 src/slic3r/Utils/Http.cpp
@@ -125,4 +129,4 @@ src/libslic3r/PrintObject.cpp
 src/libslic3r/PrintObjectSlice.cpp
 src/libslic3r/PlaceholderParser.cpp
 src/libslic3r/TreeSupport.cpp
-
+src/slic3r/GUI/calib_dlg.cpp

build_release.bat

@@ -2,12 +2,12 @@ set WP=%CD%
 cd deps
 mkdir build
 cd build
-set DEPS=%CD%/BambuStudio_dep
+set DEPS=%CD%/OrcaSlicer_dep
 if "%1"=="studio" (
     GOTO :studio
 )
 echo "building deps.."
-cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release
+cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
 cmake --build . --config Release --target ALL_BUILD -- -m
 
 if "%1"=="deps" exit /b 0
@@ -18,6 +18,6 @@ cd %WP%
 mkdir build 
 cd build
 
-cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
+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
 cmake --build . --target install --config Release

build_release_macos.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
 
-while getopts ":a:sdhn" opt; do
+while getopts ":a:sdphn" opt; do
   case ${opt} in
     d )
         export BUILD_TARGET="deps"
         ;;
+    p )
+        export PACK_DEPS="1"
+        ;;
     a )
         export ARCH="$OPTARG"
         ;;
@@ -32,15 +35,24 @@ fi
 echo "Arch: $ARCH"
 echo "BUILD_TARGET: $BUILD_TARGET"
 
-brew --prefix libiconv
-brew --prefix zstd
-export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
+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
 
 WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd $WD/deps
-mkdir -p build
-cd build
-DEPS=$PWD/BambuStudio_dep
+mkdir -p build_$ARCH
+cd build_$ARCH
+DEPS=$PWD/OrcaSlicer_dep_$ARCH
 mkdir -p $DEPS
 if [ "studio." != $BUILD_TARGET. ]; 
 then
@@ -48,6 +60,10 @@ then
     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 all 
+    if [ "1." == "$PACK_DEPS". ];
+    then
+        tar -zcvf OrcaSlicer_dep_mac_${ARCH}_$(date +"%d-%m-%Y").tar.gz OrcaSlicer_dep_$ARCH
+    fi
 fi
 
 
@@ -57,29 +73,28 @@ then
 fi
 
 cd $WD
-mkdir -p build
-cd build
+mkdir -p build_$ARCH
+cd build_$ARCH
 echo "building studio..."
-cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH}
+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 
-mkdir -p BambuStudio-SoftFever
-cd BambuStudio-SoftFever
-rm -r ./BambuStudio-SoftFever.app
-cp -pR ../src/Release/BambuStudio.app ./BambuStudio-SoftFever.app
-resources_path=$(readlink ./BambuStudio-SoftFever.app/Contents/Resources)
-rm ./BambuStudio-SoftFever.app/Contents/Resources
-cp -R $resources_path ./BambuStudio-SoftFever.app/Contents/Resources
+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 ./BambuStudio-SoftFever.app/ -name '.DS_Store' -delete
+find ./OrcaSlicer.app/ -name '.DS_Store' -delete
 # extract version
-export ver="_dev"
-echo $PWD
-if [ "1." != "$NIGHTLY_BUILD". ];
-then
-    ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
-    ver="_V${ver//\"}"
-fi
+# 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 BambuStudio-SoftFever${ver}_Mac_${ARCH}.zip BambuStudio-SoftFever.app
-
+# zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app

build_relwithdebinfo.bat

@@ -2,13 +2,22 @@ set WP=%CD%
 cd deps
 mkdir build
 cd build
-set DEPS=%CD%/BambuStudio_dep
-cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release
+set DEPS=%CD%/OrcaSlicer_dep
+if "%1"=="studio" (
+    GOTO :studio
+)
+echo "building deps.."
+cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
 cmake --build . --config Release --target ALL_BUILD -- -m
 
+if "%1"=="deps" exit /b 0
+
+:studio
+echo "building studio..."
 cd %WP%
 mkdir build 
 cd build
-cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
+
+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 RelWithDebInfo --target ALL_BUILD -- -m
 @REM cmake --build . --target install --config RelWithDebInfo

build_win.bat

@@ -28,12 +28,12 @@
 @ECHO                  deps-dirty - build deps without cleaning
 @ECHO                Default: %PS_STEPS_DEFAULT%
 @ECHO  -r -RUN       Specifies what to perform at the run step:
-@ECHO                  console - run and wait on bambu-studio-console.exe
+@ECHO                  console - run and wait on orca-slicer-console.exe
 @ECHO                  custom - run and wait on your custom build/%PS_CUSTOM_RUN_FILE%
 @ECHO                  ide - open project in Visual Studio if not open (no wait)
 @ECHO                  none - run step does nothing
 @ECHO                  viewer - run bambu-gcodeviewer.exe (no wait)
-@ECHO                  window - run bambu-studio.exe (no wait)
+@ECHO                  window - run orca-slicer.exe (no wait)
 @ECHO                Default: none
 @ECHO  -d -DESTDIR   Deps destination directory
 @ECHO                Warning: Changing destdir path will not delete the old destdir.
@@ -246,11 +246,11 @@ FOR /F "tokens=2 delims=," %%I in (
 @ECHO Running %PS_RUN% application...
 @REM icacls below is just a hack for file-not-found error handling
 IF "%PS_RUN%" EQU "console" (
-    icacls bambu-studio-console.exe >nul || GOTO :END
-    start /wait /b bambu-studio-console.exe
+    icacls orca-slicer-console.exe >nul || GOTO :END
+    start /wait /b orca-slicer-console.exe
 ) ELSE IF "%PS_RUN%" EQU "window" (
-    icacls bambu-studio.exe >nul || GOTO :END
-    start bambu-studio.exe
+    icacls orca-slicer.exe >nul || GOTO :END
+    start orca-slicer.exe
 ) ELSE IF "%PS_RUN%" EQU "viewer" (
     icacls bambu-gcodeviewer.exe >nul || GOTO :END
     start bambu-gcodeviewer.exe

cmake/modules/MacOSXBundleInfo.plist.in

@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.bambulab.bambu-studio</string>
+	<string>com.softfever3d.orca-slicer</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>

deps/Boost/0001-Boost-fix.patch

@@ -0,0 +1,125 @@
+From 1d6cd7c2f8640db3cda194c1b9b82f1e4b321395 Mon Sep 17 00:00:00 2001
+From: "chunmao.guo" <chunmao.guo@bambulab.com>
+Date: Thu, 5 Jan 2023 15:55:57 +0800
+Subject: [PATCH] FIX: limit_handles
+
+---
+ boost/process/detail/posix/executor.hpp  |  4 +++-
+ boost/process/detail/posix/pipe_out.hpp  | 13 +++++++++++--
+ boost/process/detail/used_handles.hpp    |  3 +++
+ boost/process/detail/windows/handles.hpp | 10 +++++++---
+ 4 files changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/boost/process/detail/posix/executor.hpp b/boost/process/detail/posix/executor.hpp
+index ca7713c..5521720 100644
+--- a/boost/process/detail/posix/executor.hpp
++++ b/boost/process/detail/posix/executor.hpp
+@@ -325,6 +325,7 @@ public:
+     }
+     void set_error(const std::error_code &ec, const std::string &msg) {set_error(ec, msg.c_str());};
+ 
++    int error_sink() const { return _pipe_sink; }
+ };
+ 
+ template<typename Sequence>
+@@ -388,6 +389,8 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
+             set_error(err, "fcntl(2) failed");//this might throw, so we need to be sure our pipe is safe.
+             return child();
+         }
++        _pipe_sink = p.p[1];
++        
+         _ec.clear();
+         boost::fusion::for_each(seq, call_on_setup(*this));
+ 
+@@ -411,7 +414,6 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
+         }
+         else if (pid == 0)
+         {
+-            _pipe_sink = p.p[1];
+             ::close(p.p[0]);
+ 
+             boost::fusion::for_each(seq, call_on_exec_setup(*this));
+diff --git a/boost/process/detail/posix/pipe_out.hpp b/boost/process/detail/posix/pipe_out.hpp
+index d54cca4..a081d78 100644
+--- a/boost/process/detail/posix/pipe_out.hpp
++++ b/boost/process/detail/posix/pipe_out.hpp
+@@ -18,7 +18,7 @@
+ namespace boost { namespace process { namespace detail { namespace posix {
+ 
+ template<int p1, int p2>
+-struct pipe_out : handler_base_ext
++struct pipe_out : handler_base_ext, ::boost::process::detail::uses_handles
+ {
+     int sink;
+     int source; //opposite end
+@@ -30,6 +30,14 @@ struct pipe_out : handler_base_ext
+     {
+         p.assign_sink(-1);
+     }
++    
++    std::array<int, 4> get_used_handles()
++    {
++        const auto pp1 = p1 != -1 ? p1 : p2;
++        const auto pp2 = p2 != -1 ? p2 : p1;
++        
++        return {sink, source, pp1, pp2};
++    }
+ 
+     template<typename Executor>
+     void on_error(Executor &, const std::error_code &) const
+@@ -66,7 +74,7 @@ void pipe_out<2,-1>::on_exec_setup(Executor &e) const
+     if (::dup2(sink, STDERR_FILENO) == -1)
+          e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+ 
+-    if (sink != STDOUT_FILENO)
++    if (sink != STDERR_FILENO)
+         ::close(sink);
+     ::close(source);
+ }
+@@ -81,6 +89,7 @@ void pipe_out<1,2>::on_exec_setup(Executor &e) const
+          e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+     if ((sink != STDOUT_FILENO) && (sink != STDERR_FILENO))
+         ::close(sink);
++    ::close(source);
+ }
+ 
+ class async_pipe;
+diff --git a/boost/process/detail/used_handles.hpp b/boost/process/detail/used_handles.hpp
+index 4d56af3..5d71dc3 100644
+--- a/boost/process/detail/used_handles.hpp
++++ b/boost/process/detail/used_handles.hpp
+@@ -61,6 +61,9 @@ struct foreach_handle_invocator
+ template<typename Executor, typename Function>
+ void foreach_used_handle(Executor &exec, Function &&func)
+ {
++#if defined(BOOST_POSIX_API)
++    func(exec.error_sink());
++#endif
+     boost::fusion::for_each(boost::fusion::filter_if<does_use_handle<boost::mpl::_>>(exec.seq),
+                             foreach_handle_invocator<Function>(func));
+ }
+diff --git a/boost/process/detail/windows/handles.hpp b/boost/process/detail/windows/handles.hpp
+index 7a93ac2..f120ef7 100644
+--- a/boost/process/detail/windows/handles.hpp
++++ b/boost/process/detail/windows/handles.hpp
+@@ -139,10 +139,14 @@ struct limit_handles_ : handler_base_ext
+                     ::boost::winapi::DWORD_ flags = 0u;
+                     if (itr != all_handles.end())
+                         *itr = ::boost::winapi::INVALID_HANDLE_VALUE_;
+-                    else if ((::boost::winapi::GetHandleInformation(*itr, &flags) != 0)
+-                            &&((flags & ::boost::winapi::HANDLE_FLAG_INHERIT_) == 0)) //it is NOT inherited anyhow, so ignore too
+-                        *itr = ::boost::winapi::INVALID_HANDLE_VALUE_;
+                 });
++        for (auto& h : all_handles) {
++            ::boost::winapi::DWORD_ flags = 0u;
++            if ((h != ::boost::winapi::INVALID_HANDLE_VALUE_)
++                && (::boost::winapi::GetHandleInformation(h, &flags) != 0)
++                && ((flags & ::boost::winapi::HANDLE_FLAG_INHERIT_) == 0)) //it is NOT inherited anyhow, so ignore too
++                h = ::boost::winapi::INVALID_HANDLE_VALUE_;
++        }
+ 
+         auto part_itr = std::partition(all_handles.begin(), all_handles.end(),
+                                        [](::boost::winapi::HANDLE_ handle) {return handle != ::boost::winapi::INVALID_HANDLE_VALUE_;});
+-- 
+2.36.1.windows.1
+

deps/Boost/Boost.cmake

@@ -28,6 +28,9 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     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")
     endif ()

deps/CMakeLists.txt

@@ -1,12 +1,12 @@
 #
-# This CMake project downloads, configures and builds BambuStudio dependencies on Unix and Windows.
+# This CMake project downloads, configures and builds OrcaSlicer dependencies on Unix and Windows.
 #
 # When using this script, it's recommended to perform an out-of-source build using CMake.
 #
 # All the dependencies are installed in a `destdir` directory in the root of the build directory,
 # in a traditional Unix-style prefix structure. The destdir can be used directly by CMake
-# when building BambuStudio - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local.
-# Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building BambuStudio.
+# when building OrcaSlicer - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local.
+# Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building OrcaSlicer.
 #
 # For better clarity of console output, it's recommended to _not_ use a parallelized build
 # for the top-level command, ie. use `make -j 1` or `ninja -j 1` to force single-threaded top-level
@@ -20,7 +20,7 @@
 # therefore, unfortunatelly, the installation cannot be copied/moved elsewhere without re-installing wxWidgets.
 #
 
-project(BambuStudio-deps)
+project(OrcaSlicer-deps)
 cmake_minimum_required(VERSION 3.2)
 
 include(ExternalProject)
@@ -38,6 +38,10 @@ option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
+else() 
+    if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
+        cmake_policy(SET CMP0135 NEW)
+    endif()
 endif()
 
 set(IS_CROSS_COMPILE FALSE)
@@ -65,9 +69,9 @@ endif ()
 # Slic3r compiles with a different version which will cause runtime errors.
 # option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF)
 
-message(STATUS "BambuStudio deps DESTDIR: ${DESTDIR}")
-message(STATUS "BambuStudio dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
-message(STATUS "BambuStudio deps debug build: ${DEP_DEBUG}")
+message(STATUS "OrcaSlicer deps DESTDIR: ${DESTDIR}")
+message(STATUS "OrcaSlicer dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
+message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}")
 
 find_package(Git REQUIRED)
 

deps/JPEG/JPEG.cmake

@@ -1,3 +1,16 @@
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    if (JPEG_VERSION STREQUAL "6")
+        message("Using Jpeg Lib 62")
+        set(jpeg_flag "")
+    elseif (JPEG_VERSION STREQUAL "7")
+        message("Using Jpeg Lib 70")
+        set(jpeg_flag "-DWITH_JPEG7=ON")
+    else ()
+        message("Using Jpeg Lib 80")
+        set(jpeg_flag "-DWITH_JPEG8=ON")
+    endif ()
+endif()
+
 bambustudio_add_cmake_project(JPEG
     URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.0.6.zip
     URL_HASH SHA256=017bdc33ff3a72e11301c0feb4657cb27719d7f97fa67a78ed506c594218bbf1
@@ -5,4 +18,5 @@ bambustudio_add_cmake_project(JPEG
     CMAKE_ARGS
         -DENABLE_SHARED=OFF
         -DENABLE_STATIC=ON
+        ${jpeg_flag}
 )

deps/WebView2/include/WebView2EnvironmentOptions.h

@@ -0,0 +1,149 @@
+// Copyright (C) Microsoft Corporation. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef __core_webview2_environment_options_h__
+#define __core_webview2_environment_options_h__
+
+#include <objbase.h>
+#include <wrl/implements.h>
+
+#include "webview2.h"
+#define CORE_WEBVIEW_TARGET_PRODUCT_VERSION L"107.0.1418.22"
+
+#define COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(p)     \
+ public:                                                      \
+  HRESULT STDMETHODCALLTYPE get_##p(LPWSTR* value) override { \
+    if (!value)                                               \
+      return E_POINTER;                                       \
+    *value = m_##p.Copy();                                    \
+    if ((*value == nullptr) && (m_##p.Get() != nullptr))      \
+      return HRESULT_FROM_WIN32(GetLastError());              \
+    return S_OK;                                              \
+  }                                                           \
+  HRESULT STDMETHODCALLTYPE put_##p(LPCWSTR value) override { \
+    LPCWSTR result = m_##p.Set(value);                        \
+    if ((result == nullptr) && (value != nullptr))            \
+      return HRESULT_FROM_WIN32(GetLastError());              \
+    return S_OK;                                              \
+  }                                                           \
+                                                              \
+ protected:                                                   \
+  AutoCoMemString m_##p;
+
+#define COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(p)     \
+ public:                                                    \
+  HRESULT STDMETHODCALLTYPE get_##p(BOOL* value) override { \
+    if (!value)                                             \
+      return E_POINTER;                                     \
+    *value = m_##p;                                         \
+    return S_OK;                                            \
+  }                                                         \
+  HRESULT STDMETHODCALLTYPE put_##p(BOOL value) override {  \
+    m_##p = value;                                          \
+    return S_OK;                                            \
+  }                                                         \
+                                                            \
+ protected:                                                 \
+  BOOL m_##p = FALSE;
+
+// This is a base COM class that implements ICoreWebView2EnvironmentOptions.
+template <typename allocate_fn_t,
+          allocate_fn_t allocate_fn,
+          typename deallocate_fn_t,
+          deallocate_fn_t deallocate_fn>
+class CoreWebView2EnvironmentOptionsBase
+    : public Microsoft::WRL::Implements<
+          Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
+          ICoreWebView2EnvironmentOptions,
+          ICoreWebView2EnvironmentOptions2> {
+ public:
+  CoreWebView2EnvironmentOptionsBase() {
+    // Initialize the target compatible browser version value to the version of
+    // the browser binaries corresponding to this version of the SDK.
+    m_TargetCompatibleBrowserVersion.Set(CORE_WEBVIEW_TARGET_PRODUCT_VERSION);
+  }
+
+ protected:
+  ~CoreWebView2EnvironmentOptionsBase() {}
+
+  class AutoCoMemString {
+   public:
+    AutoCoMemString() {}
+    ~AutoCoMemString() { Release(); }
+    void Release() {
+      if (m_string) {
+        deallocate_fn(m_string);
+        m_string = nullptr;
+      }
+    }
+
+    LPCWSTR Set(LPCWSTR str) {
+      Release();
+      if (str) {
+        m_string = MakeCoMemString(str);
+      }
+      return m_string;
+    }
+    LPCWSTR Get() { return m_string; }
+    LPWSTR Copy() {
+      if (m_string)
+        return MakeCoMemString(m_string);
+      return nullptr;
+    }
+
+   protected:
+    LPWSTR MakeCoMemString(LPCWSTR source) {
+      const size_t length = wcslen(source);
+      const size_t bytes = (length + 1) * sizeof(*source);
+      // Ensure we didn't overflow during our size calculation.
+      if (bytes <= length) {
+        return nullptr;
+      }
+
+      wchar_t* result = reinterpret_cast<wchar_t*>(allocate_fn(bytes));
+      if (result)
+        memcpy(result, source, bytes);
+
+      return result;
+    }
+
+    LPWSTR m_string = nullptr;
+  };
+
+  // ICoreWebView2EnvironmentOptions
+  COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(AdditionalBrowserArguments)
+  COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(Language)
+  COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(TargetCompatibleBrowserVersion)
+  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(
+      AllowSingleSignOnUsingOSPrimaryAccount)
+
+  // ICoreWebView2EnvironmentOptions2
+  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(ExclusiveUserDataFolderAccess)
+};
+
+template <typename allocate_fn_t,
+          allocate_fn_t allocate_fn,
+          typename deallocate_fn_t,
+          deallocate_fn_t deallocate_fn>
+class CoreWebView2EnvironmentOptionsBaseClass
+    : public Microsoft::WRL::RuntimeClass<
+          Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
+          CoreWebView2EnvironmentOptionsBase<allocate_fn_t,
+                                             allocate_fn,
+                                             deallocate_fn_t,
+                                             deallocate_fn>> {
+ public:
+  CoreWebView2EnvironmentOptionsBaseClass() {}
+
+ protected:
+  ~CoreWebView2EnvironmentOptionsBaseClass() override {}
+};
+
+typedef CoreWebView2EnvironmentOptionsBaseClass<decltype(&::CoTaskMemAlloc),
+                                                ::CoTaskMemAlloc,
+                                                decltype(&::CoTaskMemFree),
+                                                ::CoTaskMemFree>
+    CoreWebView2EnvironmentOptions;
+
+#endif  // __core_webview2_environment_options_h__

deps/wxWidgets/0001-wxWidget-fix.patch

@@ -14,6 +14,19 @@ index 0bc4f934b9..479431a69c 100644
                  find_package(WAYLANDEGL)
                  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
+--- a/build/cmake/lib/webview/CMakeLists.txt
++++ b/build/cmake/lib/webview/CMakeLists.txt
+@@ -56,7 +56,7 @@ 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")
+ 
 diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
 index 09ad8c8ef3..3c0c2d8f7e 100644
 --- a/include/wx/fontutil.h

doc/How to build - Linux et al.md

@@ -1,4 +1,4 @@
 
-# Building Bambu Studio on UNIX/Linux
+# Building Orca Slicer on UNIX/Linux
 
 Currently Linux version is not verified, you can try it referring to [PrusaSlicer'S linux building guide](https://github.com/prusa3d/PrusaSlicer/blob/master/doc/How%20to%20build%20-%20Linux%20et%20al.md)

doc/How to build - Mac OS.md

@@ -1,5 +1,5 @@
 
-# Building Bambu Studio on Mac OS
+# Building Orca Slicer on Mac OS
 
 ## Enviroment setup
 Install Following tools:  
@@ -11,31 +11,31 @@ Install Following tools:
 Cmake, git, gettext can be installed from brew(brew install cmake git gettext)
 
 ## building the deps
-You need to build the dependence of BambuStudio first. (Only needs for the first time)  
+You need to build the dependence of OrcaSlicer first. (Only needs for the first time)  
 
 Suppose you download the codes into /Users/_username_/work/projects/BambuStudio  
-create a directory to store the dependence built: /Users/_username_/work/projects/BambuStudio_dep  
+create a directory to store the dependence built: /Users/_username_/work/projects/OrcaSlicer_dep  
 **(Please make sure to replace the username with the one on your computer)**  
 
 `cd BambuStudio/deps`  
 `mkdir build;cd build`  
 
 for arm64 architecture  
-`cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-arm64-cc"`  
+`cmake ../ -DDESTDIR="/Users/username/work/projects/OrcaSlicer_dep" -DOPENSSL_ARCH="darwin64-arm64-cc"`  
 for x86 architeccture  
-`cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"`  
+`cmake ../ -DDESTDIR="/Users/username/work/projects/OrcaSlicer_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"`  
 `make -jN`  (N can be a number between 1 and the max cpu number)  
 
-## building the Bambu Studio
+## building the Orca Slicer
 create a directory to store the installed files at /Users/username/work/projects/BambuStudio/install_dir  
 `cd BambuStudio`  
 `mkdir install_dir`  
 `mkdir build;cd build`  
 
 building it use cmake  
-`cmake ..  -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on`  
+`cmake ..  -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/OrcaSlicer_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/OrcaSlicer_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on`  
 `cmake --build . --target install --config Release -jN`  
 
 building it use xcode  
-`cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on`  
+`cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/OrcaSlicer_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/OrcaSlicer_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on`  
 then building it using Xcode

doc/How to build - Windows.md

@@ -1,36 +1,36 @@
-# Building Bambu Studio on Windows
+# Building Orca Slicer on Windows
 
 ## Enviroment setup
 Install Following tools:
-- Visual Studio Community 2019 from [visualstudio.microsoft.com/vs/](https://visualstudio.microsoft.com/vs/) (Older versions are not supported as Bambu Studio requires support for C++17, and newer versions should also be ok);
+- Visual Studio Community 2019 from [visualstudio.microsoft.com/vs/](https://visualstudio.microsoft.com/vs/) (Older versions are not supported as Orca Slicer requires support for C++17, and newer versions should also be ok);
 - Cmake from [cmake.org](https://cmake.org/download/)
 - Git from [gitforwindows.org](https://gitforwindows.org/) 
 - Perl from [strawberryperl](https://strawberryperl.com/)
 
 ## building the deps
 Suppose you download the codes into D:/work/Projects/BambuStudio  
-create a directory to store the dependence built: D:/work/Projects/BambuStudio_dep
+create a directory to store the dependence built: D:/work/Projects/OrcaSlicer_dep
 
 `cd BambuStudio/deps`  
 `mkdir build;cd build`  
-`cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="D:/work/Projects/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release`  
+`cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="D:/work/Projects/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release`  
 `msbuild /m ALL_BUILD.vcxproj`  
 
 It takes "00:14:27.37" to finish it on my machine (11th Gen Intel(R) Core(TM) i9-11900 @2.50GHz   2.50 GHz, with 32.0 GB DDR)
 
-## building the Bambu Studio
+## building the Orca Slicer
 create a directory to store the installed files at D:/work/Projects/BambuStudio/install_dir  
 `cd BambuStudio`  
 `mkdir install_dir`  
 `mkdir build;cd build`  
 
 set -DWIN10SDK_PATH to your windows sdk path(for example: C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0) in below command:  
-`cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="D:/work/Projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"` 
+`cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="D:/work/Projects/OrcaSlicer_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"` 
 
 then build it using command  
 `cmake --build . --target install --config Release`  
 
 or building it under the Visual Studio 2019  
-(set the BambuStudio_app_gui as start project)  
+(set the OrcaSlicer_app_gui as start project)  
 ![image](https://user-images.githubusercontent.com/106916061/179185940-06135b47-f2a4-415a-9be4-666680fa0f9a.png)
 

doc/Localization_guide.md

@@ -1,6 +1,6 @@
 # Localization and translation guide
 
-The purpose of this guide is to describe how to contribute to the Bambu Studio translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
+The purpose of this guide is to describe how to contribute to the Orca Slicer translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
 
 Those can be downloaded here: 
 -    https://sourceforge.net/directory/os:windows/?q=gnu+gettext GNUgettext package contains a set of tools to extract strings from the source code and to create the translation Catalog.
@@ -32,15 +32,15 @@ Notice. When the translation is complete you need to:
 	- copy BambuStudio_xx.mo into resources/i18n/xx and rename it to BambuStudio.mo, then push the changed file.
 ( name of folder "fr" means "French" - the translation language). 
 
-### Scenario 3. How do I add a new text resource when implementing a feature to Bambu Studio
-Each string resource in Bambu Studio available for translation needs to be explicitly marked using L() macro like this:
+### Scenario 3. How do I add a new text resource when implementing a feature to Orca Slicer
+Each string resource in Orca Slicer available for translation needs to be explicitly marked using L() macro like this:
 ```C++
 auto msg = L("This message to be localized")
 ```
 To get translated text use one of needed macro/function (`_(s)` or `_CHB(s)` ).
 If you add new file resource, add it to the list of files containing macro `L()`
 
-### Scenario 4. How do I use GNUgettext to localize my own application taking Bambu Studio as an example
+### Scenario 4. How do I use GNUgettext to localize my own application taking Orca Slicer as an example
 
 1.  For convenience create a list of files with this macro `L(s)`. We have 
 https://github.com/bambulab/BambuStudio/blob/master/bbl/i18n/list.txt.
@@ -75,14 +75,14 @@ https://github.com/bambulab/BambuStudio/blob/master/bbl/i18n/list.txt.
 When you have Catalog to translation open POT or PO file in PoEdit and start translating.
 
 
-## General guidelines for Bambu Studio translators
+## General guidelines for Orca Slicer translators
 
 
 - We recommend using *PoEdit* application for translation (as described above). It will help you eliminate most punctuation errors and will show you strings with "random" translations (if the fuzzy parameter was used).
 
-- To check how the translated text looks on the UI elements, test it :) If you use *PoEdit*, all you need to do is save the file. At this point, a MO file will be created. Rename it Bambu Studio.mo, and you can run Bambu Studio (see above).
+- To check how the translated text looks on the UI elements, test it :) If you use *PoEdit*, all you need to do is save the file. At this point, a MO file will be created. Rename it Orca Slicer.mo, and you can run Orca Slicer (see above).
 
-- If you see an encoding error (garbage characters instead of Unicode) somewhere in Bambu Studio, report it. It is likely not a problem of your translation, but a bug in the software.
+- If you see an encoding error (garbage characters instead of Unicode) somewhere in Orca Slicer, report it. It is likely not a problem of your translation, but a bug in the software.
 
 - See on which UI elements the translated phrase will be used. Especially if it's a button, it is very important to decide on the translation and not write alternative translations in parentheses, as this will significantly increase the width of the button, which is sometimes highly undesirable:
 

lib/Slic3r.pm

@@ -105,7 +105,7 @@ sub copyright_info
     my (%params) = @_;
     my %tag = Slic3r::tags($params{format});
     my $out =
-        'Copyright © Bambu Studio.';
+        'Copyright © Orca Slicer.';
     return $out;
 }
 

localazy.json

@@ -6,38 +6,43 @@
 		"files": [
 			{
 				"type": "po",
-				"pattern": "bbl/i18n/en/BambuStudio_en.po",
+				"pattern": "bbl/i18n/en/OrcaSlicer_en.po",
 				"lang": "en"
 			},
 			{
 				"type": "po",
-				"pattern": "bbl/i18n/fr/BambuStudio_fr.po",
+				"pattern": "bbl/i18n/fr/OrcaSlicer_fr.po",
 				"lang": "fr"
 			},
 			{
 				"type": "po",
-				"pattern": "bbl/i18n/de/BambuStudio_de.po",
+				"pattern": "bbl/i18n/de/OrcaSlicer_de.po",
 				"lang": "de"
 			},
 			{
 				"type": "po",
-				"pattern": "bbl/i18n/sv/BambuStudio_sv.po",
+				"pattern": "bbl/i18n/sv/OrcaSlicer_sv.po",
 				"lang": "sv"
 			},
 			{
 				"type": "po",
-				"pattern": "bbl/i18n/es/BambuStudio_es.po",
+				"pattern": "bbl/i18n/es/OrcaSlicer_es.po",
 				"lang": "es"
 			},
 			{
 				"type": "po",
-				"pattern": "bbl/i18n/nl/BambuStudio_nl.po",
+				"pattern": "bbl/i18n/nl/OrcaSlicer_nl.po",
 				"lang": "nl"
 			},
 			{
 				"type": "po",
-				"pattern": "bbl/i18n/hu/BambuStudio_hu.po",
+				"pattern": "bbl/i18n/hu/OrcaSlicer_hu.po",
 				"lang": "hu"
+			},
+			{
+				"type": "po",
+				"pattern": "bbl/i18n/ja/OrcaSlicer_ja.po",
+				"lang": "ja"
 			}
 		]
 	},
@@ -45,7 +50,7 @@
 		"folder": "bbl/i18n",
 		"includeSourceLang" : "true",
 		"files": {
-			"output": "${lang}/BambuStudio_${lang}.po"
+			"output": "${lang}/OrcaSlicer_${lang}.po"
 		}
 	}
 }

resources/config.json

@@ -9,22 +9,21 @@
                 "FUNC_BUILDPLATE_MARKER_DETECT": false,
                 "FUNC_FLOW_CALIBRATION": false,
                 "FUNC_MONITORING": false,
-                "FUNC_TIMELAPSE": false,
                 "FUNC_MEDIA_FILE": false,
                 "FUNC_REMOTE_TUNNEL": false,
                 "FUNC_LOCAL_TUNNEL": true,
                 "FUNC_VIRTUAL_CAMERA" : false,
                 "FUNC_PRINT_WITHOUT_SD": false,
                 "FUNC_ALTER_RESOLUTION": false,
-                "FUNC_AUTO_SWITCH_FILAMENT": false,
+                "FUNC_CHAMBER_FAN" : false,
                 "FUNC_EXTRUSION_CALI": true,
-                "FUNC_PRINT_ALL" : false,
-                "FUNC_CHAMBER_FAN" : false
+                "FUNC_PRINT_ALL" : false
             },
             "camera_resolution":["720p"],
             "bed_temperature_limit": 120,
             "model_id": "C11",
             "printer_type": "C11",
+            "ftp_folder" : "sdcard/",
             "printer_thumbnail_image": "printer_thumbnail_p1p"
         },
         {

resources/data/hints.ini

@@ -95,7 +95,7 @@ text = Object List\nDid you know that you can view all objects/parts in a list a
 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 Bambu Studio setting? Or use the familiar shortcut <b>Ctrl+F</b>.
+#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: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.
@@ -110,11 +110,11 @@ text = Split to Objects/Parts\nDid you know that you can split a big object into
 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 Bambu Studio. Read more in the documentation.
+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
 
 [hint:STEP]
-text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nBambu Studio supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!
+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]

resources/images/BambuStudio.svg

@@ -1,7 +1,137 @@
-<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M99.7586 128H28.2414C12.6464 128 0 115.354 0 99.7586V28.2414C0 12.6464 12.6464 0 28.2414 0H99.7586C115.354 0 128 12.6464 128 28.2414V99.7586C128 115.354 115.354 128 99.7586 128Z" fill="#009688"/>
-<path d="M65.7826 54.5925V101.264H92.3441V65.0528L65.7826 54.5925Z" fill="white"/>
-<path d="M65.7826 26.7924V50.1337L92.3441 60.5939V26.7924H65.7826Z" fill="white"/>
-<path d="M35.0999 73.4637V26.7924H61.6615V63.0147L35.0999 73.4637Z" fill="white"/>
-<path d="M35.0999 101.264V77.9339L61.6615 67.4736V101.264H35.0999Z" fill="white"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="1023.9872"
+   height="1023.9927"
+   viewBox="0 0 1023.9872 1023.9927"
+   sodipodi:docname="BambuStudio.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient619">
+      <stop
+         style="stop-color:#d9d9d9;stop-opacity:1;"
+         offset="0"
+         id="stop615" />
+      <stop
+         style="stop-color:#f9f9f9;stop-opacity:1;"
+         offset="1"
+         id="stop617" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath16">
+      <path
+         d="M 0,792 H 612 V 0 H 0 Z"
+         id="path14" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient619"
+       id="linearGradient621"
+       x1="0"
+       y1="0"
+       x2="1024"
+       y2="1024.9971"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000572,0,0,1.0000572,-0.06243956,-0.05871163)" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview4"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.25"
+     inkscape:cx="292"
+     inkscape:cy="568"
+     inkscape:window-width="1350"
+     inkscape:window-height="1237"
+     inkscape:window-x="486"
+     inkscape:window-y="91"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="background"
+     transform="matrix(0.99895749,0,0,0.99799215,-0.93372195,0.0585938)">
+    <rect
+       style="fill:url(#linearGradient621);fill-opacity:1;stroke-width:1.00006"
+       id="rect457"
+       width="1025.0558"
+       height="1026.0529"
+       x="0.93469638"
+       y="-0.058711685"
+       rx="2.0001144"
+       ry="2.0001144" />
+  </g>
+  <g
+     id="g8"
+     inkscape:groupmode="layer"
+     inkscape:label="OrcaS"
+     transform="matrix(1.3333333,0,0,-1.3333333,1.3995581e-8,1055.9963)">
+    <g
+       id="g10"
+       transform="translate(76.258954,16.062441)">
+      <g
+         id="g12"
+         clip-path="url(#clipPath16)">
+        <g
+           id="g18"
+           transform="translate(59.7287,115.3517)">
+          <path
+             d="m 0,0 c 53.332,-53.285 126.698,-86.317 207.744,-86.646 164.049,-0.664 298.355,134.38 297.699,299.337 -0.324,81.496 -33.176,155.271 -86.17,208.899 z"
+             style="fill:#292826;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path20" />
+        </g>
+        <g
+           id="g22"
+           transform="translate(479.0017,536.9419)">
+          <path
+             d="m 0,0 -419.273,-421.59 c 0.298,-0.298 0.606,-0.587 0.906,-0.884 146.894,74.925 348.023,206.579 486.003,316.297 C 52.756,-65.97 29.506,-29.859 0,0"
+             style="fill:#009789;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path24" />
+        </g>
+        <g
+           id="g26"
+           transform="translate(397.0372,747)">
+          <path
+             d="m 0,0 c -163.742,0 -296.482,-133.473 -296.482,-298.121 0,-81.979 32.915,-156.223 86.172,-210.117 l 419.273,421.59 C 155.364,-33.096 81.529,0 0,0"
+             style="fill:#292826;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path28" />
+        </g>
+        <g
+           id="g30"
+           transform="translate(397.0372,747)">
+          <path
+             d="m 0,0 c -56.714,0 -109.702,-16.022 -154.751,-43.796 -24.127,6.312 -54.061,11.37 -88.437,11.157 -59.938,-0.372 -108.713,-16.603 -141.822,-31.784 -8.218,-3.768 -6.898,-15.967 1.941,-17.829 21.801,-4.593 50.498,-14.324 78.883,-35.28 17.931,-13.238 31.574,-27.883 41.856,-41.597 -21.794,-41.504 -34.152,-88.793 -34.152,-138.992 0,-29.952 4.412,-58.865 12.586,-86.137 12.54,27.79 25.699,46.391 29.916,52.184 27.229,37.41 56.015,56.883 98.542,85.651 31.328,21.193 74.856,46.047 199.916,97.449 0,0 39.121,11.017 91.587,42.212 20.912,12.433 36.823,24.17 41.863,42.526 0.355,1.293 0.677,2.57 0.973,3.83 C 129.175,-22.506 67.208,0 0,0"
+             style="fill:#262523;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path32" />
+        </g>
+        <g
+           id="g34"
+           transform="translate(446.5563,646.8041)">
+          <path
+             d="m 0,0 c 10.875,-19.229 -10.891,-52.305 -48.616,-73.879 -37.725,-21.573 -77.124,-23.474 -88,-4.245 -10.875,19.229 10.891,52.305 48.617,73.879 C -50.274,17.328 -10.875,19.229 0,0"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path36" />
+        </g>
+      </g>
+    </g>
+  </g>
 </svg>