Merge: Snapmaker Orca 2.1.2

This commit is contained in:
xiaoyeliu
2025-11-17 10:04:25 +08:00
parent 737948be1f
commit e89263e51a
1147 changed files with 668188 additions and 15290 deletions

View File

@@ -1,10 +0,0 @@
# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
deps/
build_*/
build/
localization/
sandboxes/
resources/*
!resources/web/
!resources/dailytip
!resources/shaders

View File

@@ -1,5 +1,5 @@
{ {
"name": "OrcaSlicer", "name": "Snapmaker_Orca",
"build": { "build": {
"dockerfile": "Dockerfile", "dockerfile": "Dockerfile",
"args": { "args": {

View File

@@ -42,7 +42,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places. # title of most generated pages and in a few other places.
# The default value is: My Project. # The default value is: My Project.
PROJECT_NAME = OrcaSlicer PROJECT_NAME = Snapmaker_Orca
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
@@ -54,14 +54,14 @@ PROJECT_NUMBER = 1.6.3
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a
# quick idea about the purpose of the project. Keep the description short. # quick idea about the purpose of the project. Keep the description short.
PROJECT_BRIEF = OrcaSlicer PROJECT_BRIEF = Snapmaker_Orca
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
# in the documentation. The maximum height of the logo should not exceed 55 # in the documentation. The maximum height of the logo should not exceed 55
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory. # the logo to the output directory.
PROJECT_LOGO = ./resources/images/OrcaSlicer_32px.png PROJECT_LOGO = ./resources/images/Snapmaker_Orca_32px.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is # into which the generated documentation will be written. If a relative path is
@@ -184,7 +184,7 @@ FULL_PATH_NAMES = YES
# will be relative from the directory where doxygen is started. # will be relative from the directory where doxygen is started.
# This tag requires that the tag FULL_PATH_NAMES is set to YES. # This tag requires that the tag FULL_PATH_NAMES is set to YES.
STRIP_FROM_PATH = /Users/runner/work/OrcaSlicer/OrcaSlicer STRIP_FROM_PATH = /Users/runner/work/Snapmaker_Orca/Snapmaker_Orca
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
# path mentioned in the documentation of a class, which tells the reader which # path mentioned in the documentation of a class, which tells the reader which
@@ -193,7 +193,7 @@ STRIP_FROM_PATH = /Users/runner/work/OrcaSlicer/OrcaSlicer
# specify the list of include paths that are normally passed to the compiler # specify the list of include paths that are normally passed to the compiler
# using the -I flag. # using the -I flag.
STRIP_FROM_INC_PATH = /Users/runner/work/OrcaSlicer/OrcaSlicer STRIP_FROM_INC_PATH = /Users/runner/work/Snapmaker_Orca/Snapmaker_Orca
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
# less readable) file names. This can be useful is your file systems doesn't # less readable) file names. This can be useful is your file systems doesn't
@@ -1286,7 +1286,7 @@ GENERATE_HTML = YES
# The default directory is: html. # The default directory is: html.
# This tag requires that the tag GENERATE_HTML is set to YES. # This tag requires that the tag GENERATE_HTML is set to YES.
HTML_OUTPUT = OrcaSlicer_Dev_Document HTML_OUTPUT = Snapmaker_Orca_Dev_Document
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
# generated HTML page (for example: .htm, .php, .asp). # generated HTML page (for example: .htm, .php, .asp).

View File

@@ -5,7 +5,7 @@ body:
- type: markdown - type: markdown
attributes: attributes:
value: | value: |
**Thank you for using Orca Slicer and wanting to report a bug.** **Thank you for using Snapmaker Orca and wanting to report a bug.**
Please note that this is not the place to make feature requests or ask for help. Please note that this is not the place to make feature requests or ask for help.
For this, please use the [Feature request](https://github.com/SoftFever/OrcaSlicer/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others. For this, please use the [Feature request](https://github.com/SoftFever/OrcaSlicer/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others.
@@ -21,8 +21,8 @@ body:
- type: input - type: input
id: version id: version
attributes: attributes:
label: OrcaSlicer Version label: Snapmaker_Orca Version
description: Which version of Orca Slicer are you running? You can see the full version in `Help` -> `About Orca Slicer`. description: Which version of Snapmaker Orca are you running? You can see the full version in `Help` -> `About Snapmaker Orca`.
placeholder: e.g. 1.9.0 placeholder: e.g. 1.9.0
validations: validations:
required: true required: true
@@ -100,10 +100,10 @@ body:
You can export the project file from the application menu in `File`->`Save project as...`, then zip it You can export the project file from the application menu in `File`->`Save project as...`, then zip it
* A **log file** for crashes and similar issues. * A **log file** for crashes and similar issues.
You can find your log file here: You can find your log file here:
Windows: `%APPDATA%\OrcaSlicer\log` or usually `C:\Users\<your username>\AppData\Roaming\OrcaSlicer\log` Windows: `%APPDATA%\Snapmaker_Orca\log` or usually `C:\Users\<your username>\AppData\Roaming\Snapmaker_Orca\log`
MacOS: `$HOME/Library/Application Support/OrcaSlicer/log` MacOS: `$HOME/Library/Application Support/Snapmaker_Orca/log`
Linux: `$HOME/.config/OrcaSlicer/log` Linux: `$HOME/.config/Snapmaker_Orca/log`
If Orca Slicer still starts, you can also reach this directory from the application menu in `Help` -> `Show Configuration Folder` If Snapmaker Orca still starts, you can also reach this directory from the application menu in `Help` -> `Show Configuration Folder`
You can zip the log directory, or just select the newest logs when this issue happens, and zip them You can zip the log directory, or just select the newest logs when this issue happens, and zip them
- type: textarea - type: textarea
id: file_uploads id: file_uploads

View File

@@ -1,5 +1,5 @@
name: 🚀 Feature Request / Enhancement name: 🚀 Feature Request / Enhancement
description: Suggest an improvement to make Orca Slicer even better! description: Suggest an improvement to make Snapmaker Orca even better!
labels: ["enhancement"] labels: ["enhancement"]
body: body:
- type: markdown - type: markdown

View File

@@ -4,6 +4,7 @@ on:
push: push:
branches: branches:
- main - main
- 2.2.0
- release/* - release/*
paths: paths:
- 'deps/**' - 'deps/**'
@@ -18,6 +19,7 @@ on:
pull_request: pull_request:
branches: branches:
- main - main
- 2.1.0
- release/* - release/*
paths: paths:
- 'deps/**' - 'deps/**'
@@ -106,23 +108,23 @@ jobs:
shell: bash shell: bash
- uses: flathub-infra/flatpak-github-actions/flatpak-builder@master - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
with: with:
bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak bundle: Snapmaker_Orca-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
manifest-path: scripts/flatpak/io.github.softfever.OrcaSlicer.yml manifest-path: scripts/flatpak/io.github.softfever.Snapmaker_Orca.yml
cache: true cache: true
arch: ${{ matrix.variant.arch }} arch: ${{ matrix.variant.arch }}
upload-artifact: false upload-artifact: false
- name: Upload artifacts Flatpak - name: Upload artifacts Flatpak
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak name: Snapmaker_Orca-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak' path: '/__w/Snapmaker_Orca/Snapmaker_Orca/Snapmaker_Orca-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
- name: Deploy Flatpak to nightly release - name: Deploy Flatpak to nightly release
if: ${{github.ref == 'refs/heads/main'}} if: ${{github.ref == 'refs/heads/main'}}
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723 release_id: 137995723
asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak asset_path: /__w/Snapmaker_Orca/Snapmaker_Orca/Snapmaker_Orca-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
asset_name: OrcaSlicer-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak asset_name: Snapmaker_Orca-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted

View File

@@ -140,7 +140,7 @@ jobs:
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
build_orca: build_orca:
name: Build OrcaSlicer name: Build Snapmaker_Orca
needs: [build_deps] needs: [build_deps]
if: ${{ !cancelled() && !inputs.build-deps-only && inputs.force-build || (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }} if: ${{ !cancelled() && !inputs.build-deps-only && inputs.force-build || (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }}
uses: ./.github/workflows/build_orca.yml uses: ./.github/workflows/build_orca.yml

View File

@@ -16,13 +16,12 @@ on:
jobs: jobs:
build_orca: build_orca:
name: Build OrcaSlicer name: Build Snapmaker_Orca
runs-on: ${{ inputs.os }} runs-on: ${{ inputs.os }}
env: env:
date: date:
ver: ver:
ver_pure: ver_pure:
ORCA_UPDATER_SIG_KEY: ${{ secrets.ORCA_UPDATER_SIG_KEY }}
steps: steps:
- name: Checkout - name: Checkout
@@ -44,7 +43,7 @@ jobs:
- name: Get the version and date on Ubuntu and macOS - name: Get the version and date on Ubuntu and macOS
if: inputs.os != 'windows-latest' if: inputs.os != 'windows-latest'
run: | run: |
ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2) ver_pure=$(grep 'set(Snapmaker_VERSION' version.inc | cut -d '"' -f2)
if [[ "${{ github.event_name }}" == "pull_request" ]]; then if [[ "${{ github.event_name }}" == "pull_request" ]]; then
ver="PR-${{ github.event.number }}" ver="PR-${{ github.event.number }}"
else else
@@ -67,7 +66,7 @@ jobs:
$ver = "PR" + $prNumber $ver = "PR" + $prNumber
} else { } else {
$versionContent = Get-Content version.inc -Raw $versionContent = Get-Content version.inc -Raw
if ($versionContent -match 'set\(SoftFever_VERSION "(.*?)"\)') { if ($versionContent -match 'set\(Snapmaker_VERSION "(.*?)"\)') {
$ver = $matches[1] $ver = $matches[1]
} }
$ver = "V$ver" $ver = "V$ver"
@@ -102,7 +101,7 @@ jobs:
# Thanks to RaySajuuk, it's working now # Thanks to RaySajuuk, it's working now
- name: Sign app and notary - name: Sign app and notary
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-14' if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || github.ref == 'refs/heads/2.2.0') && inputs.os == 'macos-14'
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
env: env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -119,94 +118,94 @@ jobs:
security import $CERTIFICATE_PATH -P $P12_PASSWORD -A -t cert -f pkcs12 -k $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 list-keychain -d user -s $KEYCHAIN_PATH
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $P12_PASSWORD $KEYCHAIN_PATH security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $P12_PASSWORD $KEYCHAIN_PATH
codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker Orca.app
# Sign OrcaSlicer_profile_validator.app if it exists # Sign Snapmaker_Orca_profile_validator.app if it exists
if [ -f "${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then if [ -f "${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app
fi fi
# Create main OrcaSlicer DMG without the profile validator helper # Create main Snapmaker Orca DMG without the profile validator helper
mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg mkdir -p ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg
rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/* rm -rf ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg/*
cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/ cp -R ${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker Orca.app ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg/
ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/Applications ln -sfn /Applications ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg/Applications
hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg hdiutil create -volname "Snapmaker_Orca" -srcfolder ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg -ov -format UDZO Snapmaker_Orca_Mac_universal_${{ env.ver }}.dmg
codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_universal_${{ env.ver }}.dmg codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" Snapmaker_Orca_Mac_universal_${{ env.ver }}.dmg
# Create separate OrcaSlicer_profile_validator DMG if the app exists # Create separate Snapmaker_Orca_profile_validator DMG if the app exists
if [ -f "${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then if [ -f "${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg mkdir -p ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg
rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/* rm -rf ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg/*
cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/ cp -R ${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg/
ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/Applications ln -sfn /Applications ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg/Applications
hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg hdiutil create -volname "Snapmaker_Orca Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg -ov -format UDZO Snapmaker_Orca_profile_validator_Mac_universal_${{ env.ver }}.dmg
codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" Snapmaker_Orca_profile_validator_Mac_universal_${{ env.ver }}.dmg
fi fi
# Notarize main DMG # Notarize main DMG
xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}" xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
xcrun notarytool submit "OrcaSlicer_Mac_universal_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait xcrun notarytool submit "Snapmaker_Orca_Mac_universal_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
xcrun stapler staple OrcaSlicer_Mac_universal_${{ env.ver }}.dmg xcrun stapler staple Snapmaker_Orca_Mac_universal_${{ env.ver }}.dmg
# Notarize profile validator DMG if it exists # Notarize profile validator DMG if it exists
if [ -f "OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg" ]; then if [ -f "Snapmaker_Orca_profile_validator_Mac_universal_${{ env.ver }}.dmg" ]; then
xcrun notarytool submit "OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait xcrun notarytool submit "Snapmaker_Orca_profile_validator_Mac_universal_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
xcrun stapler staple OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg xcrun stapler staple Snapmaker_Orca_profile_validator_Mac_universal_${{ env.ver }}.dmg
fi fi
- name: Create DMG without notary - name: Create DMG without notary
if: github.ref != 'refs/heads/main' && inputs.os == 'macos-14' if: github.ref != 'refs/heads/main' && inputs.os == 'macos-14' && github.ref != 'refs/heads/2.2.0'
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg mkdir -p ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg
rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/* rm -rf ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg/*
cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/ cp -R ${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker Orca.app ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg/
ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/Applications ln -sfn /Applications ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg/Applications
hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg hdiutil create -volname "Snapmaker_Orca" -srcfolder ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg -ov -format UDZO Snapmaker_Orca_Mac_universal_${{ env.ver }}.dmg
# Create separate OrcaSlicer_profile_validator DMG if the app exists # Create separate Snapmaker_Orca_profile_validator DMG if the app exists
if [ -f "${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then if [ -f "${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg mkdir -p ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg
rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/* rm -rf ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg/*
cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/ cp -R ${{ github.workspace }}/build/universal/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg/
ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/Applications ln -sfn /Applications ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg/Applications
hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg hdiutil create -volname "Snapmaker_Orca Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/Snapmaker_Orca_profile_validator_dmg -ov -format UDZO Snapmaker_Orca_profile_validator_Mac_universal_${{ env.ver }}.dmg
fi fi
- name: Upload artifacts mac - name: Upload artifacts mac
if: inputs.os == 'macos-14' if: inputs.os == 'macos-14'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_Mac_universal_${{ env.ver }} name: Snapmaker_Orca_Mac_universal_${{ env.ver }}
path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg path: ${{ github.workspace }}/Snapmaker_Orca_Mac_universal_${{ env.ver }}.dmg
- name: Upload OrcaSlicer_profile_validator DMG mac - name: Upload Snapmaker_Orca_profile_validator DMG mac
if: inputs.os == 'macos-14' if: inputs.os == 'macos-14'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }} name: Snapmaker_Orca_profile_validator_Mac_universal_DMG_${{ env.ver }}
path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg path: ${{ github.workspace }}/Snapmaker_Orca_profile_validator_Mac_universal_${{ env.ver }}.dmg
if-no-files-found: ignore if-no-files-found: ignore
- name: Deploy Mac release - name: Deploy Mac release
if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14' if: (github.ref == 'refs/heads/main' || github.ref == "refs/heads/2.2.0") && inputs.os == 'macos-14'
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 137995723 release_id: 169912305
asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg asset_path: ${{ github.workspace }}/Snapmaker_Orca_Mac_universal_${{ env.ver }}.dmg
asset_name: OrcaSlicer_Mac_universal_nightly.dmg asset_name: Snapmaker_Orca_Mac_universal_nightly.dmg
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
- name: Deploy Mac OrcaSlicer_profile_validator DMG release - name: Deploy Mac Snapmaker_Orca_profile_validator DMG release
if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14' if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && inputs.os == 'macos-14'
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 137995723 release_id: 169912305
asset_path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg asset_path: ${{ github.workspace }}/Snapmaker_Orca_profile_validator_Mac_universal_${{ env.ver }}.dmg
asset_name: OrcaSlicer_profile_validator_Mac_universal_nightly.dmg asset_name: Snapmaker_Orca_profile_validator_Mac_universal_nightly.dmg
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
max_releases: 1 max_releases: 1
@@ -239,7 +238,7 @@ jobs:
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
working-directory: ${{ github.workspace }}/build working-directory: ${{ github.workspace }}/build
shell: cmd shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_Windows_${{ env.ver }}_portable.zip ${{ github.workspace }}/build/OrcaSlicer' run: '"C:/Program Files/7-Zip/7z.exe" a -tzip Snapmaker_Orca_Windows_${{ env.ver }}_portable.zip ${{ github.workspace }}/build/Snapmaker_Orca'
- name: Pack PDB - name: Pack PDB
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
@@ -251,15 +250,15 @@ jobs:
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_Windows_${{ env.ver }}_portable name: Snapmaker_Orca_Windows_${{ env.ver }}_portable
path: ${{ github.workspace }}/build/OrcaSlicer path: ${{ github.workspace }}/build/Snapmaker_Orca
- name: Upload artifacts Win installer - name: Upload artifacts Win installer
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_Windows_${{ env.ver }} name: Snapmaker_Orca_Windows_${{ env.ver }}
path: ${{ github.workspace }}/build/OrcaSlicer*.exe path: ${{ github.workspace }}/build/Snapmaker_Orca*.exe
- name: Upload artifacts Win PDB - name: Upload artifacts Win PDB
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
@@ -268,43 +267,43 @@ jobs:
name: PDB name: PDB
path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
- name: Upload OrcaSlicer_profile_validator Win - name: Upload Snapmaker_Orca_profile_validator Win
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_profile_validator_Windows_${{ env.ver }} name: Snapmaker_Orca_profile_validator_Windows_${{ env.ver }}
path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe path: ${{ github.workspace }}/build/src/Release/Snapmaker_Orca_profile_validator.exe
- name: Deploy Windows release portable - name: Deploy Windows release portable
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && inputs.os == 'windows-latest'
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 137995723 release_id: 169912305
asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip asset_path: ${{ github.workspace }}/build/Snapmaker_Orca_Windows_${{ env.ver }}_portable.zip
asset_name: OrcaSlicer_Windows_nightly_portable.zip asset_name: Snapmaker_Orca_Windows_nightly_portable.zip
asset_content_type: application/x-zip-compressed asset_content_type: application/x-zip-compressed
max_releases: 1 max_releases: 1
- name: Deploy Windows release installer - name: Deploy Windows release installer
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && inputs.os == 'windows-latest'
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 137995723 release_id: 169912305
asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe asset_path: ${{ github.workspace }}/build/Snapmaker_Orca_Windows_Installer_${{ env.ver }}.exe
asset_name: OrcaSlicer_Windows_Installer_nightly.exe asset_name: Snapmaker_Orca_Windows_Installer_nightly.exe
asset_content_type: application/x-msdownload asset_content_type: application/x-msdownload
max_releases: 1 max_releases: 1
- name: Deploy Windows OrcaSlicer_profile_validator release - name: Deploy Windows Snapmaker_Orca_profile_validator release
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && inputs.os == 'windows-latest'
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 137995723 release_id: 169912305
asset_path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe asset_path: ${{ github.workspace }}/build/src/Release/Snapmaker_Orca_profile_validator.exe
asset_name: OrcaSlicer_profile_validator_Windows_nightly.exe asset_name: Snapmaker_Orca_profile_validator_Windows_nightly.exe
asset_content_type: application/x-msdownload asset_content_type: application/x-msdownload
max_releases: 1 max_releases: 1
@@ -326,7 +325,7 @@ jobs:
- name: Install dependencies from build_linux.sh - name: Install dependencies from build_linux.sh
if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
shell: bash shell: bash
run: sudo env "ORCA_UPDATER_SIG_KEY=$ORCA_UPDATER_SIG_KEY" ./build_linux.sh -ur run: sudo ./build_linux.sh -ur
- name: Fix permissions - name: Fix permissions
if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
@@ -340,15 +339,15 @@ jobs:
ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
run: | run: |
./build_linux.sh -isr ./build_linux.sh -isr
mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage mv -n ./build/Snapmaker_Orca_Linux_V${{ env.ver_pure }}.AppImage ./build/Snapmaker_Orca_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
chmod +x ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage chmod +x ./build/Snapmaker_Orca_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
- name: Build orca_custom_preset_tests - name: Build orca_custom_preset_tests
if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && inputs.os == 'ubuntu-24.04'
working-directory: ${{ github.workspace }}/build/src/Release working-directory: ${{ github.workspace }}/build/src/Release
shell: bash shell: bash
run: | run: |
./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -g 1 ./Snapmaker_Orca_profile_validator -p ${{ github.workspace }}/resources/profiles -g 1
cd ${{ github.workspace }}/resources/profiles cd ${{ github.workspace }}/resources/profiles
zip -r orca_custom_preset_tests.zip user/ zip -r orca_custom_preset_tests.zip user/
@@ -359,32 +358,32 @@ jobs:
ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} name: Snapmaker_Orca_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage' path: './build/Snapmaker_Orca_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage'
- name: Upload OrcaSlicer_profile_validator Ubuntu - name: Upload Snapmaker_Orca_profile_validator Ubuntu
if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
env: env:
ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} name: Snapmaker_Orca_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
path: './build/src/Release/OrcaSlicer_profile_validator' path: './build/src/Release/Snapmaker_Orca_profile_validator'
- name: Deploy Ubuntu release - name: Deploy Ubuntu release
if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }} if: ${{ ! env.ACT && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
env: env:
ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 137995723 release_id: 169912305
asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage asset_path: ./build/Snapmaker_Orca_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_nightly.AppImage asset_name: Snapmaker_Orca_Linux_AppImage${{ env.ubuntu-ver-str }}_nightly.AppImage
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
- name: Deploy Ubuntu release - name: Deploy Ubuntu release
if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }} if: ${{ ! env.ACT && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && inputs.os == 'ubuntu-24.04' }}
uses: rickstaa/action-create-tag@v1 uses: rickstaa/action-create-tag@v1
with: with:
tag: "nightly-builds" tag: "nightly-builds"
@@ -392,25 +391,25 @@ jobs:
force_push_tag: true force_push_tag: true
message: "nightly-builds" message: "nightly-builds"
- name: Deploy Ubuntu OrcaSlicer_profile_validator release - name: Deploy Ubuntu Snapmaker_Orca_profile_validator release
if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }} if: ${{ ! env.ACT && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
env: env:
ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 137995723 release_id: 169912305
asset_path: ./build/src/Release/OrcaSlicer_profile_validator asset_path: ./build/src/Release/Snapmaker_Orca_profile_validator
asset_name: OrcaSlicer_profile_validator_Linux${{ env.ubuntu-ver-str }}_nightly asset_name: Snapmaker_Orca_profile_validator_Linux${{ env.ubuntu-ver-str }}_nightly
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
max_releases: 1 max_releases: 1
- name: Deploy orca_custom_preset_tests - name: Deploy orca_custom_preset_tests
if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }} if: ${{ ! env.ACT && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.2.0') && inputs.os == 'ubuntu-24.04' }}
uses: WebFreak001/deploy-nightly@v3.2.0 uses: WebFreak001/deploy-nightly@v3.2.0
with: with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label}
release_id: 137995723 release_id: 169912305
asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip
asset_name: orca_custom_preset_tests.zip asset_name: orca_custom_preset_tests.zip
asset_content_type: application/octet-stream asset_content_type: application/octet-stream

View File

@@ -25,15 +25,15 @@ jobs:
- name: Check translation format - name: Check translation format
run: | run: |
echo $PWD echo $PWD
pot_file="./localization/i18n/OrcaSlicer.pot" pot_file="./localization/i18n/Snapmaker_Orca.pot"
for dir in ./localization/i18n/*/ for dir in ./localization/i18n/*/
do do
dir=${dir%*/} # remove the trailing "/" dir=${dir%*/} # remove the trailing "/"
lang=${dir##*/} # extract the language identifier lang=${dir##*/} # extract the language identifier
if [ -f "$dir/OrcaSlicer_${lang}.po" ]; then if [ -f "$dir/Snapmaker_Orca_${lang}.po" ]; then
mkdir -p ./resources/i18n/${lang}/ mkdir -p ./resources/i18n/${lang}/
msgfmt --check-format -o ./resources/i18n/${lang}/OrcaSlicer.mo $dir/OrcaSlicer_${lang}.po msgfmt --check-format -o ./resources/i18n/${lang}/Snapmaker_Orca.mo $dir/Snapmaker_Orca_${lang}.po
# Check the exit status of the msgfmt command # Check the exit status of the msgfmt command
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error encountered with msgfmt command for language ${lang}." echo "Error encountered with msgfmt command for language ${lang}."

View File

@@ -31,20 +31,20 @@ jobs:
- name: Download - name: Download
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
curl -LJO https://github.com/SoftFever/Orca_tools/releases/download/1/OrcaSlicer_profile_validator curl -LJO https://github.com/SoftFever/Orca_tools/releases/download/1/Snapmaker_Orca_profile_validator
chmod +x ./OrcaSlicer_profile_validator chmod +x ./Snapmaker_Orca_profile_validator
# validate profiles # validate profiles
- name: validate system profiles - name: validate system profiles
run: | run: |
./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 ./Snapmaker_Orca_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
- name: validate custom presets - name: validate custom presets
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
curl -LJO https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip curl -LJO https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
unzip ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles unzip ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 ./Snapmaker_Orca_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2

2
.gitignore vendored
View File

@@ -26,7 +26,7 @@ deps/build*/*
install_* install_*
build_*/ build_*/
SVG SVG
src/OrcaSlicer-doc/ src/Snapmaker_Orca-doc/
.idea/ .idea/
/.cache/ /.cache/
*.mo *.mo

2
.idea/OrcaSlicer.iml generated
View File

@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module classpath="CMake" type="CPP_MODULE" version="4" />

View File

@@ -53,7 +53,7 @@ if (APPLE)
message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}") message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif () endif ()
project(OrcaSlicer) project(Snapmaker_Orca)
include("version.inc") include("version.inc")
include(GNUInstallDirs) include(GNUInstallDirs)
@@ -89,11 +89,11 @@ else()
endif() endif()
endif() endif()
option(SLIC3R_STATIC "Compile OrcaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL}) option(SLIC3R_STATIC "Compile Snapmaker_Orca with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
option(SLIC3R_GUI "Compile OrcaSlicer with GUI components (OpenGL, wxWidgets)" 1) option(SLIC3R_GUI "Compile Snapmaker_Orca with GUI components (OpenGL, wxWidgets)" 1)
option(SLIC3R_FHS "Assume OrcaSlicer is to be installed in a FHS directory structure" 0) option(SLIC3R_FHS "Assume Snapmaker_Orca 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_WX_STABLE "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
option(SLIC3R_PROFILE "Compile OrcaSlicer with an invasive Shiny profiler" 0) option(SLIC3R_PROFILE "Compile Snapmaker_Orca with an invasive Shiny profiler" 0)
option(SLIC3R_PCH "Use precompiled headers" 1) option(SLIC3R_PCH "Use precompiled headers" 1)
option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 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) option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1)
@@ -127,7 +127,7 @@ if (APPLE)
if (CMAKE_MACOSX_BUNDLE) if (CMAKE_MACOSX_BUNDLE)
set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks) set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
endif() endif()
SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer") SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.snapmaker.snapmaker-orca")
message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}") message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
endif () endif ()
@@ -201,7 +201,7 @@ if (MINGW)
endif () endif ()
if (NOT MSVC) if (NOT MSVC)
# ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for OrcaSlicer on all platforms. # ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for Snapmaker_Orca on all platforms.
add_compile_options(-fsigned-char) add_compile_options(-fsigned-char)
endif () endif ()
@@ -236,7 +236,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT WIN32) if(NOT WIN32)
# Add DEBUG flags to debug builds. # Add DEBUG flags to debug builds.
add_compile_definitions("$<IF:$<CONFIG:Debug>,DEBUG,NDEBUG>") add_compile_options("$<$<CONFIG:DEBUG>:-DDEBUG>")
endif() endif()
# To be able to link libslic3r with the Perl XS module. # To be able to link libslic3r with the Perl XS module.
@@ -421,7 +421,7 @@ if(WIN32)
if(MSVC) if(MSVC)
# BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking. # 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=0x602 -DBOOST_SYSTEM_USE_UTF8 ) add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 )
# Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583 # Force the source code encoding to UTF-8. See Snapmaker_Orca GH pull request #5583
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>") add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>") add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
endif(MSVC) endif(MSVC)
@@ -433,7 +433,7 @@ add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO)
add_definitions(-DwxNO_UNSAFE_WXSTRING_CONV) add_definitions(-DwxNO_UNSAFE_WXSTRING_CONV)
if (SLIC3R_PROFILE) if (SLIC3R_PROFILE)
message("OrcaSlicer will be built with a Shiny invasive profiler") message("Snapmaker_Orca will be built with a Shiny invasive profiler")
add_definitions(-DSLIC3R_PROFILE) add_definitions(-DSLIC3R_PROFILE)
endif () endif ()
@@ -631,7 +631,7 @@ set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/localization/i18n")
add_custom_target(gettext_make_pot 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 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" -f "${BBL_L18N_DIR}/list.txt"
-o "${BBL_L18N_DIR}/OrcaSlicer.pot" -o "${BBL_L18N_DIR}/Snapmaker_Orca.pot"
COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR} COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Generate pot file from strings in the source tree" COMMENT "Generate pot file from strings in the source tree"
@@ -640,13 +640,13 @@ add_custom_target(gettext_merge_po_with_pot
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Merge localization po with new generted pot file" COMMENT "Merge localization po with new generted pot file"
) )
file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po") file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/Snapmaker_Orca*.po")
foreach(po_file ${BBL_L10N_PO_FILES}) foreach(po_file ${BBL_L10N_PO_FILES})
GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY) GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
SET(po_new_file "${po_dir}/OrcaSlicer_.po") SET(po_new_file "${po_dir}/Snapmaker_Orca_.po")
add_custom_command( add_custom_command(
TARGET gettext_merge_po_with_pot PRE_BUILD TARGET gettext_merge_po_with_pot PRE_BUILD
COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot" COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/Snapmaker_Orca.pot"
DEPENDS ${po_file} DEPENDS ${po_file}
) )
endforeach() endforeach()
@@ -654,11 +654,11 @@ add_custom_target(gettext_po_to_mo
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Generate localization po files (binary) from mo files (texts)" COMMENT "Generate localization po files (binary) from mo files (texts)"
) )
file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po") file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/Snapmaker_Orca*.po")
foreach(po_file ${BBL_L10N_PO_FILES}) foreach(po_file ${BBL_L10N_PO_FILES})
GET_FILENAME_COMPONENT(SECOND_FOLDER_ABSOLUTE ${po_file} DIRECTORY) GET_FILENAME_COMPONENT(SECOND_FOLDER_ABSOLUTE ${po_file} DIRECTORY)
string(REGEX REPLACE ".*/(.*)" "\\1" po_dir "${SECOND_FOLDER_ABSOLUTE}" ) string(REGEX REPLACE ".*/(.*)" "\\1" po_dir "${SECOND_FOLDER_ABSOLUTE}" )
SET(mo_file "${L10N_DIR}/${po_dir}/OrcaSlicer.mo") SET(mo_file "${L10N_DIR}/${po_dir}/Snapmaker_Orca.mo")
add_custom_command( add_custom_command(
TARGET gettext_po_to_mo PRE_BUILD TARGET gettext_po_to_mo PRE_BUILD
COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file} COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file}
@@ -699,7 +699,7 @@ else()
endif() endif()
set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR}) set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})
function(orcaslicer_copy_dlls target config postfix output_dlls) function(Snapmaker_Orca_copy_dlls target config postfix output_dlls)
if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64") if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
set(_arch "x64") set(_arch "x64")
elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86") elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86")
@@ -799,7 +799,7 @@ endfunction()
# libslic3r, OrcaSlicer GUI and the OrcaSlicer executable. # libslic3r, OrcaSlicer GUI and the OrcaSlicer executable.
add_subdirectory(deps_src) add_subdirectory(deps_src)
add_subdirectory(src) add_subdirectory(src)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT OrcaSlicer_app_gui) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Snapmaker_Orca_app_gui)
add_dependencies(gettext_make_pot hintsToPot) add_dependencies(gettext_make_pot hintsToPot)
@@ -819,7 +819,7 @@ if(BUILD_TESTS)
endif() endif()
if (NOT WIN32 AND NOT APPLE) if (NOT WIN32 AND NOT APPLE)
set(SLIC3R_APP_CMD "orca-slicer") set(SLIC3R_APP_CMD "snapmaker-orca")
configure_file(${LIBDIR}/dev-utils/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh USE_SOURCE_PERMISSIONS @ONLY) configure_file(${LIBDIR}/dev-utils/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh USE_SOURCE_PERMISSIONS @ONLY)
endif() endif()
@@ -832,49 +832,49 @@ if (WIN32)
install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ".") install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ".")
elseif (SLIC3R_FHS) elseif (SLIC3R_FHS)
# CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share) # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer") set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Snapmaker_Orca")
install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES} install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES}
PATTERN "*/udev" EXCLUDE PATTERN "*/udev" EXCLUDE
) )
install(FILES src/dev-utils/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) install(FILES src/dev-utils/platform/unix/Snapmaker_Orca.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
foreach(SIZE 32 128 192) foreach(SIZE 32 128 192)
install(FILES ${SLIC3R_RESOURCES_DIR}/images/OrcaSlicer_${SIZE}px.png install(FILES ${SLIC3R_RESOURCES_DIR}/images/Snapmaker_Orca_${SIZE}px.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME OrcaSlicer.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME Snapmaker_Orca.png
) )
endforeach() endforeach()
elseif (CMAKE_MACOSX_BUNDLE) elseif (CMAKE_MACOSX_BUNDLE)
# install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/OrcaSlicer.app/Contents/resources") # install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/Snapmaker Orca.app/Contents/resources")
else () else ()
install(FILES src/dev-utils/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) install(FILES src/dev-utils/platform/unix/Snapmaker_Orca.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
endif () endif ()
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION ".") install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION ".")
configure_file(${LIBDIR}/dev-utils/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/dev-utils/platform/unix/fhs.hpp) configure_file(${LIBDIR}/dev-utils/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/dev-utils/platform/unix/fhs.hpp)
set (CPACK_PACKAGE_NAME "OrcaSlicer") set (CPACK_PACKAGE_NAME "Snapmaker_Orca")
set (CPACK_PACKAGE_VENDOR "SoftFever") set (CPACK_PACKAGE_VENDOR "Snapmaker")
set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}") set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}")
set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}") set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}") set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_V${SoftFever_VERSION}") set (CPACK_PACKAGE_FILE_NAME "Snapmaker_Orca_Windows_Installer_V${Snapmaker_VERSION}")
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Snapmaker Orca is an open source slicer for FDM printers")
set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer") set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/Snapmaker/OrcaSlicer")
set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images\\\\OrcaSlicer.ico") set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images\\\\Snapmaker_Orca.ico")
set (CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}") set (CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}")
set (CPACK_NSIS_MUI_UNIICON "${CPACK_PACKAGE_ICON}") set (CPACK_NSIS_MUI_UNIICON "${CPACK_PACKAGE_ICON}")
set (CPACK_NSIS_INSTALLED_ICON_NAME "$INSTDIR\\\\orca-slicer.exe") set (CPACK_NSIS_INSTALLED_ICON_NAME "$INSTDIR\\\\snapmaker orca.exe")
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
CreateShortCut \\\"$DESKTOP\\\\OrcaSlicer.lnk\\\" \\\"$INSTDIR\\\\orca-slicer.exe\\\" CreateShortCut \\\"$DESKTOP\\\\Snapmaker Orca.lnk\\\" \\\"$INSTDIR\\\\snapmaker-orca.exe\\\"
") ")
set (CPACK_PACKAGE_CHECKSUM SHA256) set (CPACK_PACKAGE_CHECKSUM SHA256)
set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OrcaSlicer") set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Snapmaker_Orca")
set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
set (CPACK_NSIS_EXECUTABLES_DIRECTORY ".") set (CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
# set (CPACK_NSIS_MODIFY_PATH "ON") # set (CPACK_NSIS_MODIFY_PATH "ON")
set(CPACK_PACKAGE_EXECUTABLES "orca-slicer;OrcaSlicer") set(CPACK_PACKAGE_EXECUTABLES "snapmaker-orca;Snapmaker Orca")
set(CPACK_CREATE_DESKTOP_LINKS "orca-slicer") set(CPACK_CREATE_DESKTOP_LINKS "snapmaker-orca")
set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) # must also include in install command set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) # must also include in install command
set(CPACK_WIX_UPGRADE_GUID "058245e8-20e0-4a95-9ab7-1acfe17ad511") set(CPACK_WIX_UPGRADE_GUID "058245e8-20e0-4a95-9ab7-1acfe17ad511")

260
README.md
View File

@@ -1,157 +1,84 @@
<div align="center">
<picture> <h1> <p "font-size:200px;"> Snapmaker Orca</p> </h1>
<img alt="OrcaSlicer logo" src="resources/images/OrcaSlicer.png" width="15%" height="15%">
</picture>
<a href="https://trendshift.io/repositories/952" target="_blank"><img src="https://trendshift.io/api/badge/repositories/952" alt="SoftFever%2FOrcaSlicer | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a> [![Build all](https://github.com/Snapmaker/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/Snapmaker/OrcaSlicer/actions/workflows/build_all.yml)
<br>Snapmaker Orca is an open source slicer for FDM printers based on OrcaSlicer.
[![GitHub Repo stars](https://img.shields.io/github/stars/SoftFever/OrcaSlicer)](https://github.com/SoftFever/OrcaSlicer/stargazers) [![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
OrcaSlicer: an open source Next-Gen Slicing Software for Precision 3D Prints.
Optimize your prints with ultra-fast slicing, intelligent support generation, and seamless printer compatibility—engineered for perfection.
<h3>
# Official links and community
#### Official Website:
<a href="https://www.orcaslicer.com/" style="font-size:2em;">OrcaSlicer.com</a>
#### Github Repository:
<a href="https://github.com/SoftFever/OrcaSlicer"><img src="https://img.shields.io/badge/OrcaSlicer-181717?style=flat&logo=github&logoColor=white" width="200" alt="GitHub Logo"/> </a>
#### Follow us:
<a href="https://twitter.com/real_OrcaSlicer"><img src="https://img.shields.io/badge/real__OrcaSlicer-000000?style=flat&logo=x&logoColor=white" width="200" alt="X Logo"/> </a>
#### Join our Discord community:
<a href="https://discord.gg/P4VE9UY9gJ"><img src="https://img.shields.io/badge/-Discord-5865F2?style=flat&logo=discord&logoColor=fff" width="200" alt="discord logo"/> </a>
<table border="2" style="border-color: #ffa500; background-color:rgb(232, 220, 180); color: #856404;">
<tr>
<td>
<strong>⚠️ CAUTION:</strong><br><br>
There are several clickbait and malicious websites pretending to be Official OrcaSlicer. These sites may redirect you to dangerous downloads or contain misleading information.
<br><br>
If you come across any of these in search results, please <a href="https://safebrowsing.google.com/safebrowsing/report_phish/?">report them as unsafe or phishing</a> to help keep the community secure.
</td>
</tr>
</table>
</div>
# Main features
- **[Advanced Calibration Tools](https://github.com/SoftFever/OrcaSlicer/wiki/Calibration)**
Comprehensive suite: temperature towers, flow rate, retraction & more for optimal performance.
- **[Precise Wall](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_precision#precise-wall) and [Seam Control](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_seam)**
Adjust outer wall spacing and apply scarf seams to enhance print accuracy.
- **[Sandwich Mode](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_wall_and_surfaces#innerouterinner) and [Polyholes](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_precision#polyholes) Support**
Use varied infill [patterns](https://github.com/SoftFever/OrcaSlicer/wiki/strength_settings_patterns) and accurate hole shapes for improved clarity.
- **[Overhang](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_overhangs) and [Support Optimization](https://github.com/SoftFever/OrcaSlicer/wiki#support-settings)**
Modify geometry for printable overhangs with precise support placement.
- **[Granular Controls](https://github.com/SoftFever/OrcaSlicer/wiki#process-settings) and Customization**
Fine-tune print speed, layer height, pressure, and temperature with precision.
- **Network Printer Support**
Seamless integration with Klipper, PrusaLink, and OctoPrint for remote control.
- **[Mouse Ear Brims](https://github.com/SoftFever/OrcaSlicer/wiki/others_settings_brim) & Adaptive Bed Mesh**
Automatic brims and adaptive mesh calibration ensure consistent adhesion.
- **User-Friendly Interface**
Intuitive drag-and-drop design with pre-made profiles for popular printers.
- **[Open-Source](https://github.com/SoftFever/OrcaSlicer) & [Community Driven](https://discord.gg/P4VE9UY9gJ)**
Regular updates fueled by continuous community contributions.
- **Wide Printer Compatibility**
Supports a broad range of printers: Bambu Lab, Prusa, Creality, Voron, and more.
- Additional features can be found in the [change notes](https://github.com/SoftFever/OrcaSlicer/releases/).
# Wiki
The wiki below aims to provide a detailed explanation of the slicer settings, including how to maximize their use and how to calibrate and set up your printer.
Please note that the wiki is a work in progress. We appreciate your patience as we continue to develop and improve it!
- **[Access the wiki here](https://github.com/SoftFever/OrcaSlicer/wiki)**
- **[Contribute to the wiki](https://github.com/SoftFever/OrcaSlicer/wiki/How-to-wiki)**
# Download # Download
## Stable Release ### Stable Release
📥 **[Download the Latest Stable Release](https://github.com/Snapmaker/OrcaSlicer/releases/latest)**
📥 **[Download the Latest Stable Release](https://github.com/SoftFever/OrcaSlicer/releases/latest)** Visit our GitHub Releases page for the latest stable version of Snapmaker Slicer, recommended for most users.
Visit our GitHub Releases page for the latest stable version of OrcaSlicer, recommended for most users.
## Nightly Builds
🌙 **[Download the Latest Nightly Build](https://github.com/SoftFever/OrcaSlicer/releases/tag/nightly-builds)**
Explore the latest developments in OrcaSlicer with our nightly builds. Feedback on these versions is highly appreciated.
# How to install # How to install
**Windows**:
## Windows 1. Download the installer for your preferred version from the [releases page](https://github.com/Snapmaker/OrcaSlicer/releases).
- *For convenience there is also a portable build available.*
Download the **Windows Installer exe** for your preferred version from the [releases page](https://github.com/SoftFever/OrcaSlicer/releases).
- *For convenience there is also a portable build available.*
<details>
<summary>Troubleshooting</summary>
- *If you have troubles to run the build, you might need to install following runtimes:* - *If you have troubles to run the build, you might need to install following runtimes:*
- [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe) - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
- [Details of this runtime](https://aka.ms/webview2) - [Details of this runtime](https://aka.ms/webview2)
- [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703) - [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703)
- [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe) - [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
- [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe) - [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe)
- This file may already be available on your computer if you've installed visual studio. Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142` - This file may already be available on your computer if you've installed visual studio. Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142`
</details>
Windows Package Manager
```shell
winget install --id=SoftFever.OrcaSlicer -e
```
## Mac
1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.
2. Drag OrcaSlicer.app to Application folder.
3. *If you want to run a build from a PR, you also need to follow the instructions below:*
<details>
<summary>Quarantine</summary>
**Mac**:
1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.
2. Drag OrcaSlicer.app to Application folder.
3. *If you want to run a build from a PR, you also need to follow the instructions below:*
<details quarantine>
- Option 1 (You only need to do this once. After that the app can be opened normally.): - Option 1 (You only need to do this once. After that the app can be opened normally.):
- Step 1: Hold _cmd_ and right click the app, from the context menu choose **Open**. - Step 1: Hold _cmd_ and right click the app, from the context menu choose **Open**.
- Step 2: A warning window will pop up, click _Open_ - Step 2: A warning window will pop up, click _Open_
- Option 2: - Option 2:
Execute this command in terminal: Execute this command in terminal: `xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app`
```console
```shell softfever@mac:~$ xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app
xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app
``` ```
- Option 3:
- Option 3:
- Step 1: open the app, a warning window will pop up - Step 1: open the app, a warning window will pop up
![mac_cant_open](./SoftFever_doc/mac_cant_open.png) ![image](./SoftFever_doc/mac_cant_open.png)
- Step 2: in `System Settings` -> `Privacy & Security`, click `Open Anyway`: - Step 2: in `System Settings` -> `Privacy & Security`, click `Open Anyway`:
![mac_security_setting](./SoftFever_doc/mac_security_setting.png) ![image](./SoftFever_doc/mac_security_setting.png)
</details> </details>
**Linux (Ubuntu)**:
1. If you run into trouble executing it, try this command in the terminal:
`chmod +x /path_to_appimage/Snapmaker_Orca_Linux.AppImage`
# How to compile
- Windows 64-bit
- Tools needed: Visual Studio 2019, Cmake, git, git-lfs, Strawberry Perl.
- You will require cmake version 3.14 or later, which is available [on their website](https://cmake.org/download/).
- Strawberry Perl is [available on their GitHub repository](https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/).
- Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
- Note: Don't forget to run `git lfs pull` after cloning the repository to download tools on Windows
## Linux (Ubuntu) - Mac 64-bit
- Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf, texinfo
- You can install most of them by running `brew install cmake gettext libtool automake autoconf texinfo`
- run `build_release_macos.sh`
- To build and debug in Xcode:
- run `Xcode.app`
- open ``build_`arch`/OrcaSlicer.Xcodeproj``
- menu bar: Product => Scheme => OrcaSlicer
- menu bar: Product => Scheme => Edit Scheme...
- Run => Info tab => Build Configuration: `RelWithDebInfo`
- Run => Options tab => Document Versions: uncheck `Allow debugging when browsing versions`
- menu bar: Product => Run
1. If you run into trouble executing it, try this command in the terminal: - Ubuntu
`chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage` - Dependencies **Will be auto-installed with the shell script**: `libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git texinfo`
- run 'sudo ./BuildLinux.sh -u'
- run './BuildLinux.sh -dsir'
# How to Compile
All updated build instructions for Windows, macOS, and Linux are now available on the official [OrcaSlicer Wiki - How to build](https://github.com/SoftFever/OrcaSlicer/wiki/How-to-build) page.
Please refer to the wiki to ensure you're following the latest and most accurate steps for your platform.
# Klipper Note
# Note:
If you're running Klipper, it's recommended to add the following configuration to your `printer.cfg` file. If you're running Klipper, it's recommended to add the following configuration to your `printer.cfg` file.
```
```gcode
# Enable object exclusion # Enable object exclusion
[exclude_object] [exclude_object]
@@ -160,53 +87,34 @@ If you're running Klipper, it's recommended to add the following configuration t
resolution: 0.1 resolution: 0.1
``` ```
# Supports
**OrcaSlicer** is an open-source project and I'm deeply grateful to all my sponsors and backers.
Their generous support enables me to purchase filaments and other essential 3D printing materials for the project.
Thank you! :)
## Sponsors:
<table>
<tr>
<td>
<a href="https://qidi3d.com/" style="display:inline-block; border-radius:8px; background:#fff;">
<img src="SoftFever_doc\sponsor_logos\QIDI.png" alt="QIDI" width="100" height="100">
</a>
</td>
<td>
<a href="https://bigtree-tech.com/" style="display:inline-block; border-radius:8px; background:#222;">
<img src="SoftFever_doc\sponsor_logos\BigTreeTech.png" alt="BIGTREE TECH" width="100" height="100">
</a>
</td>
</tr>
</table>
## Backers:
**Ko-fi supporters** ☕: [Backers list](https://github.com/user-attachments/files/16147016/Supporters_638561417699952499.csv)
## Support me
<a href="https://github.com/sponsors/SoftFever"><img src="https://img.shields.io/badge/GitHub%20Sponsors-30363D?style=flat&logo=GitHub-Sponsors&logoColor=EA4AAA" height="50"></a>
<a href="https://ko-fi.com/G2G5IP3CP"><img src="https://img.shields.io/badge/Support_me_on_Ko--fi-FF5E5B?style=flat&logo=ko-fi&logoColor=white" height="50"></a>
<a href="https://paypal.me/softfever3d"><img src="https://img.shields.io/badge/PayPal-003087?style=flat&logo=paypal&logoColor=fff" height="50"></a>
## Some background ## Some background
Snapmaker Orca is originally forked from OrcaSlicer.
OrcaSlicer was originally forked from Bambu Studio, it was previously known as BambuStudio-SoftFever. OrcaSlicer is originally forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)
[Bambu Studio](https://github.com/bambulab/BambuStudio) is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
OrcaSlicer incorporates a lot of features from [SuperSlicer](https://github.com/supermerill/SuperSlicer) by @supermerill
OrcaSlicer's logo is designed by community member Justin Levine (@freejstnalxndr).
# License # License
Snapmaker Orca is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on OrcaSlicer by SoftFever
- **OrcaSlicer** is licensed under the GNU Affero General Public License, version 3. OrcaSlicer is based on Bambu Studio by BambuLab. 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. Bambu Studio is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.
- **Slic3r** is licensed under the GNU Affero General Public License, version 3. Slic3r was created by Alessandro Ranellucci with the help of many other contributors.
- 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. 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.
- OrcaSlicer includes a **pressure advance calibration pattern test** adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
- The **Bambu networking plugin** is based on non-free libraries from BambuLab. It is optional to the OrcaSlicer and provides extended functionalities for Bambulab printer users. Slic3r is licensed under the GNU Affero General Public License, version 3. Slic3r was created by Alessandro Ranellucci with the help of many other contributors.
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.
Orca Slicer includes a pressure advance calibration pattern test adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
The Bambu networking plugin is based on non-free libraries from BambuLab. It is optional to the Orca Slicer and provides extended functionalities for Bambulab printer users.
# Feedback & Contribution
We greatly value feedback and contributions from our users. Your feedback will help us to further develop Snapmaker Orca for our community.
- To submit a bug or feature request, file an issue in GitHub Issues or email us at support@snapmaker.com.
- To contribute some code, make sure you have read and followed our guidelines for contributing.

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -246,11 +246,11 @@ if [[ -n "${BUILD_ORCA}" ]] ; then
else else
cmake --build build --config Release --target OrcaSlicer cmake --build build --config Release --target OrcaSlicer
fi fi
echo "Building OrcaSlicer_profile_validator .." echo "Building Snapmaker_Orca_profile_validator .."
if [[ -n "${BUILD_DEBUG}" ]] ; then if [[ -n "${BUILD_DEBUG}" ]] ; then
cmake --build build --config Debug --target OrcaSlicer_profile_validator cmake --build build --config Debug --target Snapmaker_Orca_profile_validator
else else
cmake --build build --config Release --target OrcaSlicer_profile_validator cmake --build build --config Release --target Snapmaker_Orca_profile_validator
fi fi
./scripts/run_gettext.sh ./scripts/run_gettext.sh
echo "done" echo "done"

View File

@@ -38,13 +38,13 @@ cmake --build . --config %build_type% --target deps -- -m
if "%1"=="deps" exit /b 0 if "%1"=="deps" exit /b 0
:slicer :slicer
echo "building Orca Slicer..." echo "building Snapmaker Orca..."
cd %WP% cd %WP%
mkdir %build_dir% mkdir %build_dir%
cd %build_dir% cd %build_dir%
echo cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% echo cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./Snapmaker_Orca" -DCMAKE_BUILD_TYPE=%build_type%
cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 %SIG_FLAG% -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 %SIG_FLAG% -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./Snapmaker_Orca" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake --build . --config %build_type% --target ALL_BUILD -- -m cmake --build . --config %build_type% --target ALL_BUILD -- -m
cd .. cd ..
call scripts/run_gettext.bat call scripts/run_gettext.bat

View File

@@ -176,7 +176,7 @@ function build_slicer() {
-DORCA_TOOLS=ON \ -DORCA_TOOLS=ON \
${ORCA_UPDATER_SIG_KEY:+-DORCA_UPDATER_SIG_KEY="$ORCA_UPDATER_SIG_KEY"} \ ${ORCA_UPDATER_SIG_KEY:+-DORCA_UPDATER_SIG_KEY="$ORCA_UPDATER_SIG_KEY"} \
-DCMAKE_PREFIX_PATH="$DEPS/usr/local" \ -DCMAKE_PREFIX_PATH="$DEPS/usr/local" \
-DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" \ -DCMAKE_INSTALL_PREFIX="$PWD/Snapmaker_Orca" \
-DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \ -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
-DCMAKE_MACOSX_RPATH=ON \ -DCMAKE_MACOSX_RPATH=ON \
-DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \ -DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \
@@ -193,42 +193,42 @@ function build_slicer() {
./scripts/run_gettext.sh ./scripts/run_gettext.sh
) )
echo "Fix macOS app package..." echo "Fix macOS app package..."
( (
cd "$PROJECT_BUILD_DIR" cd "$PROJECT_BUILD_DIR"
mkdir -p OrcaSlicer mkdir -p Snapmaker_Orca
cd OrcaSlicer cd Snapmaker_Orca
# remove previously built app # remove previously built app
rm -rf ./OrcaSlicer.app rm -rf "./Snapmaker Orca.app"
# fully copy newly built app # fully copy newly built app
cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer.app" ./OrcaSlicer.app cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/Snapmaker Orca.app" "./Snapmaker Orca.app"
# fix resources # fix resources
resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources) resources_path=$(readlink "./Snapmaker Orca.app/Contents/Resources")
rm ./OrcaSlicer.app/Contents/Resources rm "./Snapmaker Orca.app/Contents/Resources"
cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources cp -R "$resources_path" "./Snapmaker Orca.app/Contents/Resources"
# delete .DS_Store file # delete .DS_Store file
find ./OrcaSlicer.app/ -name '.DS_Store' -delete find "./Snapmaker Orca.app/" -name '.DS_Store' -delete
# Copy OrcaSlicer_profile_validator.app if it exists # Copy Snapmaker_Orca_profile_validator.app if it exists
if [ -f "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then if [ -f "../src$BUILD_DIR_CONFIG_SUBDIR/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
echo "Copying OrcaSlicer_profile_validator.app..." echo "Copying Snapmaker_Orca_profile_validator.app..."
rm -rf ./OrcaSlicer_profile_validator.app rm -rf ./Snapmaker_Orca_profile_validator.app
cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer_profile_validator.app" ./OrcaSlicer_profile_validator.app cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/Snapmaker_Orca_profile_validator.app" ./Snapmaker_Orca_profile_validator.app
# delete .DS_Store file # delete .DS_Store file
find ./OrcaSlicer_profile_validator.app/ -name '.DS_Store' -delete find ./Snapmaker_Orca_profile_validator.app/ -name '.DS_Store' -delete
fi fi
) )
# extract version # extract version
# export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3) # export ver=$(grep '^#define Snapmaker_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
# ver="_V${ver//\"}" # ver="_V${ver//\"}"
# echo $PWD # echo $PWD
# if [ "1." != "$NIGHTLY_BUILD". ]; # if [ "1." != "$NIGHTLY_BUILD". ];
# then # then
# ver=${ver}_dev # ver=${ver}_dev
# fi # fi
# zip -FSr OrcaSlicer${ver}_Mac_${_ARCH}.zip OrcaSlicer.app # zip -FSr Snapmaker_Orca${ver}_Mac_${_ARCH}.zip OrcaSlicer.app
fi fi
done done
@@ -242,40 +242,40 @@ function build_universal() {
# Create universal binary # Create universal binary
echo "Creating universal binary..." echo "Creating universal binary..."
# PROJECT_BUILD_DIR="$PROJECT_DIR/build_Universal" # PROJECT_BUILD_DIR="$PROJECT_DIR/build_Universal"
mkdir -p "$PROJECT_BUILD_DIR/OrcaSlicer" mkdir -p "$PROJECT_BUILD_DIR/Snapmaker_Orca"
UNIVERSAL_APP="$PROJECT_BUILD_DIR/OrcaSlicer/OrcaSlicer.app" UNIVERSAL_APP="$PROJECT_BUILD_DIR/Snapmaker_Orca/Snapmaker Orca.app"
rm -rf "$UNIVERSAL_APP" rm -rf "$UNIVERSAL_APP"
cp -R "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app" "$UNIVERSAL_APP" cp -R "$PROJECT_DIR/build/arm64/Snapmaker_Orca/Snapmaker Orca.app" "$UNIVERSAL_APP"
# Get the binary path inside the .app bundle # Get the binary path inside the .app bundle
BINARY_PATH="Contents/MacOS/OrcaSlicer" BINARY_PATH="Contents/MacOS/Snapmaker_Orca"
# Create universal binary using lipo # Create universal binary using lipo
lipo -create \ lipo -create \
"$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \ "$PROJECT_DIR/build/x86_64/Snapmaker_Orca/Snapmaker Orca.app/$BINARY_PATH" \
"$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \ "$PROJECT_DIR/build/arm64/Snapmaker_Orca/Snapmaker Orca.app/$BINARY_PATH" \
-output "$UNIVERSAL_APP/$BINARY_PATH" -output "$UNIVERSAL_APP/$BINARY_PATH"
echo "Universal binary created at $UNIVERSAL_APP" echo "Universal binary created at $UNIVERSAL_APP"
# Create universal binary for profile validator if it exists # Create universal binary for profile validator if it exists
if [ -f "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ] && \ if [ -f "$PROJECT_DIR/build/arm64/Snapmaker_Orca/Snapmaker_Orca.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ] && \
[ -f "$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then [ -f "$PROJECT_DIR/build/x86_64/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
echo "Creating universal binary for OrcaSlicer_profile_validator..." echo "Creating universal binary for Snapmaker_Orca_profile_validator..."
UNIVERSAL_VALIDATOR_APP="$PROJECT_BUILD_DIR/OrcaSlicer/OrcaSlicer_profile_validator.app" UNIVERSAL_VALIDATOR_APP="$PROJECT_BUILD_DIR/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app"
rm -rf "$UNIVERSAL_VALIDATOR_APP" rm -rf "$UNIVERSAL_VALIDATOR_APP"
cp -R "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app" "$UNIVERSAL_VALIDATOR_APP" cp -R "$PROJECT_DIR/build/arm64/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app" "$UNIVERSAL_VALIDATOR_APP"
# Get the binary path inside the profile validator .app bundle # Get the binary path inside the profile validator .app bundle
VALIDATOR_BINARY_PATH="Contents/MacOS/OrcaSlicer_profile_validator" VALIDATOR_BINARY_PATH="Contents/MacOS/Snapmaker_Orca_profile_validator"
# Create universal binary using lipo # Create universal binary using lipo
lipo -create \ lipo -create \
"$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer_profile_validator.app/$VALIDATOR_BINARY_PATH" \ "$PROJECT_DIR/build/x86_64/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app/$VALIDATOR_BINARY_PATH" \
"$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app/$VALIDATOR_BINARY_PATH" \ "$PROJECT_DIR/build/arm64/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app/$VALIDATOR_BINARY_PATH" \
-output "$UNIVERSAL_VALIDATOR_APP/$VALIDATOR_BINARY_PATH" -output "$UNIVERSAL_VALIDATOR_APP/$VALIDATOR_BINARY_PATH"
echo "Universal binary for OrcaSlicer_profile_validator created at $UNIVERSAL_VALIDATOR_APP" echo "Universal binary for Snapmaker_Orca_profile_validator created at $UNIVERSAL_VALIDATOR_APP"
fi fi
} }

View File

@@ -1,4 +1,4 @@
@REM OrcaSlicer build script for Windows @REM Snapmaker_Orca build script for Windows
@echo off @echo off
set WP=%CD% set WP=%CD%
@@ -54,13 +54,13 @@ cmake --build . --config %build_type% --target deps -- -m
if "%1"=="deps" exit /b 0 if "%1"=="deps" exit /b 0
:slicer :slicer
echo "building Orca Slicer..." echo "building Snapmaker Orca..."
cd %WP% cd %WP%
mkdir %build_dir% mkdir %build_dir%
cd %build_dir% cd %build_dir%
echo on echo on
cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DORCA_TOOLS=ON %SIG_FLAG% -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="%WindowsSdkDir%Include\%WindowsSDKVersion%\" cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DORCA_TOOLS=ON %SIG_FLAG% -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./Snapmaker_Orca" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="%WindowsSdkDir%Include\%WindowsSDKVersion%\"
cmake --build . --config %build_type% --target ALL_BUILD -- -m cmake --build . --config %build_type% --target ALL_BUILD -- -m
@echo off @echo off
cd .. cd ..

View File

@@ -11,7 +11,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string> <string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.softfever3d.orca-slicer</string> <string>com.snapmaker.snapmaker-orca</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
@@ -32,10 +32,10 @@
<array> <array>
<dict> <dict>
<key>CFBundleURLName</key> <key>CFBundleURLName</key>
<string>OrcaSlicer Downloads</string> <string>Snapmaker Orca Downloads</string>
<key>CFBundleURLSchemes</key> <key>CFBundleURLSchemes</key>
<array> <array>
<string>orcaslicer</string> <string>Snapmaker Orca</string>
</array> </array>
</dict> </dict>
</array> </array>
@@ -65,7 +65,7 @@
<string>OBJ</string> <string>OBJ</string>
</array> </array>
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>images/OrcaSlicer.icns</string> <string>images/Snapmaker_Orca.icns</string>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>STL</string> <string>STL</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
@@ -82,7 +82,7 @@
<string>AMF</string> <string>AMF</string>
</array> </array>
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>images/OrcaSlicer.icns</string> <string>images/Snapmaker_Orca.icns</string>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>AMF</string> <string>AMF</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
@@ -99,7 +99,7 @@
<string>3MF</string> <string>3MF</string>
</array> </array>
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>images/OrcaSlicer.icns</string> <string>images/Snapmaker_Orca.icns</string>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>3MF</string> <string>3MF</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>

View File

@@ -7,7 +7,7 @@ else()
endif() endif()
if(IS_CROSS_COMPILE AND APPLE) if(IS_CROSS_COMPILE AND APPLE)
orcaslicer_add_cmake_project(Blosc Snapmaker_Orca_add_cmake_project(Blosc
#URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip #URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip
#URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9 #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
@@ -26,7 +26,7 @@ if(IS_CROSS_COMPILE AND APPLE)
-DDEACTIVATE_AVX2=ON -DDEACTIVATE_AVX2=ON
) )
else() else()
orcaslicer_add_cmake_project(Blosc Snapmaker_Orca_add_cmake_project(Blosc
#URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip #URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip
#URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9 #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip

View File

@@ -10,7 +10,7 @@ if (APPLE AND CMAKE_OSX_ARCHITECTURES)
set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}") set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
endif () endif ()
orcaslicer_add_cmake_project(Boost Snapmaker_Orca_add_cmake_project(Boost
URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz" URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz"
URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95 URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95
LIST_SEPARATOR | LIST_SEPARATOR |

View File

@@ -2,7 +2,7 @@ if (IN_GIT_REPO)
set(CGAL_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_CGAL-prefix/src/dep_CGAL) set(CGAL_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_CGAL-prefix/src/dep_CGAL)
endif () endif ()
orcaslicer_add_cmake_project( Snapmaker_Orca_add_cmake_project(
CGAL CGAL
# GIT_REPOSITORY https://github.com/CGAL/cgal.git # GIT_REPOSITORY https://github.com/CGAL/cgal.git
# GIT_TAG bec70a6d52d8aacb0b3d82a7b4edc3caa899184b # releases/CGAL-5.0 # GIT_TAG bec70a6d52d8aacb0b3d82a7b4edc3caa899184b # releases/CGAL-5.0

20
deps/CMakeLists.txt vendored
View File

@@ -1,12 +1,12 @@
# #
# This CMake project downloads, configures and builds OrcaSlicer dependencies on Unix and Windows. # This CMake project downloads, configures and builds Snapmaker_Orca dependencies on Unix and Windows.
# #
# When using this script, it's recommended to perform an out-of-source build using CMake. # 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, # 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 # in a traditional Unix-style prefix structure. The destdir can be used directly by CMake
# when building OrcaSlicer - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local. # when building Snapmaker_Orca - 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. # Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building Snapmaker_Orca.
# #
# For better clarity of console output, it's recommended to _not_ use a parallelized build # 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 # for the top-level command, ie. use `make -j 1` or `ninja -j 1` to force single-threaded top-level
@@ -34,7 +34,7 @@ if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
cmake_policy(SET CMP0135 NEW) cmake_policy(SET CMP0135 NEW)
endif() endif()
project(OrcaSlicer-deps) project(Snapmaker_Orca-deps)
include(ExternalProject) include(ExternalProject)
include(ProcessorCount) include(ProcessorCount)
@@ -87,9 +87,9 @@ endif ()
# Slic3r compiles with a different version which will cause runtime errors. # 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) # option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF)
message(STATUS "OrcaSlicer deps DESTDIR: ${DESTDIR}") message(STATUS "Snapmaker_Orca deps DESTDIR: ${DESTDIR}")
message(STATUS "OrcaSlicer download dir for source packages: ${DEP_DOWNLOAD_DIR}") message(STATUS "Snapmaker_Orca dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}") message(STATUS "Snapmaker_Orca deps debug build: ${DEP_DEBUG}")
find_package(Git REQUIRED) find_package(Git REQUIRED)
@@ -101,7 +101,7 @@ if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
message(STATUS "Forcing CMAKE_BUILD_TYPE to Release as it was not specified.") message(STATUS "Forcing CMAKE_BUILD_TYPE to Release as it was not specified.")
endif () endif ()
function(orcaslicer_add_cmake_project projectname) function(Snapmaker_Orca_add_cmake_project projectname)
cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN}) cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})
set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}) set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
@@ -148,7 +148,7 @@ elseif(FLATPAK)
# the only reason this is here is because of the HACK at the bottom for ci # the only reason this is here is because of the HACK at the bottom for ci
# #
# note for future devs: shared libs may actually create a size reduction # note for future devs: shared libs may actually create a size reduction
# but orcaslicer_deps tends to get really funny regarding linking after that (notably boost) # but Snapmaker_Orca_deps tends to get really funny regarding linking after that (notably boost)
# so, as much as I would like to use that, it's not happening # so, as much as I would like to use that, it's not happening
ExternalProject_Add( ExternalProject_Add(
dep_${projectname} dep_${projectname}
@@ -199,7 +199,7 @@ else()
endif() endif()
endfunction(orcaslicer_add_cmake_project) endfunction(Snapmaker_Orca_add_cmake_project)
if (MSVC) if (MSVC)

View File

@@ -56,7 +56,7 @@ else()
set(_curl_static ON) set(_curl_static ON)
endif() endif()
orcaslicer_add_cmake_project(CURL Snapmaker_Orca_add_cmake_project(CURL
# GIT_REPOSITORY https://github.com/curl/curl.git # GIT_REPOSITORY https://github.com/curl/curl.git
# GIT_TAG curl-7_75_0 # GIT_TAG curl-7_75_0
URL https://github.com/curl/curl/archive/refs/tags/curl-7_75_0.zip URL https://github.com/curl/curl/archive/refs/tags/curl-7_75_0.zip

View File

@@ -2,7 +2,7 @@
#/|/ #/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher #/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/ #/|/
orcaslicer_add_cmake_project(Cereal Snapmaker_Orca_add_cmake_project(Cereal
URL "https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.0.zip" URL "https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.0.zip"
URL_HASH SHA256=71642cb54658e98c8f07a0f0d08bf9766f1c3771496936f6014169d3726d9657 URL_HASH SHA256=71642cb54658e98c8f07a0f0d08bf9766f1c3771496936f6014169d3726d9657
CMAKE_ARGS CMAKE_ARGS

View File

@@ -1,4 +1,4 @@
orcaslicer_add_cmake_project(EXPAT Snapmaker_Orca_add_cmake_project(EXPAT
# GIT_REPOSITORY https://github.com/nigels-com/glew.git # GIT_REPOSITORY https://github.com/nigels-com/glew.git
# GIT_TAG 3a8eff7 # 2.1.0 # GIT_TAG 3a8eff7 # 2.1.0
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/expat SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/expat

View File

@@ -10,7 +10,7 @@ else()
set(_ft_disable_zlib "-D FT_DISABLE_ZLIB=TRUE") set(_ft_disable_zlib "-D FT_DISABLE_ZLIB=TRUE")
endif() endif()
orcaslicer_add_cmake_project(FREETYPE Snapmaker_Orca_add_cmake_project(FREETYPE
URL https://github.com/SoftFever/orca_deps/releases/download/freetype-2.12.1.tar.gz/freetype-2.12.1.tar.gz URL https://github.com/SoftFever/orca_deps/releases/download/freetype-2.12.1.tar.gz/freetype-2.12.1.tar.gz
URL_HASH SHA256=efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938 URL_HASH SHA256=efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938
#DEPENDS ${ZLIB_PKG} #DEPENDS ${ZLIB_PKG}

View File

@@ -2,7 +2,7 @@
set(OpenGL_GL_PREFERENCE "LEGACY") # to prevent a nasty warning by cmake set(OpenGL_GL_PREFERENCE "LEGACY") # to prevent a nasty warning by cmake
find_package(OpenGL QUIET REQUIRED) find_package(OpenGL QUIET REQUIRED)
orcaslicer_add_cmake_project( Snapmaker_Orca_add_cmake_project(
GLEW GLEW
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/glew SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/glew
) )

View File

@@ -12,7 +12,7 @@ else()
set(_glfw_use_wayland "-DGLFW_USE_WAYLAND=FF") set(_glfw_use_wayland "-DGLFW_USE_WAYLAND=FF")
endif() endif()
orcaslicer_add_cmake_project(GLFW Snapmaker_Orca_add_cmake_project(GLFW
URL https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip URL https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip
URL_HASH SHA256=e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0 URL_HASH SHA256=e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0
#DEPENDS dep_Boost #DEPENDS dep_Boost

View File

@@ -11,7 +11,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
endif () endif ()
endif() endif()
orcaslicer_add_cmake_project(JPEG Snapmaker_Orca_add_cmake_project(JPEG
URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.0.1.zip URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.0.1.zip
URL_HASH SHA256=d6d99e693366bc03897677650e8b2dfa76b5d6c54e2c9e70c03f0af821b0a52f URL_HASH SHA256=d6d99e693366bc03897677650e8b2dfa76b5d6c54e2c9e70c03f0af821b0a52f
DEPENDS ${ZLIB_PKG} DEPENDS ${ZLIB_PKG}

View File

@@ -1,4 +1,4 @@
orcaslicer_add_cmake_project(NLopt Snapmaker_Orca_add_cmake_project(NLopt
URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz" URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz"
URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
CMAKE_ARGS CMAKE_ARGS

View File

@@ -3,7 +3,7 @@
# for rasterizing svg files from their original size to a squared power of two texture on Windows systems using # for rasterizing svg files from their original size to a squared power of two texture on Windows systems using
# AMD Radeon graphics cards # AMD Radeon graphics cards
orcaslicer_add_cmake_project(NanoSVG Snapmaker_Orca_add_cmake_project(NanoSVG
DEPENDS dep_Boost DEPENDS dep_Boost
URL https://github.com/SoftFever/nanosvg/archive/863f6aa97ef62028126fa2c19bd4350394c2e15e.zip URL https://github.com/SoftFever/nanosvg/archive/863f6aa97ef62028126fa2c19bd4350394c2e15e.zip
URL_HASH SHA256=8d9c1624ad6518dd6dfa31e4f8dc7da9ec243d88bae595c7a037450617fec851 URL_HASH SHA256=8d9c1624ad6518dd6dfa31e4f8dc7da9ec243d88bae595c7a037450617fec851

View File

@@ -8,9 +8,9 @@ if (IN_GIT_REPO)
set(OCCT_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OCCT-prefix/src/dep_OCCT) set(OCCT_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OCCT-prefix/src/dep_OCCT)
endif () endif ()
orcaslicer_add_cmake_project(OCCT Snapmaker_Orca_add_cmake_project(OCCT
URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_0.zip URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_0.zip
URL_HASH SHA256=28334f0e98f1b1629799783e9b4d21e05349d89e695809d7e6dfa45ea43e1dbc URL_HASH SHA256=28334F0E98F1B1629799783E9B4D21E05349D89E695809D7E6DFA45EA43E1DBC
#PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
PATCH_COMMAND git apply ${OCCT_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch PATCH_COMMAND git apply ${OCCT_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
#DEPENDS dep_Boost #DEPENDS dep_Boost

View File

@@ -1,5 +1,5 @@
orcaslicer_add_cmake_project(OpenCSG Snapmaker_Orca_add_cmake_project(OpenCSG
# GIT_REPOSITORY https://github.com/floriankirsch/OpenCSG.git # GIT_REPOSITORY https://github.com/floriankirsch/OpenCSG.git
# GIT_TAG 83e274457b46c9ad11a4ee599203250b1618f3b9 #v1.4.2 # GIT_TAG 83e274457b46c9ad11a4ee599203250b1618f3b9 #v1.4.2
URL https://github.com/floriankirsch/OpenCSG/archive/refs/tags/opencsg-1-4-2-release.zip URL https://github.com/floriankirsch/OpenCSG/archive/refs/tags/opencsg-1-4-2-release.zip

View File

@@ -8,7 +8,7 @@ if (IN_GIT_REPO)
set(OpenCV_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OpenCV-prefix/src/dep_OpenCV) set(OpenCV_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OpenCV-prefix/src/dep_OpenCV)
endif () endif ()
orcaslicer_add_cmake_project(OpenCV Snapmaker_Orca_add_cmake_project(OpenCV
URL https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz URL https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz
URL_HASH SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 URL_HASH SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
PATCH_COMMAND git apply ${OpenCV_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-vs2022.patch ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch PATCH_COMMAND git apply ${OpenCV_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-vs2022.patch ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch

View File

@@ -36,7 +36,7 @@ else ()
set(_patch_cmd "") set(_patch_cmd "")
endif () endif ()
orcaslicer_add_cmake_project(OpenEXR Snapmaker_Orca_add_cmake_project(OpenEXR
# GIT_REPOSITORY https://github.com/openexr/openexr.git # GIT_REPOSITORY https://github.com/openexr/openexr.git
URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de

View File

@@ -10,11 +10,10 @@ if (IN_GIT_REPO)
set(OPENVDB_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OpenVDB-prefix/src/dep_OpenVDB) set(OPENVDB_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OpenVDB-prefix/src/dep_OpenVDB)
endif () endif ()
orcaslicer_add_cmake_project(OpenVDB Snapmaker_Orca_add_cmake_project(OpenVDB
# support vs2022, update to 8.2 # support vs2022, update to 8.2
URL https://github.com/tamasmeszaros/openvdb/archive/a68fd58d0e2b85f01adeb8b13d7555183ab10aa5.zip URL https://github.com/tamasmeszaros/openvdb/archive/a68fd58d0e2b85f01adeb8b13d7555183ab10aa5.zip
URL_HASH SHA256=f353e7b99bd0cbfc27ac9082de51acf32a8bc0b3e21ff9661ecca6f205ec1d81 URL_HASH SHA256=f353e7b99bd0cbfc27ac9082de51acf32a8bc0b3e21ff9661ecca6f205ec1d81
PATCH_COMMAND git apply ${OPENVDB_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-clang19.patch
DEPENDS dep_TBB dep_Blosc dep_OpenEXR dep_Boost DEPENDS dep_TBB dep_Blosc dep_OpenEXR dep_Boost
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON

4
deps/PNG/PNG.cmake vendored
View File

@@ -7,7 +7,7 @@ endif ()
if(APPLE AND IS_CROSS_COMPILE) if(APPLE AND IS_CROSS_COMPILE)
# TODO: check if it doesn't create problem when compiling from arm to x86_64 # TODO: check if it doesn't create problem when compiling from arm to x86_64
orcaslicer_add_cmake_project(PNG Snapmaker_Orca_add_cmake_project(PNG
GIT_REPOSITORY https://github.com/glennrp/libpng.git GIT_REPOSITORY https://github.com/glennrp/libpng.git
GIT_TAG v1.6.35 GIT_TAG v1.6.35
DEPENDS ${ZLIB_PKG} DEPENDS ${ZLIB_PKG}
@@ -26,7 +26,7 @@ set(_patch_step "")
if (APPLE) if (APPLE)
set(_patch_step PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch) set(_patch_step PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch)
endif () endif ()
orcaslicer_add_cmake_project(PNG Snapmaker_Orca_add_cmake_project(PNG
# GIT_REPOSITORY https://github.com/glennrp/libpng.git # GIT_REPOSITORY https://github.com/glennrp/libpng.git
# GIT_TAG v1.6.35 # GIT_TAG v1.6.35
URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.35.zip URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.35.zip

View File

@@ -1,5 +1,5 @@
include(GNUInstallDirs) include(GNUInstallDirs)
orcaslicer_add_cmake_project(Qhull Snapmaker_Orca_add_cmake_project(Qhull
URL "https://github.com/qhull/qhull/archive/v8.0.1.zip" URL "https://github.com/qhull/qhull/archive/v8.0.1.zip"
URL_HASH SHA256=5287f5edd6a0372588f5d6640799086a4033d89d19711023ef8229dd9301d69b URL_HASH SHA256=5287f5edd6a0372588f5d6640799086a4033d89d19711023ef8229dd9301d69b
CMAKE_ARGS CMAKE_ARGS

2
deps/TBB/TBB.cmake vendored
View File

@@ -4,7 +4,7 @@ else()
set(_patch_command "") set(_patch_command "")
endif() endif()
orcaslicer_add_cmake_project( Snapmaker_Orca_add_cmake_project(
TBB TBB
URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.5.0.zip" URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.5.0.zip"
URL_HASH SHA256=83ea786c964a384dd72534f9854b419716f412f9d43c0be88d41874763e7bb47 URL_HASH SHA256=83ea786c964a384dd72534f9854b419716f412f9d43c0be88d41874763e7bb47

View File

@@ -1,6 +1,6 @@
set(patch_command git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-Respect-BUILD_SHARED_LIBS.patch) set(patch_command git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-Respect-BUILD_SHARED_LIBS.patch)
orcaslicer_add_cmake_project(ZLIB Snapmaker_Orca_add_cmake_project(ZLIB
# GIT_REPOSITORY https://github.com/madler/zlib.git # GIT_REPOSITORY https://github.com/madler/zlib.git
# GIT_TAG v1.2.11 # GIT_TAG v1.2.11
#URL https://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip #URL https://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip

View File

@@ -1,4 +1,4 @@
orcaslicer_add_cmake_project(libnoise Snapmaker_Orca_add_cmake_project(libnoise
URL https://github.com/SoftFever/Orca-deps-libnoise/archive/refs/tags/1.0.zip URL https://github.com/SoftFever/Orca-deps-libnoise/archive/refs/tags/1.0.zip
URL_HASH SHA256=96ffd6cc47898dd8147aab53d7d1b1911b507d9dbaecd5613ca2649468afd8b6 URL_HASH SHA256=96ffd6cc47898dd8147aab53d7d1b1911b507d9dbaecd5613ca2649468afd8b6
) )

View File

@@ -22,7 +22,7 @@ endif ()
# ** THIS INCLUDES BUILD ARGS. ** # ** THIS INCLUDES BUILD ARGS. **
# ...if you can find a way around this size limitation, be my guest. # ...if you can find a way around this size limitation, be my guest.
orcaslicer_add_cmake_project( Snapmaker_Orca_add_cmake_project(
wxWidgets wxWidgets
GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets" GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
GIT_SHALLOW ON GIT_SHALLOW ON

View File

@@ -1,160 +1,38 @@
# Welcome to the OrcaSlicer WIKI! Welcome to the Snapmaker_Orca WIKI!
OrcaSlicer is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki page aims to provide an detailed explanation of the slicer settings, how to get the most out of them as well as how to calibrate and setup your printer. Snapmaker Orca is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki page aims to provide an detailed explanation of the slicer settings, how to get the most out of them as well as how to calibrate and setup your printer.
- [Printer Settings](#printer-settings) The Wiki is work in progress so bear with us while we get it up and running!
- [Material Settings](#material-settings)
- [Process Settings](#process-settings)
- [Quality Settings](#quality-settings)
- [Strength Settings](#strength-settings)
- [Speed Settings](#speed-settings)
- [Support Settings](#support-settings)
- [Multimaterial Settings](#multimaterial-settings)
- [Others Settings](#others-settings)
- [Prepare](#prepare)
- [Calibrations](#calibrations)
- [Developer Section](#developer-section)
> [!WARNING] ## Print Settings, Tips and Tricks (Work In Progress)
> This wiki is community-maintained. The below sections provide a detailed settings explanation as well as tips and tricks in setting these for optimal print results.
> Some pages may be **outdated** while others may be **newer** and present only in [nightly build](https://github.com/SoftFever/OrcaSlicer/releases/tag/nightly-builds) or [latest release](https://github.com/SoftFever/OrcaSlicer/releases).
> [!NOTE] ### Quality Settings
> Please consider contributing to the wiki following the [How to contribute to the wiki](How-to-wiki) guide. - [Layer Height Settings](quality_settings_layer_height)
- [Line Width Settings](quality_settings_line_width)
- [Seam Settings](quality_settings_seam)
- [Precise wall](Precise-wall)
## Printer Settings ### Speed Settings
- [Extrusion rate smoothing](extrusion-rate-smoothing)
![printer-preset](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/printer-preset.png?raw=true) ### Multi material
- [Single Extruder Multimaterial](semm)
![printer](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/printer.svg?raw=true) Settings related to the 3D printer hardware and its configuration.
### Printer Settings:
- [Air filtration/Exhaust fan handling](air-filtration) - [Air filtration/Exhaust fan handling](air-filtration)
- [Auxiliary fan handling](Auxiliary-fan) - [Auxiliary fan handling](Auxiliary-fan)
- [Chamber temperature control](chamber-temperature) - [Chamber temperature control](chamber-temperature)
- [Adaptive Bed Mesh](adaptive-bed-mesh) - [Adaptive Bed Mesh](adaptive-bed-mesh)
- [Using different bed types in Orca](bed-types) - [Using different bed types in Orca](bed-types)
## Material Settings
![filament-preset](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/filament-preset.png?raw=true)
![filament](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/filament.svg?raw=true) Settings related to the 3D printing material.
- [Single Extruder Multimaterial](semm)
- [Pellet Printers (pellet flow coefficient)](pellet-flow-coefficient) - [Pellet Printers (pellet flow coefficient)](pellet-flow-coefficient)
## Process Settings ## Printer Calibration
The guide below takes you through the key calibration tests in Orca - flow rate, pressure advance, print temperature, retraction, tolerances and maximum volumetric speed
![process-preset](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process-preset.png?raw=true) - [Calibration Guide](./Calibration)
- [Adaptive Pressure Advance Guide](adaptive-pressure-advance)
![process](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/process.svg?raw=true) Settings related to the 3D printing process.
### Quality Settings
![custom-gcode_quality](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_quality.svg?raw=true) Settings related to print quality and aesthetics.
![process-quality](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-quality.png?raw=true)
- ![param_layer_height](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_layer_height.svg?raw=true) [Layer Height Settings](quality_settings_layer_height)
- ![param_line_width](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_line_width.svg?raw=true) [Line Width Settings](quality_settings_line_width)
- ![param_seam](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_seam.svg?raw=true) [Seam Settings](quality_settings_seam)
- ![param_precision](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_precision.svg?raw=true) [Precision](quality_settings_precision)
- ![param_ironing](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_ironing.svg?raw=true) [Ironing](quality_settings_ironing)
- ![param_wall_generator](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_wall_generator.svg?raw=true) [Wall generator](quality_settings_wall_generator)
- ![param_wall_surface](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_wall_surface.svg?raw=true) [Walls and surfaces](quality_settings_wall_and_surfaces)
- ![param_bridge](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_bridge.svg?raw=true) [Bridging](quality_settings_bridging)
- ![param_overhang](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_overhang.svg?raw=true) [Overhangs](quality_settings_overhangs)
### Strength Settings
![custom-gcode_strength](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_strength.svg?raw=true) Settings related to print strength and durability.
![process-strength](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-strength.png?raw=true)
- ![param_wall](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_wall.svg?raw=true) [Walls](strength_settings_walls)
- ![param_shell](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_shell.svg?raw=true) [Top and Bottom Shells](strength_settings_top_bottom_shells)
- ![param_infill](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_infill.svg?raw=true) [Infill](strength_settings_infill)
- ![param_concentric](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_concentric.svg?raw=true) [Fill Patterns](strength_settings_patterns)
- ![param_gcode](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_gcode.svg?raw=true) [Template Metalanguage for infill rotation](strength_settings_infill_rotation_template_metalanguage)
- ![param_advanced](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_advanced.svg?raw=true) [Advanced](strength_settings_advanced)
### Speed Settings
![custom-gcode_speed](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_speed.svg?raw=true) Settings related to print speed and movement.
![process-speed](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-speed.png?raw=true)
- ![param_speed_first](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_speed_first.svg?raw=true) [Initial Layer Speed](speed_settings_initial_layer_speed)
- ![param_speed](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_speed.svg?raw=true) [Other Layers Speed](speed_settings_other_layers_speed)
- ![param_overhang_speed](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_overhang_speed.svg?raw=true) [Overhang Speed](speed_settings_overhang_speed)
- ![param_travel_speed](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_travel_speed.svg?raw=true) [Travel Speed](speed_settings_travel)
- ![param_acceleration](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_acceleration.svg?raw=true) [Acceleration](speed_settings_acceleration)
- ![param_jerk](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_jerk.svg?raw=true) [Jerk (XY)](speed_settings_jerk_xy)
- ![param_advanced](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_advanced.svg?raw=true) [Advanced / Extrusion rate smoothing](speed_settings_advanced)
### Support Settings
![custom-gcode_support](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_support.svg?raw=true) Settings related to support structures and their properties.
![process-support](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-support.png?raw=true)
- ![param_support](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_support.svg?raw=true) [Support](support_settings_support)
- ![param_raft](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_raft.svg?raw=true) [Raft](support_settings_raft)
- ![param_support_filament](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_support_filament.svg?raw=true) [Support Filament](support_settings_filament)
- ![param_ironing](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_ironing.svg?raw=true) [Support Ironing](support_settings_ironing)
- ![param_advanced](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_advanced.svg?raw=true) [Advanced](support_settings_advanced)
- ![param_support_tree](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_support_tree.svg?raw=true) [Tree Supports](support_settings_tree)
### Multimaterial Settings
![custom-gcode_multi_material](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_multi_material.svg?raw=true) Settings related to multimaterial printing.
![process-multimaterial](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-multimaterial.png?raw=true)
- ![param_tower](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_tower.svg?raw=true) [Prime Tower](multimaterial_settings_prime_tower)
- ![param_filament_for_features](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_filament_for_features.svg?raw=true) [Filament for Features](multimaterial_settings_filament_for_features)
- ![param_ooze_prevention](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_ooze_prevention.svg?raw=true) [Ooze Prevention](multimaterial_settings_ooze_prevention)
- ![param_flush](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_flush.svg?raw=true) [Flush Options](multimaterial_settings_flush_options)
- ![param_advanced](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_advanced.svg?raw=true) [Advanced](multimaterial_settings_advanced)
### Others Settings
![custom-gcode_other](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_other.svg?raw=true) Settings related to various other print settings.
![process-others](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-others.png?raw=true)
- ![param_skirt](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_skirt.svg?raw=true) [Skirt](others_settings_skirt)
- ![param_adhension](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_adhension.svg?raw=true) [Brim](others_settings_brim)
- ![param_special](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_special.svg?raw=true) [Special Mode](others_settings_special_mode)
- ![fuzzy_skin](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/fuzzy_skin.svg?raw=true) [Fuzzy Skin](others_settings_fuzzy_skin)
- ![param_gcode](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_gcode.svg?raw=true) [G-Code Output](others_settings_g_code_output)
- ![param_gcode](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_gcode.svg?raw=true) [Post Processing Scripts](others_settings_post_processing_scripts)
- ![note](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/note.svg?raw=true) [Notes](others_settings_notes)
## Prepare
![tab_3d_active](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/tab_3d_active.svg?raw=true) First steps to prepare your model/s for printing.
- [STL Transformation](stl-transformation)
## Calibrations
![tab_calibration_active](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/tab_calibration_active.svg?raw=true) The [Calibration Guide](Calibration) outlines Orcas key calibration tests and their suggested order of execution.
- [Temperature](temp-calib)
- [Flow Rate](flow-rate-calib)
- [Pressure Advance](pressure-advance-calib)
- [Adaptive Pressure Advance Guide](adaptive-pressure-advance-calib)
- [Retraction](retraction-calib)
- [Tolerance](tolerance-calib)
- Advanced:
- [Volumetric Speed](volumetric-speed-calib)
- [Cornering (Jerk & Junction Deviation)](cornering-calib)
- [Input Shaping](input-shaping-calib)
- [VFA](vfa-calib)
## Developer Section ## Developer Section
- [How to build Orca Slicer](./How-to-build)
![im_code](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/im_code.svg?raw=true) This is a documentation from someone exploring the code and is by no means complete or even completely accurate. Please edit the parts you might find inaccurate. This is probably going to be helpful nonetheless.
- [How to build OrcaSlicer](How-to-build)
- [Localization and translation guide](Localization_guide) - [Localization and translation guide](Localization_guide)
- [How to create profiles](How-to-create-profiles) - [Developer Reference](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/developer-reference/Home.md)
- [How to contribute to the wiki](How-to-wiki)
- [Preset, PresetBundle and PresetCollection](Preset-and-bundle)
- [Plater, Sidebar, Tab, ComboBox](plater-sidebar-tab-combobox)
- [Slicing Call Hierarchy](slicing-hierarchy)

View File

@@ -379,13 +379,13 @@ The process is the same if you want to add a new brand filament profile into the
#### Example #### Example
```shell ```shell
./OrcaSlicer_profile_validator -p ~/codes/OrcaSlicer/resources/profiles -l 2 -v Custom ./Snapmaker_Orca_profile_validator -p ~/codes/OrcaSlicer/resources/profiles -l 2 -v Custom
``` ```
#### Sample result with errors #### Sample result with errors
```shell ```shell
PS D:\codes\OrcaSlicer> ."D:/codes/OrcaSlicer/build/src/Release/OrcaSlicer_profile_validator.exe" --path d:\codes\OrcaSlicer\resources\profiles -l 2 -v Custom PS D:\codes\OrcaSlicer> ."D:/codes/OrcaSlicer/build/src/Release/Snapmaker_Orca_profile_validator.exe" --path d:\codes\OrcaSlicer\resources\profiles -l 2 -v Custom
[2024-02-28 21:23:06.102138] [0x0000a4e8] [error] Slic3r::ConfigBase::load_from_json: parse d:\codes\OrcaSlicer\resources\profiles/Custom/machine/fdm_klipper_common.json got a nlohmann::detail::parse_error, reason = [json.exception.parse_error.101] parse error at line 9, column 38: syntax error while parsing object - unexpected string literal; expected '}' [2024-02-28 21:23:06.102138] [0x0000a4e8] [error] Slic3r::ConfigBase::load_from_json: parse d:\codes\OrcaSlicer\resources\profiles/Custom/machine/fdm_klipper_common.json got a nlohmann::detail::parse_error, reason = [json.exception.parse_error.101] parse error at line 9, column 38: syntax error while parsing object - unexpected string literal; expected '}'
... ...
Validation failed Validation failed
@@ -394,12 +394,12 @@ Validation failed
#### Sample result with success #### Sample result with success
```shell ```shell
PS D:\codes\OrcaSlicer\build\src\RelWithDebInfo> ."D:/codes/OrcaSlicer/build/src/Release/OrcaSlicer_profile_validator.exe" --path d:\codes\OrcaSlicer\resources\profiles -l 2 -v Custom PS D:\codes\OrcaSlicer\build\src\RelWithDebInfo> ."D:/codes/OrcaSlicer/build/src/Release/Snapmaker_Orca_profile_validator.exe" --path d:\codes\OrcaSlicer\resources\profiles -l 2 -v Custom
Validation completed successfully Validation completed successfully
``` ```
> [!WARNING] > [!WARNING]
> Use `OrcaSlicer_profile_validator` on Ubuntu and `OrcaSlicer_profile_validator.exe` on Windows. > Use `Snapmaker_Orca_profile_validator` on Ubuntu and `Snapmaker_Orca_profile_validator.exe` on Windows.
--- ---

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -82,6 +82,7 @@ src/slic3r/GUI/ImageGrid.cpp
src/slic3r/GUI/Printer/PrinterFileSystem.cpp src/slic3r/GUI/Printer/PrinterFileSystem.cpp
src/slic3r/GUI/Mouse3DController.cpp src/slic3r/GUI/Mouse3DController.cpp
src/slic3r/GUI/StatusPanel.cpp src/slic3r/GUI/StatusPanel.cpp
src/slic3r/GUI/SSWCP.cpp
src/slic3r/GUI/Monitor.cpp src/slic3r/GUI/Monitor.cpp
src/slic3r/GUI/MsgDialog.cpp src/slic3r/GUI/MsgDialog.cpp
src/slic3r/GUI/NotificationManager.hpp src/slic3r/GUI/NotificationManager.hpp
@@ -119,6 +120,7 @@ src/slic3r/GUI/WipeTowerDialog.cpp
src/slic3r/GUI/wxExtensions.cpp src/slic3r/GUI/wxExtensions.cpp
src/slic3r/GUI/wxMediaCtrl2.cpp src/slic3r/GUI/wxMediaCtrl2.cpp
src/slic3r/GUI/WebUserLoginDialog.cpp src/slic3r/GUI/WebUserLoginDialog.cpp
src/slic3r/GUI/WebSMUserLoginDialog.cpp
src/slic3r/GUI/WebGuideDialog.cpp src/slic3r/GUI/WebGuideDialog.cpp
src/slic3r/GUI/KBShortcutsDialog.hpp src/slic3r/GUI/KBShortcutsDialog.hpp
src/slic3r/GUI/KBShortcutsDialog.cpp src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -169,6 +171,7 @@ src/slic3r/Utils/Duet.cpp
src/slic3r/Utils/FlashAir.cpp src/slic3r/Utils/FlashAir.cpp
src/slic3r/Utils/MKS.cpp src/slic3r/Utils/MKS.cpp
src/slic3r/Utils/OctoPrint.cpp src/slic3r/Utils/OctoPrint.cpp
src/slic3r/Utils/MoonRaker.cpp
src/slic3r/Utils/Repetier.cpp src/slic3r/Utils/Repetier.cpp
src/slic3r/Utils/ProfileDescription.hpp src/slic3r/Utils/ProfileDescription.hpp
src/slic3r/Utils/Obico.cpp src/slic3r/Utils/Obico.cpp

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -64,25 +64,25 @@
[hint:Precise wall] [hint:Precise wall]
text = Precise wall\nDid you know that turning on precise wall can improve precision and layer consistency? text = Precise wall\nDid you know that turning on precise wall can improve precision and layer consistency?
documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_precision documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Precise-wall
[hint:Sandwich mode] [hint:Sandwich mode]
text = Sandwich mode\nDid you know that you can use sandwich mode (inner-outer-inner) to improve precision and layer consistency if your model doesn't have very steep overhangs? text = Sandwich mode\nDid you know that you can use sandwich mode (inner-outer-inner) to improve precision and layer consistency if your model doesn't have very steep overhangs?
[hint:Chamber temperature] [hint:Chamber temperature]
text = Chamber temperature\nDid you know that OrcaSlicer supports chamber temperature? text = Chamber temperature\nDid you know that Snapmaker Orca supports chamber temperature?
documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Chamber-temperature documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Chamber-temperature
[hint:Calibration] [hint:Calibration]
text = Calibration\nDid you know that calibrating your printer can do wonders? Check out our beloved calibration solution in OrcaSlicer. text = Calibration\nDid you know that calibrating your printer can do wonders? Check out our beloved calibration solution in Snapmaker Orca.
documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Calibration documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Calibration
[hint:Auxiliary fan] [hint:Auxiliary fan]
text = Auxiliary fan\nDid you know that OrcaSlicer supports Auxiliary part cooling fan? text = Auxiliary fan\nDid you know that Snapmaker Orca supports Auxiliary part cooling fan?
documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Auxiliary-fan documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/Auxiliary-fan
[hint:Air filtration] [hint:Air filtration]
text = Air filtration/Exhaust Fan\nDid you know that OrcaSlicer can support Air filtration/Exhaust Fan? text = Air filtration/Exhaust Fan\nDid you know that Snapmaker Orca can support Air filtration/Exhaust Fan?
documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/air-filtration documentation_link = https://github.com/SoftFever/OrcaSlicer/wiki/air-filtration
[hint:G-code window] [hint:G-code window]
@@ -92,7 +92,7 @@ text = G-code window\nYou can turn on/off the G-code window by pressing the <b>C
text = Switch workspaces\nYou can switch between <b>Prepare</b> and <b>Preview</b> workspaces by pressing the <b>Tab</b> key. text = Switch workspaces\nYou can switch between <b>Prepare</b> and <b>Preview</b> workspaces by pressing the <b>Tab</b> key.
[hint:How to use keyboard shortcuts] [hint:How to use keyboard shortcuts]
text = How to use keyboard shortcuts\nDid you know that Orca Slicer offers a wide range of keyboard shortcuts and 3D scene operations? text = How to use keyboard shortcuts\nDid you know that Snapmaker Orca offers a wide range of keyboard shortcuts and 3D scene operations.
[hint:Reverse on odd] [hint:Reverse on odd]
text = Reverse on odd\nDid you know that <b>Reverse on odd</b> feature can significantly improve the surface quality of your overhangs? text = Reverse on odd\nDid you know that <b>Reverse on odd</b> feature can significantly improve the surface quality of your overhangs?
@@ -107,10 +107,10 @@ text = Fix Model\nDid you know that you can fix a corrupted 3D model to avoid a
text = Timelapse\nDid you know that you can generate a timelapse video during each print? text = Timelapse\nDid you know that you can generate a timelapse video during each print?
[hint:Auto-Arrange] [hint:Auto-Arrange]
text = Auto-Arrange\nDid you know that you can auto-arrange all the objects in your project? text = Auto-Arrange\nDid you know that you can auto-arrange all objects in your project?
[hint:Auto-Orient] [hint:Auto-Orient]
text = Auto-Orient\nDid you know that you can rotate objects to an optimal orientation for printing with a simple click? text = Auto-Orient\nDid you know that you can rotate objects to an optimal orientation for printing by a simple click?
[hint:Lay on Face] [hint:Lay on Face]
text = Lay on Face\nDid you know that you can quickly orient a model so that one of its faces sits on the print bed? Select the \"Place on face\" function or press the <b>F</b> key. text = Lay on Face\nDid you know that you can quickly orient a model so that one of its faces sits on the print bed? Select the \"Place on face\" function or press the <b>F</b> key.
@@ -119,7 +119,7 @@ text = Lay on Face\nDid you know that you can quickly orient a model so that one
text = Object List\nDid you know that you can view all objects/parts in a list and change settings for each object/part? text = Object List\nDid you know that you can view all objects/parts in a list and change settings for each object/part?
[hint:Search Functionality] [hint:Search Functionality]
text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Orca Slicer setting? text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Snapmaker Orca setting?
[hint:Simplify Model] [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. 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.
@@ -131,10 +131,10 @@ text = Slicing Parameter Table\nDid you know that you can view all objects/parts
text = Split to Objects/Parts\nDid you know that you can split a big object into small ones for easy colorizing or printing? text = Split to Objects/Parts\nDid you know that you can split a big object into small ones for easy colorizing or printing?
[hint:Subtract a Part] [hint:Subtract a Part]
text = Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Orca Slicer. 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 Snapmaker Orca.
[hint:STEP] [hint:STEP]
text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nOrca Slicer supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try! text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nSnapmaker Orca supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!
[hint:Z seam location] [hint:Z seam location]
text = Z seam location\nDid you know that you can customize the location of the Z seam, and even paint it on your print, to have it in a less visible location? This improves the overall look of your model. Check it out! text = Z seam location\nDid you know that you can customize the location of the Z seam, and even paint it on your print, to have it in a less visible location? This improves the overall look of your model. Check it out!
@@ -158,25 +158,25 @@ text = Different types of supports\nDid you know that you can choose from multip
text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results. text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results.
[hint:Brim for better adhesion] [hint:Brim for better adhesion]
text = Brim for better adhesion\nDid you know that when printed models have a small contact interface with the printing surface, it's recommended to use a brim? text = Brim for better adhesion\nDid you know that when printing models have a small contact interface with the printing surface, it's recommended to use a brim?
[hint:Set parameters for multiple objects] [hint:Set parameters for multiple objects]
text = Set parameters for multiple objects\nDid you know that you can set slicing parameters for all selected objects at once? text = Set parameters for multiple objects\nDid you know that you can set slicing parameters for all selected objects at one time?
[hint:Stack objects] [hint:Stack objects]
text = Stack objects\nDid you know that you can stack objects as a whole one? text = Stack objects\nDid you know that you can stack objects as a whole one?
[hint:Flush into support/objects/infill] [hint:Flush into support/objects/infill]
text = Flush into support/objects/infill\nDid you know that you can save wasted filament by flushing it into support/objects/infill during filament change? text = Flush into support/objects/infill\nDid you know that you can save the wasted filament by flushing them into support/objects/infill during filament change?
[hint:Improve strength] [hint:Improve strength]
text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model? text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model?
[hint:When do you need to print with the printer door opened] [hint:When need to print with the printer door opened]
text = When do you need to print with the printer door opened?\nDid you know that opening the printer door can reduce the probability of extruder/hotend clogging when printing lower temperature filament with a higher enclosure temperature? More info about this in the Wiki. text = When need to print with the printer door opened\nDid you know that opening the printer door can reduce the probability of extruder/hotend clogging when printing lower temperature filament with a higher enclosure temperature. More info about this in the Wiki.
[hint:Avoid warping] [hint:Avoid warping]
text = Avoid warping\nDid you know that when printing materials that are prone to warping such as ABS, appropriately increasing the heatbed temperature can reduce the probability of warping? text = Avoid warping\nDid you know that when printing materials that are prone to warping such as ABS, appropriately increasing the heatbed temperature can reduce the probability of warping.
#[hint:] #[hint:]
#text = #text =

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64"><rect width="64" height="64" rx="14" style="fill:#e9e9e9"/><path d="M13.84,50.354a19.7,19.7,0,0,0,13.883,5.79A19.944,19.944,0,0,0,41.858,22.182Z" style="fill:#292826"/><path d="M41.858,22.181,13.84,50.354l.061.059A220.548,220.548,0,0,0,46.378,29.277a19.964,19.964,0,0,0-4.52-7.1" style="fill:#009789"/><path d="M36.381,7.856A19.943,19.943,0,0,0,22.327,41.818L50.345,13.646a19.693,19.693,0,0,0-13.964-5.79" style="fill:#292826"/><path d="M36.381,7.856A19.636,19.636,0,0,0,26.04,10.782a22.742,22.742,0,0,0-5.91-.745,23.084,23.084,0,0,0-9.477,2.124.632.632,0,0,0,.129,1.191,13.52,13.52,0,0,1,8.069,5.137A20.06,20.06,0,0,0,17.41,33.534a19.873,19.873,0,0,1,2-3.488c1.819-2.5,3.743-3.8,6.585-5.723,2.093-1.416,5-3.077,13.359-6.512a28.421,28.421,0,0,0,6.12-2.821c1.4-.831,2.461-1.615,2.8-2.842.024-.086.045-.172.065-.256A19.655,19.655,0,0,0,36.381,7.856" style="fill:#262523"/><path d="M39.69,14.551c.727,1.285-.728,3.495-3.249,4.937s-5.154,1.569-5.88.284.727-3.495,3.248-4.937,5.154-1.569,5.881-.284" style="fill:#fff"/></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -1 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="560" height="125" viewBox="0 0 560 125"><rect id="b" x="20" y="123" width="520" height="2" style="fill:#009789;"/><g id="c"><g id="d"><rect x="20" y="21.22" width="80.56" height="80.56" rx="9.64" ry="9.64" style="fill:#e9e9e9;"/></g></g><g id="e"><path id="f" d="M37.42,84.6c4.49,4.48,10.66,7.26,17.48,7.29,13.8.06,25.1-11.3,25.04-25.18-.03-6.86-2.79-13.06-7.25-17.57l-35.27,35.46Z" style="fill:#292826;"/></g><g id="g"><path id="h" d="M72.69,49.14l-35.27,35.46s.05.05.08.07c12.36-6.3,29.28-17.38,40.88-26.61-1.25-3.38-3.21-6.42-5.69-8.93" style="fill:#009789;"/></g><g id="i"><path id="j" d="M65.8,31.11c-13.77,0-24.94,11.23-24.94,25.08,0,6.9,2.77,13.14,7.25,17.68l35.27-35.46c-4.51-4.5-10.72-7.29-17.58-7.29" style="fill:#292826;"/></g><g id="k"><path id="l" d="M65.8,31.11c-4.77,0-9.23,1.35-13.02,3.68-2.03-.53-4.55-.96-7.44-.94-5.04.03-9.14,1.4-11.93,2.67-.69.32-.58,1.34.16,1.5,1.83.39,4.25,1.2,6.64,2.97,1.51,1.11,2.66,2.35,3.52,3.5-1.83,3.49-2.87,7.47-2.87,11.69,0,2.52.37,4.95,1.06,7.25,1.05-2.34,2.16-3.9,2.52-4.39,2.29-3.15,4.71-4.79,8.29-7.2,2.64-1.78,6.3-3.87,16.82-8.2,0,0,3.29-.93,7.7-3.55,1.76-1.05,3.1-2.03,3.52-3.58.03-.11.06-.22.08-.32-4.18-3.19-9.4-5.08-15.05-5.08" style="fill:#262523;"/></g><g id="m"><path id="n" d="M69.96,39.54c.91,1.62-.92,4.4-4.09,6.21-3.17,1.81-6.49,1.97-7.4.36-.91-1.62.92-4.4,4.09-6.21,3.17-1.81,6.49-1.97,7.4-.36" style="fill:#fff;"/></g><path d="M163.44,69.66c-1.02,0-1.85.83-1.85,1.85v18.53c0,1.02.83,1.85,1.85,1.85s1.85-.83,1.85-1.85v-18.53c0-1.02-.83-1.85-1.85-1.85Z" style="fill:#949494;"/><path d="M212.05,69.66h-4.43c-6.13,0-11.12,4.99-11.12,11.12s4.99,11.12,11.12,11.12h4.43c1.02,0,1.85-.83,1.85-1.85s-.83-1.85-1.85-1.85h-4.43c-4.09,0-7.41-3.32-7.41-7.41s3.32-7.41,7.41-7.41h4.43c1.02,0,1.85-.83,1.85-1.85s-.83-1.85-1.85-1.85Z" style="fill:#949494;"/><path d="M212.05,78.93h-5.39c-1.02,0-1.85.83-1.85,1.85s.83,1.85,1.85,1.85h5.39c1.02,0,1.85-.83,1.85-1.85s-.83-1.85-1.85-1.85Z" style="fill:#949494;"/><path d="M126.43,91.89h-8.97c-1.02,0-1.84-.83-1.84-1.84s.82-1.84,1.84-1.84h8.97c1.54,0,2.8-1.25,2.8-2.8s-1.25-2.79-2.8-2.79h-4.34c-3.57,0-6.48-2.91-6.48-6.48s2.91-6.48,6.48-6.48h7.34c1.02,0,1.84.83,1.84,1.84s-.82,1.84-1.84,1.84h-7.34c-1.54,0-2.8,1.25-2.8,2.8s1.25,2.79,2.8,2.79h4.34c3.57,0,6.48,2.91,6.48,6.48s-2.91,6.48-6.48,6.48Z" style="fill:#949494;"/><path d="M187.05,86.96c-1.5.99-3.37,1.45-5.36,1.12-3.01-.51-5.44-2.9-6-5.89-.87-4.7,2.73-8.82,7.28-8.82,1.5,0,2.9.45,4.07,1.22.74.49,1.72.41,2.34-.22h0c.82-.82.71-2.19-.25-2.83-2.13-1.43-4.79-2.14-7.61-1.78-5.01.64-9.03,4.72-9.59,9.73-.76,6.7,4.49,12.41,11.04,12.41,2.25,0,4.34-.67,6.09-1.82.99-.65,1.16-2.04.32-2.88h0c-.63-.63-1.6-.71-2.34-.23Z" style="fill:#949494;"/><path d="M153.17,88.19h-5.35c-2.55,0-4.63-2.08-4.63-4.63v-12.04c0-1.02-.83-1.85-1.85-1.85s-1.85.83-1.85,1.85v12.04c0,4.6,3.74,8.34,8.34,8.34h5.35c1.02,0,1.85-.83,1.85-1.85s-.83-1.85-1.85-1.85Z" style="fill:#949494;"/><path d="M233.44,73.37h-1.85c-4.06,0-7.37,3.29-7.41,7.35v9.33c0,1.02-.83,1.85-1.85,1.85s-1.85-.83-1.85-1.85v-9.33c.04-6.1,5.01-11.05,11.11-11.05h1.85c1.02,0,1.85.83,1.85,1.85s-.83,1.85-1.85,1.85Z" style="fill:#949494;"/><path d="M130.5,35.69c5.68,0,10.31,4.62,10.31,10.31s-4.62,10.31-10.31,10.31-10.31-4.62-10.31-10.31,4.62-10.31,10.31-10.31M130.5,31.11c-8.22,0-14.89,6.67-14.89,14.89s6.67,14.89,14.89,14.89,14.89-6.67,14.89-14.89-6.67-14.89-14.89-14.89h0Z" style="fill:#009789;"/><path d="M233,31.11c-1.27,0-2.29,1.03-2.29,2.29v1.87c-2.68-2.57-6.3-4.16-10.31-4.16-8.22,0-14.89,6.67-14.89,14.89s6.67,14.89,14.89,14.89c4,0,7.63-1.59,10.31-4.16v1.87c0,1.27,1.03,2.29,2.29,2.29s2.29-1.03,2.29-2.29v-25.2c0-1.27-1.03-2.29-2.29-2.29ZM220.4,56.31c-5.68,0-10.31-4.62-10.31-10.31s4.62-10.31,10.31-10.31,10.31,4.62,10.31,10.31-4.62,10.31-10.31,10.31Z" style="fill:#009789;"/><path d="M169.15,31.11h-2.29c-8.22,0-14.89,6.67-14.89,14.89v12.6c0,1.27,1.03,2.29,2.29,2.29s2.29-1.03,2.29-2.29v-12.6c0-5.68,4.62-10.31,10.31-10.31h0s2.29,0,2.29,0c1.27,0,2.29-1.03,2.29-2.29s-1.03-2.29-2.29-2.29Z" style="fill:#009789;"/><path d="M196.61,54.5c-2,1.37-4.5,2.06-7.17,1.72-4.64-.59-8.37-4.38-8.9-9.03-.7-6.22,4.16-11.51,10.24-11.51,2.15,0,4.14.66,5.79,1.78.93.63,2.17.56,2.97-.24h0c1.03-1.03.84-2.72-.36-3.54-2.77-1.9-6.22-2.88-9.91-2.51-6.9.68-12.51,6.21-13.28,13.1-1.01,8.99,6.01,16.61,14.8,16.61,3.13,0,6.03-.96,8.42-2.61,1.19-.82,1.35-2.51.33-3.53h0c-.79-.79-2.01-.89-2.93-.26Z" style="fill:#009789;"/></svg>

Before

Width:  |  Height:  |  Size: 4.4 KiB

View File

@@ -1 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="560" height="125" viewBox="0 0 560 125"><rect id="b" x="20" y="123" width="520" height="2" style="fill:#009789;"/><g id="c"><rect id="d" x="20" y="21.22" width="80.56" height="80.56" rx="9.64" ry="9.64" style="fill:#949494;"/></g><g id="e"><path id="f" d="M37.42,84.6c4.49,4.48,10.66,7.26,17.48,7.29,13.8.06,25.1-11.3,25.04-25.18-.03-6.86-2.79-13.06-7.25-17.57l-35.27,35.46Z" style="fill:#292826;"/></g><g id="g"><path id="h" d="M72.69,49.14l-35.27,35.46s.05.05.08.07c12.36-6.3,29.28-17.38,40.88-26.61-1.25-3.38-3.21-6.42-5.69-8.93" style="fill:#009789;"/></g><g id="i"><path id="j" d="M65.8,31.11c-13.77,0-24.94,11.23-24.94,25.08,0,6.9,2.77,13.14,7.25,17.68l35.27-35.46c-4.51-4.5-10.72-7.29-17.58-7.29" style="fill:#292826;"/></g><g id="k"><path id="l" d="M65.8,31.11c-4.77,0-9.23,1.35-13.02,3.68-2.03-.53-4.55-.96-7.44-.94-5.04.03-9.14,1.4-11.93,2.67-.69.32-.58,1.34.16,1.5,1.83.39,4.25,1.2,6.64,2.97,1.51,1.11,2.66,2.35,3.52,3.5-1.83,3.49-2.87,7.47-2.87,11.69,0,2.52.37,4.95,1.06,7.25,1.05-2.34,2.16-3.9,2.52-4.39,2.29-3.15,4.71-4.79,8.29-7.2,2.64-1.78,6.3-3.87,16.82-8.2,0,0,3.29-.93,7.7-3.55,1.76-1.05,3.1-2.03,3.52-3.58.03-.11.06-.22.08-.32-4.18-3.19-9.4-5.08-15.05-5.08" style="fill:#262523;"/></g><g id="m"><path id="n" d="M69.96,39.54c.91,1.62-.92,4.4-4.09,6.21-3.17,1.81-6.49,1.97-7.4.36-.91-1.62.92-4.4,4.09-6.21,3.17-1.81,6.49-1.97,7.4-.36" style="fill:#949494;"/></g><path d="M163.44,69.66c-1.02,0-1.85.83-1.85,1.85v18.53c0,1.02.83,1.85,1.85,1.85s1.85-.83,1.85-1.85v-18.53c0-1.02-.83-1.85-1.85-1.85Z" style="fill:#949494;"/><path d="M212.05,69.66h-4.43c-6.13,0-11.12,4.99-11.12,11.12s4.99,11.12,11.12,11.12h4.43c1.02,0,1.85-.83,1.85-1.85s-.83-1.85-1.85-1.85h-4.43c-4.09,0-7.41-3.32-7.41-7.41s3.32-7.41,7.41-7.41h4.43c1.02,0,1.85-.83,1.85-1.85s-.83-1.85-1.85-1.85Z" style="fill:#949494;"/><path d="M212.05,78.93h-5.39c-1.02,0-1.85.83-1.85,1.85s.83,1.85,1.85,1.85h5.39c1.02,0,1.85-.83,1.85-1.85s-.83-1.85-1.85-1.85Z" style="fill:#949494;"/><path d="M126.43,91.89h-8.97c-1.02,0-1.84-.83-1.84-1.84s.82-1.84,1.84-1.84h8.97c1.54,0,2.8-1.25,2.8-2.8s-1.25-2.79-2.8-2.79h-4.34c-3.57,0-6.48-2.91-6.48-6.48s2.91-6.48,6.48-6.48h7.34c1.02,0,1.84.83,1.84,1.84s-.82,1.84-1.84,1.84h-7.34c-1.54,0-2.8,1.25-2.8,2.8s1.25,2.79,2.8,2.79h4.34c3.57,0,6.48,2.91,6.48,6.48s-2.91,6.48-6.48,6.48Z" style="fill:#949494;"/><path d="M187.05,86.96c-1.5.99-3.37,1.45-5.36,1.12-3.01-.51-5.44-2.9-6-5.89-.87-4.7,2.73-8.82,7.28-8.82,1.5,0,2.9.45,4.07,1.22.74.49,1.72.41,2.34-.22h0c.82-.82.71-2.19-.25-2.83-2.13-1.43-4.79-2.14-7.61-1.78-5.01.64-9.03,4.72-9.59,9.73-.76,6.7,4.49,12.41,11.04,12.41,2.25,0,4.34-.67,6.09-1.82.99-.65,1.16-2.04.32-2.88h0c-.63-.63-1.6-.71-2.34-.23Z" style="fill:#949494;"/><path d="M153.17,88.19h-5.35c-2.55,0-4.63-2.08-4.63-4.63v-12.04c0-1.02-.83-1.85-1.85-1.85s-1.85.83-1.85,1.85v12.04c0,4.6,3.74,8.34,8.34,8.34h5.35c1.02,0,1.85-.83,1.85-1.85s-.83-1.85-1.85-1.85Z" style="fill:#949494;"/><path d="M233.44,73.37h-1.85c-4.06,0-7.37,3.29-7.41,7.35v9.33c0,1.02-.83,1.85-1.85,1.85s-1.85-.83-1.85-1.85v-9.33c.04-6.1,5.01-11.05,11.11-11.05h1.85c1.02,0,1.85.83,1.85,1.85s-.83,1.85-1.85,1.85Z" style="fill:#949494;"/><path d="M130.5,35.69c5.68,0,10.31,4.62,10.31,10.31s-4.62,10.31-10.31,10.31-10.31-4.62-10.31-10.31,4.62-10.31,10.31-10.31M130.5,31.11c-8.22,0-14.89,6.67-14.89,14.89s6.67,14.89,14.89,14.89,14.89-6.67,14.89-14.89-6.67-14.89-14.89-14.89h0Z" style="fill:#009789;"/><path d="M233,31.11c-1.27,0-2.29,1.03-2.29,2.29v1.87c-2.68-2.57-6.3-4.16-10.31-4.16-8.22,0-14.89,6.67-14.89,14.89s6.67,14.89,14.89,14.89c4,0,7.63-1.59,10.31-4.16v1.87c0,1.27,1.03,2.29,2.29,2.29s2.29-1.03,2.29-2.29v-25.2c0-1.27-1.03-2.29-2.29-2.29ZM220.4,56.31c-5.68,0-10.31-4.62-10.31-10.31s4.62-10.31,10.31-10.31,10.31,4.62,10.31,10.31-4.62,10.31-10.31,10.31Z" style="fill:#009789;"/><path d="M169.15,31.11h-2.29c-8.22,0-14.89,6.67-14.89,14.89v12.6c0,1.27,1.03,2.29,2.29,2.29s2.29-1.03,2.29-2.29v-12.6c0-5.68,4.62-10.31,10.31-10.31h0s2.29,0,2.29,0c1.27,0,2.29-1.03,2.29-2.29s-1.03-2.29-2.29-2.29Z" style="fill:#009789;"/><path d="M196.61,54.5c-2,1.37-4.5,2.06-7.17,1.72-4.64-.59-8.37-4.38-8.9-9.03-.7-6.22,4.16-11.51,10.24-11.51,2.15,0,4.14.66,5.79,1.78.93.63,2.17.56,2.97-.24h0c1.03-1.03.84-2.72-.36-3.54-2.77-1.9-6.22-2.88-9.91-2.51-6.9.68-12.51,6.21-13.28,13.1-1.01,8.99,6.01,16.61,14.8,16.61,3.13,0,6.03-.96,8.42-2.61,1.19-.82,1.35-2.51.33-3.53h0c-.79-.79-2.01-.89-2.93-.26Z" style="fill:#009789;"/></svg>

Before

Width:  |  Height:  |  Size: 4.4 KiB

View File

@@ -1,137 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
id="svg2"
width="1024"
height="1024"
viewBox="0 0 1024 1024"
sodipodi:docname="OrcaSlicer_gradient.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="6.0058432"
y1="-2.0039091"
x2="1024"
y2="1024.9971"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0000697,0,0,1.0000572,-0.06245207,-0.06244275)" />
</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.35355339"
inkscape:cx="362.03867"
inkscape:cy="726.90577"
inkscape:window-width="1350"
inkscape:window-height="1237"
inkscape:window-x="412"
inkscape:window-y="78"
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.93372196,0.06231743)">
<rect
style="fill:url(#linearGradient621);fill-opacity:1;stroke-width:1.00007"
id="rect457"
width="1025.0686"
height="1026.0602"
x="0.93469638"
y="-0.062442806"
rx="2.0001395"
ry="2.0001287" />
</g>
<g
id="g8"
inkscape:groupmode="layer"
inkscape:label="OrcaS"
transform="matrix(1.3333333,0,0,-1.3333333,0,1056)">
<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>

Before

Width:  |  Height:  |  Size: 5.0 KiB

View File

@@ -1,282 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
id="svg2"
width="1024"
height="1024"
viewBox="0 0 1280 1280"
sodipodi:docname="OrcaSlicer_gradient_circle.svg"
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
inkscape:export-filename="OrcaSlicer_gradient1024.png"
inkscape:export-xdpi="96.000008"
inkscape:export-ydpi="96.000008"
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="linearGradient4731">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4727" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop4729" />
</linearGradient>
<linearGradient
id="linearGradient3247"
inkscape:swatch="solid">
<stop
style="stop-color:#9c1a1a;stop-opacity:1;"
offset="0"
id="stop3245" />
</linearGradient>
<linearGradient
id="linearGradient3241"
inkscape:swatch="solid">
<stop
style="stop-color:#f9f9f9;stop-opacity:0.69999999;"
offset="0"
id="stop3239" />
</linearGradient>
<clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath16">
<path
d="M 0,792 H 612 V 0 H 0 Z"
id="path14" />
</clipPath>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4731"
id="radialGradient4733"
cx="306.27165"
cy="387.85163"
fx="306.27165"
fy="387.85163"
r="299.72855"
gradientTransform="matrix(1,0,0,1.1982454,0,-76.889815)"
gradientUnits="userSpaceOnUse" />
<filter
style="color-interpolation-filters:sRGB;"
inkscape:label="Drop Shadow"
id="filter5943"
x="-0.24125646"
y="-0.1967501"
width="1.4825129"
height="1.3935002">
<feFlood
flood-opacity="0.498039"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood5933" />
<feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite5935" />
<feGaussianBlur
in="composite1"
stdDeviation="30.5296"
result="blur"
id="feGaussianBlur5937" />
<feOffset
dx="0"
dy="0"
result="offset"
id="feOffset5939" />
<feComposite
in="SourceGraphic"
in2="offset"
operator="over"
result="fbSourceGraphic"
id="feComposite5941" />
<feColorMatrix
result="fbSourceGraphicAlpha"
in="fbSourceGraphic"
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
id="feColorMatrix5945" />
<feFlood
id="feFlood5947"
flood-opacity="0.498039"
flood-color="rgb(0,0,0)"
result="flood"
in="fbSourceGraphic" />
<feComposite
in2="fbSourceGraphic"
id="feComposite5949"
in="flood"
operator="in"
result="composite1" />
<feGaussianBlur
id="feGaussianBlur5951"
in="composite1"
stdDeviation="30.5296"
result="blur" />
<feOffset
id="feOffset5953"
dx="0"
dy="0"
result="offset" />
<feComposite
in2="offset"
id="feComposite5955"
in="fbSourceGraphic"
operator="over"
result="composite2" />
</filter>
</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.5"
inkscape:cx="1105"
inkscape:cy="188"
inkscape:window-width="3440"
inkscape:window-height="1369"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<g
inkscape:groupmode="layer"
id="layer1"
inkscape:label="background"
transform="matrix(0.99895749,0,0,0.99799215,-0.93372196,0.06231743)"
style="display:inline;fill:none">
<ellipse
style="fill:#fafafa;fill-opacity:1;fill-rule:evenodd;stroke:#d7d4c3;stroke-width:1.65725;stroke-opacity:0.717514"
id="path713"
cx="641.53418"
cy="646.4707"
rx="624.27289"
ry="624.87671" />
</g>
<g
id="g8"
inkscape:groupmode="layer"
inkscape:label="OrcaS"
transform="matrix(1.3333333,0,0,-1.3333333,0,1056)"
style="display:inline">
<g
id="g10"
transform="translate(180.11526,-78.365764)"
style="filter:url(#filter5943)">
<g
id="g3273"
transform="translate(-7.9549494,-26.516507)"
style="display:inline;opacity:0.284974;mix-blend-mode:overlay;fill-opacity:1;fill:url(#radialGradient4733)">
<g
id="g3271"
clip-path="url(#clipPath16)"
style="fill-opacity:1;fill:url(#radialGradient4733)">
<g
id="g3253"
transform="translate(59.7287,115.3517)"
style="fill-opacity:1;fill:url(#radialGradient4733)">
<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:url(#radialGradient4733);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path3251" />
</g>
<g
id="g3257"
transform="translate(479.0017,536.9419)"
style="fill-opacity:1;fill:url(#radialGradient4733)">
<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:url(#radialGradient4733);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path3255" />
</g>
<g
id="g3261"
transform="translate(397.0372,747)"
style="fill-opacity:1;fill:url(#radialGradient4733)">
<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:url(#radialGradient4733);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path3259" />
</g>
<g
id="g3265"
transform="translate(397.0372,747)"
style="fill-opacity:1;fill:url(#radialGradient4733)">
<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:url(#radialGradient4733);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path3263" />
</g>
<g
id="g3269"
transform="translate(446.5563,646.8041)"
style="fill-opacity:1;fill:url(#radialGradient4733)">
<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:url(#radialGradient4733);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path3267" />
</g>
</g>
</g>
<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>

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -1,137 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
id="svg2"
width="814.987"
height="1023.9927"
viewBox="0 0 814.987 1023.9927"
sodipodi:docname="OrcaSlicer_gradient_narrow.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(0.79426373,0,0,0.99867604,1.5584055,1.358347)" />
</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.70710678"
inkscape:cx="570.63517"
inkscape:cy="562.857"
inkscape:window-width="3440"
inkscape:window-height="1369"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
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:0.890627"
id="rect457"
width="814.11804"
height="1024.6357"
x="2.3503804"
y="1.3583488"
rx="1.5885274"
ry="1.9973521" />
</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(1.2589521,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>

Before

Width:  |  Height:  |  Size: 5.0 KiB

View File

@@ -1,140 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
id="svg2"
width="1024"
height="1024"
viewBox="0 0 1024 1024"
sodipodi:docname="OrcaSlicer_gray.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:#434343;stop-opacity:1;"
offset="0"
id="stop615" />
<stop
style="stop-color:#616161;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="1.0009738"
y1="0.50097728"
x2="1024"
y2="1024.9971"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0000697,0,0,1.0000572,-0.06245207,-0.06244275)" />
</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.35355339"
inkscape:cx="695.79307"
inkscape:cy="981.46421"
inkscape:window-width="1350"
inkscape:window-height="1237"
inkscape:window-x="120"
inkscape:window-y="83"
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.93372196,0.06231743)">
<rect
style="fill:url(#linearGradient621);fill-opacity:1;stroke-width:1.00007"
id="rect457"
width="1025.0686"
height="1026.0602"
x="0.93469638"
y="-0.062442806"
rx="2.0001395"
ry="2.0001287"
inkscape:export-filename="..\..\..\a\OrcaSlicer\OrcaSlicer\resources\images\BambuStudio_192px_grayscale.png"
inkscape:export-xdpi="18"
inkscape:export-ydpi="18" />
</g>
<g
id="g8"
inkscape:groupmode="layer"
inkscape:label="OrcaS"
transform="matrix(1.3333333,0,0,-1.3333333,0,1056)">
<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>

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Some files were not shown because too many files have changed in this diff Show More