From c8a4a7db29ccae72c61d27c9bb006de20bb757de Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 5 Jan 2026 16:48:34 +0800 Subject: [PATCH 1/7] pack deps artifact to better support symbolic links --- .github/workflows/build_deps.yml | 9 ++++++++- .github/workflows/build_orca.yml | 14 +++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index c6288330a1..46340d1a97 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -95,12 +95,19 @@ jobs: run: | ./build_linux.sh -dr + - name: Pack dependencies + if: ${{ !cancelled() && ! env.ACT}} + working-directory: ${{ github.workspace }} + shell: bash + run: | + tar -cf deps_packet.tar -C ${{ env.DEPS_PATH }} . + - name: Upload OrcaSlicer_dep director(ies) for use later if: ${{ !cancelled() && ! env.ACT}} uses: actions/upload-artifact@v6 with: name: ${{ env.ARTIFACT_NAME }} - path: ${{ env.DEPS_PATH }} + path: deps_packet.tar retention-days: 10 # It's not too big, but we don't need it for a very long time. if-no-files-found: error diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index d70b4c9200..3f6c70e70a 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -34,7 +34,19 @@ jobs: uses: actions/download-artifact@v7 with: name: ${{ inputs.artifact-name }} - path: ${{ inputs.artifact-path }} + path: . + + - name: Unpack dependencies + shell: bash + run: | + if [ ! -f deps_packet.tar ]; then + echo "Error: deps_packet.tar not found" + ls -R + exit 1 + fi + mkdir -p ${{ inputs.artifact-path }} + tar -xf deps_packet.tar -C ${{ inputs.artifact-path }} + rm deps_packet.tar - uses: lukka/get-cmake@latest with: From cf9de8e444d66b3c0739e0402192062b17487e8e Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 5 Jan 2026 17:45:15 +0800 Subject: [PATCH 2/7] Revert "pack deps artifact to better support symbolic links" This reverts commit c8a4a7db29ccae72c61d27c9bb006de20bb757de. --- .github/workflows/build_deps.yml | 9 +-------- .github/workflows/build_orca.yml | 14 +------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 46340d1a97..c6288330a1 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -95,19 +95,12 @@ jobs: run: | ./build_linux.sh -dr - - name: Pack dependencies - if: ${{ !cancelled() && ! env.ACT}} - working-directory: ${{ github.workspace }} - shell: bash - run: | - tar -cf deps_packet.tar -C ${{ env.DEPS_PATH }} . - - name: Upload OrcaSlicer_dep director(ies) for use later if: ${{ !cancelled() && ! env.ACT}} uses: actions/upload-artifact@v6 with: name: ${{ env.ARTIFACT_NAME }} - path: deps_packet.tar + path: ${{ env.DEPS_PATH }} retention-days: 10 # It's not too big, but we don't need it for a very long time. if-no-files-found: error diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 3f6c70e70a..d70b4c9200 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -34,19 +34,7 @@ jobs: uses: actions/download-artifact@v7 with: name: ${{ inputs.artifact-name }} - path: . - - - name: Unpack dependencies - shell: bash - run: | - if [ ! -f deps_packet.tar ]; then - echo "Error: deps_packet.tar not found" - ls -R - exit 1 - fi - mkdir -p ${{ inputs.artifact-path }} - tar -xf deps_packet.tar -C ${{ inputs.artifact-path }} - rm deps_packet.tar + path: ${{ inputs.artifact-path }} - uses: lukka/get-cmake@latest with: From 189371206398837f138a8a562489522fffcdb78e Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 5 Jan 2026 17:49:52 +0800 Subject: [PATCH 3/7] Revert "Fix missing force-build, use non-docker publish action, be nice to cache (#11688)" This reverts commit 8989e2102d403111aebcd51d69c54261cbba2fee. --- .github/workflows/build_all.yml | 9 +-- .github/workflows/build_check_cache.yml | 62 ++++++++++++++++ .github/workflows/build_deps.yml | 97 ++++++++++++++----------- .github/workflows/build_orca.yml | 31 ++++---- build_linux.sh | 2 +- 5 files changed, 139 insertions(+), 62 deletions(-) create mode 100644 .github/workflows/build_check_cache.yml diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 0cae85189b..41d489d4d8 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -48,17 +48,16 @@ concurrency: jobs: - build_linux: # Separate so unit tests can wait on just Linux builds to complete. + build_linux: name: Build Linux strategy: fail-fast: false # Don't run scheduled builds on forks: if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }} - uses: ./.github/workflows/build_deps.yml + uses: ./.github/workflows/build_check_cache.yml with: os: ubuntu-24.04 build-deps-only: ${{ inputs.build-deps-only || false }} - force-build: ${{ github.event_name == 'schedule' }} secrets: inherit build_all: name: Build Non-Linux @@ -71,7 +70,7 @@ jobs: arch: arm64 # Don't run scheduled builds on forks: if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }} - uses: ./.github/workflows/build_deps.yml + uses: ./.github/workflows/build_check_cache.yml with: os: ${{ matrix.os }} arch: ${{ matrix.arch }} @@ -113,7 +112,7 @@ jobs: path: build/tests/**/*.log - name: Publish Test Results if: always() - uses: EnricoMi/publish-unit-test-result-action/linux@v2 + uses: EnricoMi/publish-unit-test-result-action@v2 with: files: "ctest_results.xml" flatpak: diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml new file mode 100644 index 0000000000..00b5f71ecd --- /dev/null +++ b/.github/workflows/build_check_cache.yml @@ -0,0 +1,62 @@ +name: Check Cache + +on: + workflow_call: + inputs: + os: + required: true + type: string + arch: + required: false + type: string + build-deps-only: + required: false + type: boolean + force-build: + required: false + type: boolean + +jobs: + check_cache: # determines if there is a cache and outputs variables used in caching process + name: Check Cache + runs-on: ${{ inputs.os }} + outputs: + cache-key: ${{ steps.set_outputs.outputs.cache-key }} + cache-path: ${{ steps.set_outputs.outputs.cache-path }} + valid-cache: ${{ steps.cache_deps.outputs.cache-hit }} + steps: + - name: Checkout + uses: actions/checkout@v6 + with: + lfs: 'true' + + - name: set outputs + id: set_outputs + env: + dep-folder-name: ${{ inputs.os != 'macos-14' && '/OrcaSlicer_dep' || '' }} + output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} + run: | + echo cache-key=${{ inputs.os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} + echo cache-path=${{ github.workspace }}/deps/build${{ env.dep-folder-name }} >> ${{ env.output-cmd }} + + - name: load cache + id: cache_deps + uses: actions/cache@v4 + with: + path: ${{ steps.set_outputs.outputs.cache-path }} + key: ${{ steps.set_outputs.outputs.cache-key }} + lookup-only: true + + build_deps: # call next step + name: Build Deps + needs: [check_cache] + uses: ./.github/workflows/build_deps.yml + with: + cache-key: ${{ needs.check_cache.outputs.cache-key }} + cache-path: ${{ needs.check_cache.outputs.cache-path }} + valid-cache: ${{ needs.check_cache.outputs.valid-cache == 'true' }} + os: ${{ inputs.os }} + arch: ${{ inputs.arch }} + build-deps-only: ${{ inputs.build-deps-only }} + force-build: ${{ inputs.force-build }} + secrets: inherit diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index c6288330a1..b255b6abf7 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -1,6 +1,15 @@ on: workflow_call: inputs: + cache-key: + required: true + type: string + cache-path: + required: true + type: string + valid-cache: + required: true + type: boolean os: required: true type: string @@ -17,62 +26,55 @@ on: jobs: build_deps: name: Build Deps + if: ${{ !cancelled() && (inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true) }} runs-on: ${{ inputs.os }} - outputs: - artifact-name: ${{ env.ARTIFACT_NAME }} - artifact-path: ${{ env.DEPS_PATH }} env: - DO_BUILD: ${{ inputs.build-deps-only || inputs.force-build }} - DEPS_PATH: ${{ github.workspace }}/deps/build${{ inputs.os != 'macos-14' && '/OrcaSlicer_dep' || '' }} - ARTIFACT_NAME: OrcaSlicer_dep_${{ inputs.os }}_${{ inputs.arch }} + date: steps: + + # Setup the environment - name: Checkout uses: actions/checkout@v6 with: lfs: 'true' - # Cached deps are just the final outputs, no intermediate files. - # So building XOR cache loading. - # We use `lookup-only` to skip pulling cache. - name: load cached deps - uses: actions/cache/restore@v5 - id: cache-load + uses: actions/cache@v4 with: - path: ${{ env.DEPS_PATH }} - key: ${{ inputs.os }}-${{ inputs.arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} - lookup-only: ${{ env.DO_BUILD == 'true' }} # Doing this instead of `if` preserves the outputs of this step + path: ${{ inputs.cache-path }} + key: ${{ inputs.cache-key }} - uses: lukka/get-cmake@latest - if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') }} with: cmakeVersion: "~3.28.0" # use most recent 3.28.x version - name: setup dev on Windows - if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }} + if: inputs.os == 'windows-latest' uses: microsoft/setup-msbuild@v2 - name: Get the date on Ubuntu and macOS - if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os != 'windows-latest' }} + if: inputs.os != 'windows-latest' run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV shell: bash - name: Get the date on Windows - if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }} + if: inputs.os == 'windows-latest' run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8 shell: pwsh + + # Build Dependencies - name: Build on Windows - if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }} + if: inputs.os == 'windows-latest' working-directory: ${{ github.workspace }} run: | choco install strawberryperl .\build_release_vs.bat deps + .\build_release_vs.bat pack + cd ${{ github.workspace }}/deps/build - # Windows and Linux don't need to delete any directories, because they only package up deps/build/OrcaSlicer_dep. - # But Mac has multiple and we're preserving their directory structure relationship. - # So the garbage siblings of OrcaSlicer_dep can be deleted to save artifact and cache space. - name: Build on Mac ${{ inputs.arch }} - if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'macos-14' }} + if: inputs.os == 'macos-14' working-directory: ${{ github.workspace }} run: | brew install automake texinfo libtool @@ -85,40 +87,53 @@ jobs: done brew install zstd + - name: Apt-Install Dependencies - if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'ubuntu-24.04' }} + if: inputs.os == 'ubuntu-24.04' uses: ./.github/actions/apt-install-deps - name: Build on Ubuntu - if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }} + if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' working-directory: ${{ github.workspace }} run: | + mkdir -p ${{ github.workspace }}/deps/build/destdir ./build_linux.sh -dr + cd deps/build + tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir - - name: Upload OrcaSlicer_dep director(ies) for use later - if: ${{ !cancelled() && ! env.ACT}} - uses: actions/upload-artifact@v6 - with: - name: ${{ env.ARTIFACT_NAME }} - path: ${{ env.DEPS_PATH }} - retention-days: 10 # It's not too big, but we don't need it for a very long time. - if-no-files-found: error - - name: Save cache from main branch - if: ${{ !cancelled() && github.ref == 'refs/heads/main' && steps.cache-load.outputs.cache-hit != 'true' }} - uses: actions/cache/save@v5 + # Upload Artifacts + # - name: Upload Mac ${{ inputs.arch }} artifacts + # if: inputs.os == 'macos-14' + # uses: actions/upload-artifact@v5 + # with: + # name: OrcaSlicer_dep_mac_${{ env.date }} + # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz + + - name: Upload Windows artifacts + if: inputs.os == 'windows-latest' + uses: actions/upload-artifact@v5 with: - path: ${{ env.DEPS_PATH }} - key: ${{ steps.cache-load.outputs.cache-primary-key }} + name: OrcaSlicer_dep_win64_${{ env.date }} + path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip + + - name: Upload Ubuntu artifacts + if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} + env: + ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} + uses: actions/upload-artifact@v5 + with: + name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }} + path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz build_orca: name: Build OrcaSlicer needs: [build_deps] - if: ${{ !cancelled() && (!inputs.build-deps-only || inputs.force-build) }} + 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 with: - artifact-name: ${{ needs.build_deps.outputs.artifact-name }} - artifact-path: ${{ needs.build_deps.outputs.artifact-path }} + cache-key: ${{ inputs.cache-key }} + cache-path: ${{ inputs.cache-path }} os: ${{ inputs.os }} arch: ${{ inputs.arch }} secrets: inherit diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index d70b4c9200..aef491f006 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -1,10 +1,10 @@ on: workflow_call: inputs: - artifact-name: + cache-key: required: true type: string - artifact-path: + cache-path: required: true type: string os: @@ -30,11 +30,12 @@ jobs: with: lfs: 'true' - - name: Download deps artifacts - uses: actions/download-artifact@v7 + - name: load cached deps + uses: actions/cache@v4 with: - name: ${{ inputs.artifact-name }} - path: ${{ inputs.artifact-path }} + path: ${{ inputs.cache-path }} + key: ${{ inputs.cache-key }} + fail-on-cache-miss: true - uses: lukka/get-cmake@latest with: @@ -180,14 +181,14 @@ jobs: - name: Upload artifacts mac if: inputs.os == 'macos-14' - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: OrcaSlicer_Mac_universal_${{ env.ver }} path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg - name: Upload OrcaSlicer_profile_validator DMG mac if: inputs.os == 'macos-14' - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }} path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg @@ -254,28 +255,28 @@ jobs: - name: Upload artifacts Win zip if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: OrcaSlicer_Windows_${{ env.ver }}_portable path: ${{ github.workspace }}/build/OrcaSlicer - name: Upload artifacts Win installer if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: OrcaSlicer_Windows_${{ env.ver }} path: ${{ github.workspace }}/build/OrcaSlicer*.exe - name: Upload artifacts Win PDB if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: PDB path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z - name: Upload OrcaSlicer_profile_validator Win if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: OrcaSlicer_profile_validator_Windows_${{ env.ver }} path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe @@ -335,7 +336,7 @@ jobs: # and doesn't preserve file permissions - name: Upload Test Artifact if: inputs.os == 'ubuntu-24.04' - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: ${{ github.sha }}-tests overwrite: true @@ -357,7 +358,7 @@ jobs: env: ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage' @@ -366,7 +367,7 @@ jobs: if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} env: ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v5 with: name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} path: './build/src/Release/OrcaSlicer_profile_validator' diff --git a/build_linux.sh b/build_linux.sh index 3159557146..9a9a9160ba 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -21,7 +21,7 @@ function usage() { echo " -p: boost ccache hit rate by disabling precompiled headers (default: ON)" echo " -r: skip RAM and disk checks (low RAM compiling)" echo " -s: build the Orca Slicer (optional)" - echo " -t: build tests (optional)" + echo " -t: build tests (optional), requires -s flag" echo " -u: install system dependencies (asks for sudo password; build prerequisite)" echo " -l: use Clang instead of GCC (default: GCC)" echo " -L: use ld.lld as linker (if available)" From 57f9112b7c5bef711b4fea82dd2e9791761e5039 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 5 Jan 2026 17:54:59 +0800 Subject: [PATCH 4/7] Update GitHub Actions workflows to use actions/cache@v5 and actions/upload-artifact@v6 --- .github/workflows/build_check_cache.yml | 2 +- .github/workflows/build_deps.yml | 8 ++++---- .github/workflows/build_orca.yml | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index 00b5f71ecd..fee5a6e955 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -41,7 +41,7 @@ jobs: - name: load cache id: cache_deps - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ steps.set_outputs.outputs.cache-path }} key: ${{ steps.set_outputs.outputs.cache-key }} diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index b255b6abf7..6cec66f24b 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -39,7 +39,7 @@ jobs: lfs: 'true' - name: load cached deps - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ inputs.cache-path }} key: ${{ inputs.cache-key }} @@ -105,14 +105,14 @@ jobs: # Upload Artifacts # - name: Upload Mac ${{ inputs.arch }} artifacts # if: inputs.os == 'macos-14' - # uses: actions/upload-artifact@v5 + # uses: actions/upload-artifact@v6 # with: # name: OrcaSlicer_dep_mac_${{ env.date }} # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz - name: Upload Windows artifacts if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_dep_win64_${{ env.date }} path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip @@ -121,7 +121,7 @@ jobs: if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} env: ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }} path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index aef491f006..131766e49e 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -31,7 +31,7 @@ jobs: lfs: 'true' - name: load cached deps - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ inputs.cache-path }} key: ${{ inputs.cache-key }} @@ -181,14 +181,14 @@ jobs: - name: Upload artifacts mac if: inputs.os == 'macos-14' - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Mac_universal_${{ env.ver }} path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg - name: Upload OrcaSlicer_profile_validator DMG mac if: inputs.os == 'macos-14' - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }} path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg @@ -255,28 +255,28 @@ jobs: - name: Upload artifacts Win zip if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Windows_${{ env.ver }}_portable path: ${{ github.workspace }}/build/OrcaSlicer - name: Upload artifacts Win installer if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Windows_${{ env.ver }} path: ${{ github.workspace }}/build/OrcaSlicer*.exe - name: Upload artifacts Win PDB if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: PDB path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z - name: Upload OrcaSlicer_profile_validator Win if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_profile_validator_Windows_${{ env.ver }} path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe @@ -336,7 +336,7 @@ jobs: # and doesn't preserve file permissions - name: Upload Test Artifact if: inputs.os == 'ubuntu-24.04' - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: ${{ github.sha }}-tests overwrite: true @@ -358,7 +358,7 @@ jobs: env: ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage' @@ -367,7 +367,7 @@ jobs: if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} env: ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }} path: './build/src/Release/OrcaSlicer_profile_validator' From 8670bb65f2bdb772b2b957ca05876a3ca5531fd0 Mon Sep 17 00:00:00 2001 From: Pepe-Polymaker Date: Mon, 5 Jan 2026 18:12:56 +0800 Subject: [PATCH 5/7] Refactor Polymaker folder within Snapmaker profile directory and add more profiles (#11613) # Description * What issue does this PR address or fix? 1. Refactor Polymaker folder within Snapmaker profile directory, so that the structure is more clear. 2. Add more Polymaker filament presets for Snapmaker printers. * What new features or enhancements does this PR introduce? 1. None * Are there any breaking changes or dependencies that need to be considered? 1. None --- resources/profiles/BBL.json | 168 +++++++------- ...nchroma PLA Satin @BBL A1 0.2 nozzle.json} | 7 +- ....json => Panchroma PLA Satin @BBL A1.json} | 7 +- ...chroma PLA Satin @BBL A1M 0.2 nozzle.json} | 7 +- ...json => Panchroma PLA Satin @BBL A1M.json} | 7 +- ...chroma PLA Satin @BBL P1P 0.2 nozzle.json} | 7 +- ...json => Panchroma PLA Satin @BBL P1P.json} | 7 +- ...nchroma PLA Satin @BBL X1 0.2 nozzle.json} | 7 +- ....json => Panchroma PLA Satin @BBL X1.json} | 7 +- ...chroma PLA Satin @BBL X1C 0.2 nozzle.json} | 7 +- ...json => Panchroma PLA Satin @BBL X1C.json} | 7 +- ...se.json => Panchroma PLA Satin @base.json} | 5 +- resources/profiles/OrcaFilamentLibrary.json | 175 +++++++------- ....json => Panchroma PLA Satin @System.json} | 7 +- ...se.json => Panchroma PLA Satin @base.json} | 5 +- resources/profiles/Snapmaker.json | 218 ++++++++++++++++-- .../PolyLite Dual PLA @0.2 nozzle.json | 19 -- .../filament/PolyLite J1 PLA @0.2 nozzle.json | 11 - .../Snapmaker/filament/PolyLite J1 PLA.json | 13 -- .../filament/PolyLite PLA @0.2 nozzle.json | 21 -- .../filament/PolyLite PLA @U1 base.json | 20 -- .../Snapmaker/filament/PolyLite PLA @U1.json | 11 - .../filament/PolyLite PLA @base.json | 20 -- .../PolyTerra Dual PLA @0.2 nozzle.json | 19 -- .../PolyTerra J1 PLA @0.2 nozzle.json | 11 - .../Snapmaker/filament/PolyTerra J1 PLA.json | 13 -- .../filament/PolyTerra PLA @0.2 nozzle.json | 21 -- .../filament/PolyTerra PLA @U1 base.json | 20 -- .../Snapmaker/filament/PolyTerra PLA @U1.json | 11 - .../Polymaker/Panchroma CoPE @U1 base.json | 41 ++++ .../Polymaker/Panchroma CoPE @U1.json | 26 +++ .../Polymaker/Panchroma PLA @U1 base.json | 44 ++++ .../filament/Polymaker/Panchroma PLA @U1.json | 26 +++ .../Panchroma PLA Celestial @U1 base.json | 41 ++++ .../Panchroma PLA Celestial @U1.json | 26 +++ .../Panchroma PLA Galaxy @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA Galaxy @U1.json | 26 +++ .../Panchroma PLA Glow @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA Glow @U1.json | 26 +++ .../Panchroma PLA Luminous @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA Luminous @U1.json | 26 +++ .../Panchroma PLA Marble @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA Marble @U1.json | 23 ++ .../Panchroma PLA Matte @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA Matte @U1.json | 23 ++ .../Panchroma PLA Metallic @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA Metallic @U1.json | 26 +++ .../Panchroma PLA Neon @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA Neon @U1.json | 26 +++ .../Panchroma PLA Satin @U1 base.json | 42 ++++ .../Polymaker/Panchroma PLA Satin @U1.json | 27 +++ .../Panchroma PLA Silk @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA Silk @U1.json | 26 +++ .../Panchroma PLA Starlight @U1 base.json | 41 ++++ .../Panchroma PLA Starlight @U1.json | 26 +++ .../Panchroma PLA Temp Shift @U1 base.json | 41 ++++ .../Panchroma PLA Temp Shift @U1.json | 26 +++ .../Panchroma PLA Translucent @U1 base.json | 41 ++++ .../Panchroma PLA Translucent @U1.json | 26 +++ .../Panchroma PLA UV Shift @U1 base.json | 41 ++++ .../Polymaker/Panchroma PLA UV Shift @U1.json | 26 +++ .../PolyLite Dual PLA @0.2 nozzle.json | 19 ++ .../PolyLite J1 PLA @0.2 nozzle.json | 11 + .../filament/Polymaker/PolyLite J1 PLA.json | 13 ++ .../Polymaker/PolyLite PETG @Base.json | 29 +++ .../PolyLite PETG @Snapmaker U1.json | 117 ++++++++++ .../Polymaker/PolyLite PLA @0.2 nozzle.json | 21 ++ .../Polymaker/PolyLite PLA @U1 base.json | 20 ++ .../filament/Polymaker/PolyLite PLA @U1.json | 11 + .../Polymaker/PolyLite PLA @base.json | 20 ++ .../Polymaker/PolyLite PLA Pro @U1 base.json | 41 ++++ .../Polymaker/PolyLite PLA Pro @U1.json | 26 +++ .../PolyTerra Dual PLA @0.2 nozzle.json | 19 ++ .../PolyTerra J1 PLA @0.2 nozzle.json | 11 + .../filament/Polymaker/PolyTerra J1 PLA.json | 13 ++ .../Polymaker/PolyTerra PLA @0.2 nozzle.json | 21 ++ .../Polymaker/PolyTerra PLA @U1 base.json | 20 ++ .../filament/Polymaker/PolyTerra PLA @U1.json | 11 + .../Polymaker/Polymaker HT-PLA @Base.json | 29 +++ .../Polymaker HT-PLA @Snapmaker U1.json | 96 ++++++++ .../Polymaker/Polymaker HT-PLA @U1 base.json | 53 +++++ .../Polymaker/Polymaker HT-PLA @U1.json | 26 +++ .../Polymaker/Polymaker HT-PLA-GF @Base.json | 29 +++ .../Polymaker HT-PLA-GF @Snapmaker U1.json | 96 ++++++++ .../Polymaker HT-PLA-GF @U1 base.json | 53 +++++ .../Polymaker/Polymaker HT-PLA-GF @U1.json | 26 +++ .../Polymaker/Polymaker PETG @Base.json | 29 +++ .../Polymaker PETG @Snapmaker U1.json | 111 +++++++++ .../Polymaker/Polymaker PLA Pro @Base.json | 29 +++ .../Polymaker PLA Pro @Snapmaker U1.json | 96 ++++++++ 90 files changed, 2594 insertions(+), 431 deletions(-) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL A1 0.2 nozzle.json => Panchroma PLA Satin @BBL A1 0.2 nozzle.json} (74%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL A1.json => Panchroma PLA Satin @BBL A1.json} (79%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL A1M 0.2 nozzle.json => Panchroma PLA Satin @BBL A1M 0.2 nozzle.json} (74%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL A1M.json => Panchroma PLA Satin @BBL A1M.json} (79%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL P1P 0.2 nozzle.json => Panchroma PLA Satin @BBL P1P 0.2 nozzle.json} (74%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL P1P.json => Panchroma PLA Satin @BBL P1P.json} (79%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL X1 0.2 nozzle.json => Panchroma PLA Satin @BBL X1 0.2 nozzle.json} (74%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL X1.json => Panchroma PLA Satin @BBL X1.json} (79%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL X1C 0.2 nozzle.json => Panchroma PLA Satin @BBL X1C 0.2 nozzle.json} (77%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @BBL X1C.json => Panchroma PLA Satin @BBL X1C.json} (84%) rename resources/profiles/BBL/filament/Polymaker/{Panchroma PLA Stain @base.json => Panchroma PLA Satin @base.json} (88%) rename resources/profiles/OrcaFilamentLibrary/filament/Polymaker/{Panchroma PLA Stain @System.json => Panchroma PLA Satin @System.json} (60%) rename resources/profiles/OrcaFilamentLibrary/filament/Polymaker/{Panchroma PLA Stain @base.json => Panchroma PLA Satin @base.json} (87%) delete mode 100644 resources/profiles/Snapmaker/filament/PolyLite Dual PLA @0.2 nozzle.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyLite J1 PLA @0.2 nozzle.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyLite J1 PLA.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyLite PLA @0.2 nozzle.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyLite PLA @U1 base.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyLite PLA @U1.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyLite PLA @base.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyTerra Dual PLA @0.2 nozzle.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyTerra J1 PLA @0.2 nozzle.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyTerra J1 PLA.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyTerra PLA @0.2 nozzle.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyTerra PLA @U1 base.json delete mode 100644 resources/profiles/Snapmaker/filament/PolyTerra PLA @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite Dual PLA @0.2 nozzle.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA @0.2 nozzle.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @0.2 nozzle.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyTerra Dual PLA @0.2 nozzle.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA @0.2 nozzle.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @0.2 nozzle.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @U1 base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Base.json create mode 100644 resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 9425300cb4..fdc096c888 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -1405,6 +1405,10 @@ "name": "Generic PLA-CF @base", "sub_path": "filament/Generic PLA-CF @base.json" }, + { + "name": "Numakers PLA+ @base", + "sub_path": "filament/Numakers/Numakers PLA+ @base.json" + }, { "name": "Overture Matte PLA @base", "sub_path": "filament/Overture/Overture Matte PLA @base.json" @@ -1458,12 +1462,12 @@ "sub_path": "filament/Polymaker/Panchroma PLA Neon @base.json" }, { - "name": "Panchroma PLA Silk @base", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" + "name": "Panchroma PLA Satin @base", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @base.json" }, { - "name": "Panchroma PLA Stain @base", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @base.json" + "name": "Panchroma PLA Silk @base", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" }, { "name": "Panchroma PLA Starlight @base", @@ -5101,6 +5105,42 @@ "name": "Generic PLA-CF @BBL P2S", "sub_path": "filament/Generic PLA-CF @BBL P2S.json" }, + { + "name": "Numakers PLA+ @BBL A1", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1.json" + }, + { + "name": "Numakers PLA+ @BBL A1 0.2 nozzle", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1 0.2 nozzle.json" + }, + { + "name": "Numakers PLA+ @BBL A1M", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1M.json" + }, + { + "name": "Numakers PLA+ @BBL A1M 0.2 nozzle", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Numakers PLA+ @BBL P1P", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL P1P.json" + }, + { + "name": "Numakers PLA+ @BBL P1P 0.2 nozzle", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Numakers PLA+ @BBL X1", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1.json" + }, + { + "name": "Numakers PLA+ @BBL X1C", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1C.json" + }, + { + "name": "Numakers PLA+ @BBL X1C 0.2 nozzle", + "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1C 0.2 nozzle.json" + }, { "name": "Overture Matte PLA @BBL A1", "sub_path": "filament/Overture/Overture Matte PLA @BBL A1.json" @@ -5641,6 +5681,46 @@ "name": "Panchroma PLA Neon @BBL X1C 0.2 nozzle", "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json" }, + { + "name": "Panchroma PLA Satin @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL A1.json" + }, + { + "name": "Panchroma PLA Satin @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL A1M.json" + }, + { + "name": "Panchroma PLA Satin @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL P1P.json" + }, + { + "name": "Panchroma PLA Satin @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL X1.json" + }, + { + "name": "Panchroma PLA Satin @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL X1C.json" + }, + { + "name": "Panchroma PLA Satin @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json" + }, { "name": "Panchroma PLA Silk @BBL A1", "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1.json" @@ -5677,46 +5757,6 @@ "name": "Panchroma PLA Silk @BBL X1C", "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C.json" }, - { - "name": "Panchroma PLA Stain @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1.json" - }, - { - "name": "Panchroma PLA Stain @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1M.json" - }, - { - "name": "Panchroma PLA Stain @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL P1P.json" - }, - { - "name": "Panchroma PLA Stain @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1.json" - }, - { - "name": "Panchroma PLA Stain @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1C.json" - }, - { - "name": "Panchroma PLA Stain @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1C 0.2 nozzle.json" - }, { "name": "Panchroma PLA Starlight @BBL A1", "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1.json" @@ -7661,46 +7701,6 @@ "name": "Overture TPU @BBL X1C 0.2 nozzle", "sub_path": "filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json" }, - { - "name": "Numakers PLA+ @base", - "sub_path": "filament/Numakers/Numakers PLA+ @base.json" - }, - { - "name": "Numakers PLA+ @BBL A1", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1.json" - }, - { - "name": "Numakers PLA+ @BBL A1 0.2 nozzle", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1 0.2 nozzle.json" - }, - { - "name": "Numakers PLA+ @BBL A1M", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1M.json" - }, - { - "name": "Numakers PLA+ @BBL A1M 0.2 nozzle", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Numakers PLA+ @BBL P1P", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL P1P.json" - }, - { - "name": "Numakers PLA+ @BBL P1P 0.2 nozzle", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Numakers PLA+ @BBL X1", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1.json" - }, - { - "name": "Numakers PLA+ @BBL X1C", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1C.json" - }, - { - "name": "Numakers PLA+ @BBL X1C 0.2 nozzle", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1C 0.2 nozzle.json" - }, { "name": "fdm_filament_dual_common", "sub_path": "filament/fdm_filament_dual_common.json" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1 0.2 nozzle.json similarity index 74% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1 0.2 nozzle.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1 0.2 nozzle.json index 1db86a72e8..886b3217cc 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1 0.2 nozzle.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1 0.2 nozzle.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL A1 0.2 nozzle", + "renamed_from": "Panchroma PLA Stain @BBL A1 0.2 nozzle", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_01", "instantiation": "true", @@ -26,4 +27,4 @@ "slow_down_layer_time": [ "5" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1.json similarity index 79% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1.json index 6f573a8f19..93520a1eda 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL A1", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL A1", + "renamed_from": "Panchroma PLA Stain @BBL A1", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_00", "instantiation": "true", @@ -28,4 +29,4 @@ "slow_down_layer_time": [ "5" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json similarity index 74% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1M 0.2 nozzle.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json index 7510aa9ebf..b6689b1ee8 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL A1M 0.2 nozzle", + "renamed_from": "Panchroma PLA Stain @BBL A1M 0.2 nozzle", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_03", "instantiation": "true", @@ -26,4 +27,4 @@ "slow_down_layer_time": [ "5" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1M.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M.json similarity index 79% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1M.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M.json index 620a76ffe4..800a4bb8bc 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL A1M.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL A1M", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL A1M", + "renamed_from": "Panchroma PLA Stain @BBL A1M", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_02", "instantiation": "true", @@ -28,4 +29,4 @@ "slow_down_layer_time": [ "5" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json similarity index 74% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL P1P 0.2 nozzle.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json index 00cf4852a1..e6b2d27440 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL P1P 0.2 nozzle", + "renamed_from": "Panchroma PLA Stain @BBL P1P 0.2 nozzle", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_05", "instantiation": "true", @@ -26,4 +27,4 @@ "slow_down_layer_time": [ "15" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL P1P.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P.json similarity index 79% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL P1P.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P.json index 88678c3159..7e9c805c63 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL P1P.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL P1P", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL P1P", + "renamed_from": "Panchroma PLA Stain @BBL P1P", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_04", "instantiation": "true", @@ -28,4 +29,4 @@ "slow_down_layer_time": [ "15" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1 0.2 nozzle.json similarity index 74% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1 0.2 nozzle.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1 0.2 nozzle.json index 435a9c991a..3a07dcb602 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1 0.2 nozzle.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1 0.2 nozzle.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL X1 0.2 nozzle", + "renamed_from": "Panchroma PLA Stain @BBL X1 0.2 nozzle", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_07", "instantiation": "true", @@ -26,4 +27,4 @@ "slow_down_layer_time": [ "15" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1.json similarity index 79% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1.json index e5d9bfdf3a..be4651c5f4 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL X1", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL X1", + "renamed_from": "Panchroma PLA Stain @BBL X1", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_06", "instantiation": "true", @@ -28,4 +29,4 @@ "slow_down_layer_time": [ "15" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json similarity index 77% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1C 0.2 nozzle.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json index d4f02ff39a..0254f8e61e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL X1C 0.2 nozzle", + "renamed_from": "Panchroma PLA Stain @BBL X1C 0.2 nozzle", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_09", "instantiation": "true", @@ -28,4 +29,4 @@ "slow_down_layer_time": [ "15" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1C.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1C.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C.json index 1d50deee52..0449da66b0 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @BBL X1C.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @BBL X1C", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @BBL X1C", + "renamed_from": "Panchroma PLA Stain @BBL X1C", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "GFSPM005_08", "instantiation": "true", @@ -34,4 +35,4 @@ "slow_down_layer_time": [ "15" ] -} \ No newline at end of file +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @base.json rename to resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json index b2cb2b8cf3..26d3344d4b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Stain @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json @@ -1,6 +1,7 @@ { "type": "filament", - "name": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @base", + "renamed_from": "Panchroma PLA Stain @base", "inherits": "fdm_filament_pla", "from": "system", "filament_id": "GFPM005", @@ -38,4 +39,4 @@ "temperature_vitrification": [ "59" ] -} \ No newline at end of file +} diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index 1f4b2cf779..8e6ac439b1 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -108,6 +108,10 @@ "name": "COEX ABS PRIME @base", "sub_path": "filament/COEX/COEX ABS PRIME @base.json" }, + { + "name": "Eolas Prints ABS @System", + "sub_path": "filament/Eolas Prints/Eolas Prints ABS @System.json" + }, { "name": "FDplast ABS @base", "sub_path": "filament/FDplast/FDplast ABS @base.json" @@ -144,6 +148,10 @@ "name": "COEX ASA PRIME @base", "sub_path": "filament/COEX/COEX ASA PRIME @base.json" }, + { + "name": "Eolas Prints ASA @System", + "sub_path": "filament/Eolas Prints/Eolas Prints ASA @System.json" + }, { "name": "Generic ASA @System", "sub_path": "filament/Generic ASA @System.json" @@ -288,6 +296,18 @@ "name": "COEX PETG @base", "sub_path": "filament/COEX/COEX PETG @base.json" }, + { + "name": "Eolas Prints PETG @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PETG @System.json" + }, + { + "name": "Eolas Prints PETG Transition @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PETG Transition @System.json" + }, + { + "name": "Eolas Prints PETG UV Resistant @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json" + }, { "name": "FDplast PETG @base", "sub_path": "filament/FDplast/FDplast PETG @base.json" @@ -420,6 +440,42 @@ "name": "COEX PLA PRIME @base", "sub_path": "filament/COEX/COEX PLA PRIME @base.json" }, + { + "name": "Eolas Prints PLA Antibacterial @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json" + }, + { + "name": "Eolas Prints PLA High Speed @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA High Speed @System.json" + }, + { + "name": "Eolas Prints PLA INGEO 850 @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json" + }, + { + "name": "Eolas Prints PLA INGEO 870 @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json" + }, + { + "name": "Eolas Prints PLA Matte @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Matte @System.json" + }, + { + "name": "Eolas Prints PLA Neon @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Neon @System.json" + }, + { + "name": "Eolas Prints PLA Premium @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Premium @System.json" + }, + { + "name": "Eolas Prints PLA Silk @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Silk @System.json" + }, + { + "name": "Eolas Prints PLA Transition @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Transition @System.json" + }, { "name": "FDplast PLA @base", "sub_path": "filament/FDplast/FDplast PLA @base.json" @@ -444,6 +500,10 @@ "name": "NIT PLA @base", "sub_path": "filament/NIT/NIT PLA @base.json" }, + { + "name": "Numakers PLA+ @base", + "sub_path": "filament/Numakers/Numakers PLA+ @base.json" + }, { "name": "Overture Air PLA @base", "sub_path": "filament/Overture/Overture Air PLA @base.json" @@ -517,12 +577,12 @@ "sub_path": "filament/Polymaker/Panchroma PLA Neon @base.json" }, { - "name": "Panchroma PLA Silk @base", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" + "name": "Panchroma PLA Satin @base", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @base.json" }, { - "name": "Panchroma PLA Stain @base", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @base.json" + "name": "Panchroma PLA Silk @base", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" }, { "name": "Panchroma PLA Starlight @base", @@ -680,6 +740,22 @@ "name": "COEX TPU 60A @base", "sub_path": "filament/COEX/COEX TPU 60A @base.json" }, + { + "name": "Eolas Prints TPU D60 UV Resistant @System", + "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json" + }, + { + "name": "Eolas Prints TPU Flex 93A @System", + "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json" + }, + { + "name": "Eolas Prints TPU Flex D53 @System", + "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json" + }, + { + "name": "Eolas Prints TPU Transition @System", + "sub_path": "filament/Eolas Prints/Eolas Prints TPU Transition @System.json" + }, { "name": "FDplast TPU @base", "sub_path": "filament/FDplast/FDplast TPU @base.json" @@ -692,10 +768,6 @@ "name": "Overture TPU @base", "sub_path": "filament/Overture/Overture TPU @base.json" }, - { - "name": "Numakers PLA+ @base", - "sub_path": "filament/Numakers/Numakers PLA+ @base.json" - }, { "name": "Bambu ABS @System", "sub_path": "filament/Bambu/Bambu ABS @System.json" @@ -980,6 +1052,10 @@ "name": "NIT PLA @System", "sub_path": "filament/NIT/NIT PLA @System.json" }, + { + "name": "Numakers PLA+ @System", + "sub_path": "filament/Numakers/Numakers PLA+ @System.json" + }, { "name": "Overture Air PLA @System", "sub_path": "filament/Overture/Overture Air PLA @System.json" @@ -1053,12 +1129,12 @@ "sub_path": "filament/Polymaker/Panchroma PLA Neon @System.json" }, { - "name": "Panchroma PLA Silk @System", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @System.json" + "name": "Panchroma PLA Satin @System", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @System.json" }, { - "name": "Panchroma PLA Stain @System", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @System.json" + "name": "Panchroma PLA Silk @System", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @System.json" }, { "name": "Panchroma PLA Starlight @System", @@ -1211,81 +1287,6 @@ { "name": "COEX PLA+Silk @System", "sub_path": "filament/COEX/COEX PLA+Silk @System.json" - }, - { "name": "Numakers PLA+ @System", - "sub_path": "filament/Numakers/Numakers PLA+ @System.json" - }, - { - "name": "Eolas Prints PLA Premium @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA Premium @System.json" - }, - { - "name": "Eolas Prints PLA Matte @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA Matte @System.json" - }, - { - "name": "Eolas Prints PLA Silk @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA Silk @System.json" - }, - { - "name": "Eolas Prints PLA Neon @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA Neon @System.json" - }, - { - "name": "Eolas Prints PLA High Speed @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA High Speed @System.json" - }, - { - "name": "Eolas Prints PLA INGEO 850 @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json" - }, - { - "name": "Eolas Prints PLA INGEO 870 @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json" - }, - { - "name": "Eolas Prints PLA Antibacterial @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json" - }, - { - "name": "Eolas Prints PLA Transition @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PLA Transition @System.json" - }, - { - "name": "Eolas Prints PETG @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PETG @System.json" - }, - { - "name": "Eolas Prints PETG UV Resistant @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json" - }, - { - "name": "Eolas Prints PETG Transition @System", - "sub_path": "filament/Eolas Prints/Eolas Prints PETG Transition @System.json" - }, - { - "name": "Eolas Prints TPU Flex 93A @System", - "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json" - }, - { - "name": "Eolas Prints TPU Flex D53 @System", - "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json" - }, - { - "name": "Eolas Prints TPU Flex D60 UV Resistant @System", - "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json" - }, - { - "name": "Eolas Prints TPU Transition @System", - "sub_path": "filament/Eolas Prints/Eolas Prints TPU Transition @System.json" - }, - { - "name": "Eolas Prints ABS @System", - "sub_path": "filament/Eolas Prints/Eolas Prints ABS @System.json" - }, - { - "name": "Eolas Prints ASA @System", - "sub_path": "filament/Eolas Prints/Eolas Prints ASA @System.json" } ], "process_list": [], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Stain @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @System.json similarity index 60% rename from resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Stain @System.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @System.json index 96e40e373f..bbb5b658f6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Stain @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @System.json @@ -1,7 +1,8 @@ { "type": "filament", - "name": "Panchroma PLA Stain @System", - "inherits": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @System", + "renamed_from": "Panchroma PLA Stain @System", + "inherits": "Panchroma PLA Satin @base", "from": "system", "setting_id": "OGFSPM005", "instantiation": "true", @@ -11,4 +12,4 @@ "filament_max_volumetric_speed": [ "16" ] -} \ No newline at end of file +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Stain @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json similarity index 87% rename from resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Stain @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json index 4021abe0c3..a3ae93632b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Stain @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json @@ -1,6 +1,7 @@ { "type": "filament", - "name": "Panchroma PLA Stain @base", + "name": "Panchroma PLA Satin @base", + "renamed_from": "Panchroma PLA Stain @base", "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OGFPM005", @@ -32,4 +33,4 @@ "temperature_vitrification": [ "59" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index e5b3b2b155..a468a8edf1 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -462,7 +462,7 @@ "filament_list": [ { "name": "PolyTerra PLA @0.2 nozzle", - "sub_path": "filament/PolyTerra PLA @0.2 nozzle.json" + "sub_path": "filament/Polymaker/PolyTerra PLA @0.2 nozzle.json" }, { "name": "Snapmaker PLA Lite @U1 base", @@ -482,11 +482,11 @@ }, { "name": "PolyTerra Dual PLA @0.2 nozzle", - "sub_path": "filament/PolyTerra Dual PLA @0.2 nozzle.json" + "sub_path": "filament/Polymaker/PolyTerra Dual PLA @0.2 nozzle.json" }, { "name": "PolyTerra J1 PLA @0.2 nozzle", - "sub_path": "filament/PolyTerra J1 PLA @0.2 nozzle.json" + "sub_path": "filament/Polymaker/PolyTerra J1 PLA @0.2 nozzle.json" }, { "name": "Snapmaker PLA Lite @U1", @@ -608,6 +608,14 @@ "name": "Snapmaker PET @base", "sub_path": "filament/Snapmaker PET @base.json" }, + { + "name": "PolyLite PETG @Base", + "sub_path": "filament/Polymaker/PolyLite PETG @Base.json" + }, + { + "name": "Polymaker PETG @Base", + "sub_path": "filament/Polymaker/Polymaker PETG @Base.json" + }, { "name": "Snapmaker Dual PETG @base", "sub_path": "filament/Snapmaker Dual PETG @base.json" @@ -640,17 +648,105 @@ "name": "Snapmaker PETG-CF @base", "sub_path": "filament/Snapmaker PETG-CF @base.json" }, + { + "name": "Panchroma CoPE @U1 base", + "sub_path": "filament/Polymaker/Panchroma CoPE @U1 base.json" + }, + { + "name": "Panchroma PLA @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA @U1 base.json" + }, + { + "name": "Panchroma PLA Celestial @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @U1 base.json" + }, + { + "name": "Panchroma PLA Galaxy @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @U1 base.json" + }, + { + "name": "Panchroma PLA Glow @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @U1 base.json" + }, + { + "name": "Panchroma PLA Luminous @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @U1 base.json" + }, + { + "name": "Panchroma PLA Marble @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @U1 base.json" + }, + { + "name": "Panchroma PLA Matte @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @U1 base.json" + }, + { + "name": "Panchroma PLA Metallic @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @U1 base.json" + }, + { + "name": "Panchroma PLA Neon @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @U1 base.json" + }, + { + "name": "Panchroma PLA Satin @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @U1 base.json" + }, + { + "name": "Panchroma PLA Silk @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @U1 base.json" + }, + { + "name": "Panchroma PLA Starlight @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @U1 base.json" + }, + { + "name": "Panchroma PLA Temp Shift @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @U1 base.json" + }, + { + "name": "Panchroma PLA Translucent @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @U1 base.json" + }, + { + "name": "Panchroma PLA UV Shift @U1 base", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @U1 base.json" + }, { "name": "PolyLite PLA @U1 base", - "sub_path": "filament/PolyLite PLA @U1 base.json" + "sub_path": "filament/Polymaker/PolyLite PLA @U1 base.json" }, { "name": "PolyLite PLA @base", - "sub_path": "filament/PolyLite PLA @base.json" + "sub_path": "filament/Polymaker/PolyLite PLA @base.json" + }, + { + "name": "PolyLite PLA Pro @U1 base", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @U1 base.json" }, { "name": "PolyTerra PLA @U1 base", - "sub_path": "filament/PolyTerra PLA @U1 base.json" + "sub_path": "filament/Polymaker/PolyTerra PLA @U1 base.json" + }, + { + "name": "Polymaker HT-PLA @Base", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @Base.json" + }, + { + "name": "Polymaker HT-PLA @U1 base", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @U1 base.json" + }, + { + "name": "Polymaker HT-PLA-GF @Base", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @Base.json" + }, + { + "name": "Polymaker HT-PLA-GF @U1 base", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @U1 base.json" + }, + { + "name": "Polymaker PLA Pro @Base", + "sub_path": "filament/Polymaker/Polymaker PLA Pro @Base.json" }, { "name": "Snapmaker Dual PLA @base", @@ -884,6 +980,14 @@ "name": "Snapmaker PET", "sub_path": "filament/Snapmaker PET.json" }, + { + "name": "PolyLite PETG @Snapmaker U1", + "sub_path": "filament/Polymaker/PolyLite PETG @Snapmaker U1.json" + }, + { + "name": "Polymaker PETG @Snapmaker U1", + "sub_path": "filament/Polymaker/Polymaker PETG @Snapmaker U1.json" + }, { "name": "Snapmaker Dual PETG", "sub_path": "filament/Snapmaker Dual PETG.json" @@ -936,21 +1040,109 @@ "name": "Snapmaker PETG-CF", "sub_path": "filament/Snapmaker PETG-CF.json" }, + { + "name": "Panchroma CoPE @U1", + "sub_path": "filament/Polymaker/Panchroma CoPE @U1.json" + }, + { + "name": "Panchroma PLA @U1", + "sub_path": "filament/Polymaker/Panchroma PLA @U1.json" + }, + { + "name": "Panchroma PLA Celestial @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @U1.json" + }, + { + "name": "Panchroma PLA Galaxy @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @U1.json" + }, + { + "name": "Panchroma PLA Glow @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @U1.json" + }, + { + "name": "Panchroma PLA Luminous @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @U1.json" + }, + { + "name": "Panchroma PLA Marble @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @U1.json" + }, + { + "name": "Panchroma PLA Matte @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @U1.json" + }, + { + "name": "Panchroma PLA Metallic @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @U1.json" + }, + { + "name": "Panchroma PLA Neon @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @U1.json" + }, + { + "name": "Panchroma PLA Satin @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Satin @U1.json" + }, + { + "name": "Panchroma PLA Silk @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @U1.json" + }, + { + "name": "Panchroma PLA Starlight @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @U1.json" + }, + { + "name": "Panchroma PLA Temp Shift @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @U1.json" + }, + { + "name": "Panchroma PLA Translucent @U1", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @U1.json" + }, + { + "name": "Panchroma PLA UV Shift @U1", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @U1.json" + }, { "name": "PolyLite PLA @U1", - "sub_path": "filament/PolyLite PLA @U1.json" + "sub_path": "filament/Polymaker/PolyLite PLA @U1.json" }, { "name": "PolyLite J1 PLA", - "sub_path": "filament/PolyLite J1 PLA.json" + "sub_path": "filament/Polymaker/PolyLite J1 PLA.json" }, { "name": "PolyLite PLA @0.2 nozzle", - "sub_path": "filament/PolyLite PLA @0.2 nozzle.json" + "sub_path": "filament/Polymaker/PolyLite PLA @0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @U1", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @U1.json" }, { "name": "PolyTerra PLA @U1", - "sub_path": "filament/PolyTerra PLA @U1.json" + "sub_path": "filament/Polymaker/PolyTerra PLA @U1.json" + }, + { + "name": "Polymaker HT-PLA @Snapmaker U1", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json" + }, + { + "name": "Polymaker HT-PLA @U1", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @U1.json" + }, + { + "name": "Polymaker HT-PLA-GF @Snapmaker U1", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json" + }, + { + "name": "Polymaker HT-PLA-GF @U1", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @U1.json" + }, + { + "name": "Polymaker PLA Pro @Snapmaker U1", + "sub_path": "filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json" }, { "name": "Snapmaker Dual PLA", @@ -1158,11 +1350,11 @@ }, { "name": "PolyLite Dual PLA @0.2 nozzle", - "sub_path": "filament/PolyLite Dual PLA @0.2 nozzle.json" + "sub_path": "filament/Polymaker/PolyLite Dual PLA @0.2 nozzle.json" }, { "name": "PolyLite J1 PLA @0.2 nozzle", - "sub_path": "filament/PolyLite J1 PLA @0.2 nozzle.json" + "sub_path": "filament/Polymaker/PolyLite J1 PLA @0.2 nozzle.json" }, { "name": "Snapmaker Dual PLA Eco", @@ -1206,7 +1398,7 @@ }, { "name": "PolyTerra J1 PLA", - "sub_path": "filament/PolyTerra J1 PLA.json" + "sub_path": "filament/Polymaker/PolyTerra J1 PLA.json" }, { "name": "Snapmaker PLA Matte @U1 base", diff --git a/resources/profiles/Snapmaker/filament/PolyLite Dual PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/PolyLite Dual PLA @0.2 nozzle.json deleted file mode 100644 index 6528cd8ca0..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyLite Dual PLA @0.2 nozzle.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite Dual PLA @0.2 nozzle", - "inherits": "PolyLite PLA @0.2 nozzle", - "from": "system", - "setting_id": "490991920", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker A250 Dual (0.2 nozzle)", - "Snapmaker A250 Dual BKit (0.2 nozzle)", - "Snapmaker A250 Dual QS+B Kit (0.2 nozzle)", - "Snapmaker A250 Dual QSKit (0.2 nozzle)", - "Snapmaker A350 Dual (0.2 nozzle)", - "Snapmaker A350 Dual BKit (0.2 nozzle)", - "Snapmaker A350 Dual QS+B Kit (0.2 nozzle)", - "Snapmaker A350 Dual QSKit (0.2 nozzle)", - "Snapmaker Artisan (0.2 nozzle)" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyLite J1 PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/PolyLite J1 PLA @0.2 nozzle.json deleted file mode 100644 index 65a87c28d8..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyLite J1 PLA @0.2 nozzle.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite J1 PLA @0.2 nozzle", - "inherits": "PolyLite PLA @0.2 nozzle", - "from": "system", - "setting_id": "431382384", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker J1 (0.2 nozzle)" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyLite J1 PLA.json b/resources/profiles/Snapmaker/filament/PolyLite J1 PLA.json deleted file mode 100644 index 0d09c5528a..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyLite J1 PLA.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite J1 PLA", - "inherits": "PolyLite PLA @base", - "from": "system", - "setting_id": "116125055", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker J1 (0.4 nozzle)", - "Snapmaker J1 (0.6 nozzle)", - "Snapmaker J1 (0.8 nozzle)" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyLite PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/PolyLite PLA @0.2 nozzle.json deleted file mode 100644 index 69999b740a..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyLite PLA @0.2 nozzle.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA @0.2 nozzle", - "inherits": "PolyLite PLA @base", - "from": "system", - "setting_id": "1592803578", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker A250 (0.2 nozzle)", - "Snapmaker A250 BKit (0.2 nozzle)", - "Snapmaker A250 QS+B Kit (0.2 nozzle)", - "Snapmaker A250 QSKit (0.2 nozzle)", - "Snapmaker A350 (0.2 nozzle)", - "Snapmaker A350 BKit (0.2 nozzle)", - "Snapmaker A350 QS+B Kit (0.2 nozzle)", - "Snapmaker A350 QSKit (0.2 nozzle)" - ], - "filament_max_volumetric_speed": [ - "1.6" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyLite PLA @U1 base.json b/resources/profiles/Snapmaker/filament/PolyLite PLA @U1 base.json deleted file mode 100644 index fb9c55cdc7..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyLite PLA @U1 base.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA @U1 base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "13938660340", - "instantiation": "false", - "filament_flow_ratio": [ - "0.95" - ], - "filament_cost": [ - "90" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "default_filament_colour": [ - "" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyLite PLA @U1.json b/resources/profiles/Snapmaker/filament/PolyLite PLA @U1.json deleted file mode 100644 index 0648fdde39..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyLite PLA @U1.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA @U1", - "inherits": "PolyLite PLA @U1 base", - "from": "system", - "setting_id": "6486836500", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker U1 (0.4 nozzle)" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyLite PLA @base.json b/resources/profiles/Snapmaker/filament/PolyLite PLA @base.json deleted file mode 100644 index e4db1c70b6..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyLite PLA @base.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "1393866034", - "instantiation": "false", - "filament_flow_ratio": [ - "0.95" - ], - "filament_cost": [ - "90" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "default_filament_colour": [ - "" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyTerra Dual PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/PolyTerra Dual PLA @0.2 nozzle.json deleted file mode 100644 index 9ce3e9f972..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyTerra Dual PLA @0.2 nozzle.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "filament", - "name": "PolyTerra Dual PLA @0.2 nozzle", - "inherits": "PolyTerra PLA @0.2 nozzle", - "from": "system", - "setting_id": "1258531391", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker A250 Dual (0.2 nozzle)", - "Snapmaker A250 Dual BKit (0.2 nozzle)", - "Snapmaker A250 Dual QS+B Kit (0.2 nozzle)", - "Snapmaker A250 Dual QSKit (0.2 nozzle)", - "Snapmaker A350 Dual (0.2 nozzle)", - "Snapmaker A350 Dual BKit (0.2 nozzle)", - "Snapmaker A350 Dual QS+B Kit (0.2 nozzle)", - "Snapmaker A350 Dual QSKit (0.2 nozzle)", - "Snapmaker Artisan (0.2 nozzle)" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyTerra J1 PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/PolyTerra J1 PLA @0.2 nozzle.json deleted file mode 100644 index a2f99fd132..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyTerra J1 PLA @0.2 nozzle.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "filament", - "name": "PolyTerra J1 PLA @0.2 nozzle", - "inherits": "PolyTerra PLA @0.2 nozzle", - "from": "system", - "setting_id": "1072374370", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker J1 (0.2 nozzle)" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyTerra J1 PLA.json b/resources/profiles/Snapmaker/filament/PolyTerra J1 PLA.json deleted file mode 100644 index c696f52735..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyTerra J1 PLA.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "filament", - "name": "PolyTerra J1 PLA", - "inherits": "PolyTerra PLA @base", - "from": "system", - "setting_id": "3958200796", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker J1 (0.4 nozzle)", - "Snapmaker J1 (0.6 nozzle)", - "Snapmaker J1 (0.8 nozzle)" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyTerra PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/PolyTerra PLA @0.2 nozzle.json deleted file mode 100644 index f996844ce1..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyTerra PLA @0.2 nozzle.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "filament", - "name": "PolyTerra PLA @0.2 nozzle", - "inherits": "PolyTerra PLA @base", - "from": "system", - "setting_id": "409934824", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker A250 (0.2 nozzle)", - "Snapmaker A250 BKit (0.2 nozzle)", - "Snapmaker A250 QS+B Kit (0.2 nozzle)", - "Snapmaker A250 QSKit (0.2 nozzle)", - "Snapmaker A350 (0.2 nozzle)", - "Snapmaker A350 BKit (0.2 nozzle)", - "Snapmaker A350 QS+B Kit (0.2 nozzle)", - "Snapmaker A350 QSKit (0.2 nozzle)" - ], - "filament_max_volumetric_speed": [ - "1.4" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyTerra PLA @U1 base.json b/resources/profiles/Snapmaker/filament/PolyTerra PLA @U1 base.json deleted file mode 100644 index 3b7b9a8b94..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyTerra PLA @U1 base.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "name": "PolyTerra PLA @U1 base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "37895926870", - "instantiation": "false", - "filament_cost": [ - "80" - ], - "filament_density": [ - "1.31" - ], - "filament_max_volumetric_speed": [ - "14.4" - ], - "default_filament_colour": [ - "" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/PolyTerra PLA @U1.json b/resources/profiles/Snapmaker/filament/PolyTerra PLA @U1.json deleted file mode 100644 index 478c008d7a..0000000000 --- a/resources/profiles/Snapmaker/filament/PolyTerra PLA @U1.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "filament", - "name": "PolyTerra PLA @U1", - "inherits": "PolyTerra PLA @U1 base", - "from": "system", - "setting_id": "12580059400", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker U1 (0.4 nozzle)" - ] -} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @U1 base.json new file mode 100644 index 0000000000..1575543964 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma CoPE @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM016", + "instantiation": "false", + "filament_cost": [ + "19.99" + ], + "filament_density": [ + "1.29" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "58" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @U1.json new file mode 100644 index 0000000000..abd252e87a --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma CoPE @U1", + "inherits": "Panchroma CoPE @U1 base", + "from": "system", + "setting_id": "GFSPM016_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @U1 base.json new file mode 100644 index 0000000000..a09edc3df1 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @U1 base.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "Panchroma PLA @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM001", + "instantiation": "false", + "filament_cost": [ + "19.99" + ], + "filament_density": [ + "1.32" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "filament_wipe": [ + "0" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "58" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @U1.json new file mode 100644 index 0000000000..a77038834b --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA @U1", + "inherits": "Panchroma PLA @U1 base", + "from": "system", + "setting_id": "GFSPM001_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @U1 base.json new file mode 100644 index 0000000000..305c3b8476 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Celestial @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM008", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @U1.json new file mode 100644 index 0000000000..cfd1b918b1 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Celestial @U1", + "inherits": "Panchroma PLA Celestial @U1 base", + "from": "system", + "setting_id": "GFSPM008_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @U1 base.json new file mode 100644 index 0000000000..9129ce17a7 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Galaxy @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM007", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @U1.json new file mode 100644 index 0000000000..465e8b461d --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Galaxy @U1", + "inherits": "Panchroma PLA Galaxy @U1 base", + "from": "system", + "setting_id": "GFSPM007_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @U1 base.json new file mode 100644 index 0000000000..21177be0db --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Glow @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM010", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @U1.json new file mode 100644 index 0000000000..5cbf021349 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Glow @U1", + "inherits": "Panchroma PLA Glow @U1 base", + "from": "system", + "setting_id": "GFSPM010_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @U1 base.json new file mode 100644 index 0000000000..c8afc7bc16 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Luminous @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM011", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @U1.json new file mode 100644 index 0000000000..7747c1ccfb --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Luminous @U1", + "inherits": "Panchroma PLA Luminous @U1 base", + "from": "system", + "setting_id": "GFSPM011_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @U1 base.json new file mode 100644 index 0000000000..8a462959a8 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Marble @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM003", + "instantiation": "false", + "filament_cost": [ + "21.99" + ], + "filament_density": [ + "1.31" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @U1.json new file mode 100644 index 0000000000..8fb2780b8f --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @U1.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Panchroma PLA Marble @U1", + "inherits": "Panchroma PLA Marble @U1 base", + "from": "system", + "setting_id": "GFSPM003_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @U1 base.json new file mode 100644 index 0000000000..9ab72e1484 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Matte @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM002", + "instantiation": "false", + "filament_cost": [ + "20.99" + ], + "filament_density": [ + "1.31" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @U1.json new file mode 100644 index 0000000000..9823adaa0c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @U1.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Panchroma PLA Matte @U1", + "inherits": "Panchroma PLA Matte @U1 base", + "from": "system", + "setting_id": "GFSPM002_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @U1 base.json new file mode 100644 index 0000000000..f9a33ba035 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Metallic @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM012", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @U1.json new file mode 100644 index 0000000000..0196929a54 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Metallic @U1", + "inherits": "Panchroma PLA Metallic @U1 base", + "from": "system", + "setting_id": "GFSPM012_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @U1 base.json new file mode 100644 index 0000000000..70332dc961 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Neon @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM013", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @U1.json new file mode 100644 index 0000000000..cc5ab3fbaf --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Neon @U1", + "inherits": "Panchroma PLA Neon @U1 base", + "from": "system", + "setting_id": "GFSPM013_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @U1 base.json new file mode 100644 index 0000000000..1f38ea1a45 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @U1 base.json @@ -0,0 +1,42 @@ +{ + "type": "filament", + "name": "Panchroma PLA Satin @U1 base", + "renamed_from": "Panchroma PLA Stain @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM005", + "instantiation": "false", + "filament_cost": [ + "20.99" + ], + "filament_density": [ + "1.24" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "59" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @U1.json new file mode 100644 index 0000000000..6e914b56a4 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @U1.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Panchroma PLA Satin @U1", + "renamed_from": "Panchroma PLA Stain @U1", + "inherits": "Panchroma PLA Satin @U1 base", + "from": "system", + "setting_id": "GFSPM005_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @U1 base.json new file mode 100644 index 0000000000..43e9f98164 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Silk @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM004", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.31" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "58" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @U1.json new file mode 100644 index 0000000000..52102ab63b --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Silk @U1", + "inherits": "Panchroma PLA Silk @U1 base", + "from": "system", + "setting_id": "GFSPM004_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @U1 base.json new file mode 100644 index 0000000000..0c9fd9bf52 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Starlight @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM009", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @U1.json new file mode 100644 index 0000000000..9029dc250c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Starlight @U1", + "inherits": "Panchroma PLA Starlight @U1 base", + "from": "system", + "setting_id": "GFSPM009_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @U1 base.json new file mode 100644 index 0000000000..c86779555f --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Temp Shift @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM015", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @U1.json new file mode 100644 index 0000000000..5d7e17696b --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Temp Shift @U1", + "inherits": "Panchroma PLA Temp Shift @U1 base", + "from": "system", + "setting_id": "GFSPM015_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @U1 base.json new file mode 100644 index 0000000000..cb786e6f9a --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA Translucent @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM006", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @U1.json new file mode 100644 index 0000000000..6e35878869 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA Translucent @U1", + "inherits": "Panchroma PLA Translucent @U1 base", + "from": "system", + "setting_id": "GFSPM006_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @U1 base.json new file mode 100644 index 0000000000..c209198398 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Panchroma PLA UV Shift @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM014", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "61" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @U1.json new file mode 100644 index 0000000000..f85802624c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Panchroma PLA UV Shift @U1", + "inherits": "Panchroma PLA UV Shift @U1 base", + "from": "system", + "setting_id": "GFSPM014_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite Dual PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite Dual PLA @0.2 nozzle.json new file mode 100644 index 0000000000..f47614d710 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite Dual PLA @0.2 nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyLite Dual PLA @0.2 nozzle", + "setting_id": "490991920", + "inherits": "PolyLite PLA @0.2 nozzle", + "compatible_printers": [ + "Snapmaker A250 Dual (0.2 nozzle)", + "Snapmaker A250 Dual BKit (0.2 nozzle)", + "Snapmaker A250 Dual QS+B Kit (0.2 nozzle)", + "Snapmaker A250 Dual QSKit (0.2 nozzle)", + "Snapmaker A350 Dual (0.2 nozzle)", + "Snapmaker A350 Dual BKit (0.2 nozzle)", + "Snapmaker A350 Dual QS+B Kit (0.2 nozzle)", + "Snapmaker A350 Dual QSKit (0.2 nozzle)", + "Snapmaker Artisan (0.2 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA @0.2 nozzle.json new file mode 100644 index 0000000000..4e2b21f785 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA @0.2 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyLite J1 PLA @0.2 nozzle", + "setting_id": "431382384", + "inherits": "PolyLite PLA @0.2 nozzle", + "compatible_printers": [ + "Snapmaker J1 (0.2 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json new file mode 100644 index 0000000000..ac3cdd9ba9 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyLite J1 PLA", + "setting_id": "116125055", + "inherits": "PolyLite PLA @base", + "compatible_printers": [ + "Snapmaker J1 (0.4 nozzle)", + "Snapmaker J1 (0.6 nozzle)", + "Snapmaker J1 (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Base.json new file mode 100644 index 0000000000..ed8ea01808 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Base.json @@ -0,0 +1,29 @@ +{ + "filament_density": [ + "1.25" + ], + "temp_min": [ + "230" + ], + "temp_max": [ + "240" + ], + "temperture_vitrification": [ + "75" + ], + "idle_temperture": [ + "0" + ], + "filament_soluble": [ + "0" + ], + "description": "", + "inherits": "fdm_filament_petg", + "name": "PolyLite PETG @Base", + "type": "filament", + "instantiation": "false", + "from": "system", + "filament_vendor": [ + "Polymaker" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json new file mode 100644 index 0000000000..2e8a0e0943 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json @@ -0,0 +1,117 @@ +{ + "type": "filament", + "name": "PolyLite PETG @Snapmaker U1", + "from": "system", + "instantiation": "true", + "cool_plate_temp": [ + "60" + ], + "eng_plate_temp": [ + "0" + ], + "hot_plate_temp": [ + "80" + ], + "textured_plate_temp": [ + "80" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "overhang_fan_threshold": [ + "95%" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_flow_ratio": [ + "0.92" + ], + "fan_cooling_layer_time": [ + "20" + ], + "filament_cost": [ + "0" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "7.5" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "bed_type": [ + "Cool Plate" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "full_fan_speed_layer": [ + "0" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "0" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "6" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "260" + ], + "temperature_vitrification": [ + "81" + ], + "filament_id": "PMPE04", + "nozzle_temperature_range_high": [ + "260" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "setting_id": "PMPE04_U1", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "pressure_advance": [ + "0.05" + ], + "inherits": "PolyLite PETG @Base" +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @0.2 nozzle.json new file mode 100644 index 0000000000..b3c643a042 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @0.2 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyLite PLA @0.2 nozzle", + "setting_id": "1592803578", + "inherits": "PolyLite PLA @base", + "compatible_printers": [ + "Snapmaker A250 (0.2 nozzle)", + "Snapmaker A250 BKit (0.2 nozzle)", + "Snapmaker A250 QS+B Kit (0.2 nozzle)", + "Snapmaker A250 QSKit (0.2 nozzle)", + "Snapmaker A350 (0.2 nozzle)", + "Snapmaker A350 BKit (0.2 nozzle)", + "Snapmaker A350 QS+B Kit (0.2 nozzle)", + "Snapmaker A350 QSKit (0.2 nozzle)" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @U1 base.json new file mode 100644 index 0000000000..d0547572b6 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @U1 base.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "false", + "name": "PolyLite PLA @U1 base", + "filament_id": "13938660340", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.95" + ], + "filament_cost": [ + "90" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "default_filament_colour": [ + "" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @U1.json new file mode 100644 index 0000000000..ad81f2d79d --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @U1.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyLite PLA @U1", + "setting_id": "6486836500", + "inherits": "PolyLite PLA @U1 base", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json new file mode 100644 index 0000000000..2a7310f405 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "false", + "name": "PolyLite PLA @base", + "filament_id": "1393866034", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.95" + ], + "filament_cost": [ + "90" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "default_filament_colour": [ + "" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @U1 base.json new file mode 100644 index 0000000000..f5d87e4277 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @U1 base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "PolyLite PLA Pro @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM019", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.22" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "62" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @U1.json new file mode 100644 index 0000000000..f0b65f7717 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "PolyLite PLA Pro @U1", + "inherits": "PolyLite PLA Pro @U1 base", + "from": "system", + "setting_id": "GFSPM019_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra Dual PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra Dual PLA @0.2 nozzle.json new file mode 100644 index 0000000000..c3673b4d3c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra Dual PLA @0.2 nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyTerra Dual PLA @0.2 nozzle", + "setting_id": "1258531391", + "inherits": "PolyTerra PLA @0.2 nozzle", + "compatible_printers": [ + "Snapmaker A250 Dual (0.2 nozzle)", + "Snapmaker A250 Dual BKit (0.2 nozzle)", + "Snapmaker A250 Dual QS+B Kit (0.2 nozzle)", + "Snapmaker A250 Dual QSKit (0.2 nozzle)", + "Snapmaker A350 Dual (0.2 nozzle)", + "Snapmaker A350 Dual BKit (0.2 nozzle)", + "Snapmaker A350 Dual QS+B Kit (0.2 nozzle)", + "Snapmaker A350 Dual QSKit (0.2 nozzle)", + "Snapmaker Artisan (0.2 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA @0.2 nozzle.json new file mode 100644 index 0000000000..24fda4c652 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA @0.2 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyTerra J1 PLA @0.2 nozzle", + "setting_id": "1072374370", + "inherits": "PolyTerra PLA @0.2 nozzle", + "compatible_printers": [ + "Snapmaker J1 (0.2 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json new file mode 100644 index 0000000000..9592d5cbd0 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyTerra J1 PLA", + "setting_id": "3958200796", + "inherits": "PolyTerra PLA @base", + "compatible_printers": [ + "Snapmaker J1 (0.4 nozzle)", + "Snapmaker J1 (0.6 nozzle)", + "Snapmaker J1 (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @0.2 nozzle.json new file mode 100644 index 0000000000..215685b8e3 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @0.2 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyTerra PLA @0.2 nozzle", + "setting_id": "409934824", + "inherits": "PolyTerra PLA @base", + "compatible_printers": [ + "Snapmaker A250 (0.2 nozzle)", + "Snapmaker A250 BKit (0.2 nozzle)", + "Snapmaker A250 QS+B Kit (0.2 nozzle)", + "Snapmaker A250 QSKit (0.2 nozzle)", + "Snapmaker A350 (0.2 nozzle)", + "Snapmaker A350 BKit (0.2 nozzle)", + "Snapmaker A350 QS+B Kit (0.2 nozzle)", + "Snapmaker A350 QSKit (0.2 nozzle)" + ], + "filament_max_volumetric_speed": [ + "1.4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @U1 base.json new file mode 100644 index 0000000000..861179ca06 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @U1 base.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "false", + "name": "PolyTerra PLA @U1 base", + "filament_id": "37895926870", + "inherits": "fdm_filament_pla", + "filament_cost": [ + "80" + ], + "filament_density": [ + "1.31" + ], + "filament_max_volumetric_speed": [ + "14.4" + ], + "default_filament_colour": [ + "" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @U1.json new file mode 100644 index 0000000000..f77d1d8082 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @U1.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "from": "system", + "instantiation": "true", + "name": "PolyTerra PLA @U1", + "setting_id": "12580059400", + "inherits": "PolyTerra PLA @U1 base", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Base.json new file mode 100644 index 0000000000..77e155ade4 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Base.json @@ -0,0 +1,29 @@ +{ + "filament_density": [ + "1.28" + ], + "temp_min": [ + "210" + ], + "temp_max": [ + "230" + ], + "temperture_vitrification": [ + "156" + ], + "idle_temperture": [ + "0" + ], + "filament_soluble": [ + "0" + ], + "description": "", + "inherits": "fdm_filament_pla", + "name": "Polymaker HT-PLA @Base", + "type": "filament", + "instantiation": "false", + "from": "system", + "filament_vendor": [ + "Polymaker" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json new file mode 100644 index 0000000000..b466d702fe --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "Polymaker HT-PLA @Snapmaker U1", + "from": "system", + "instantiation": "true", + "cool_plate_temp": [ + "50" + ], + "eng_plate_temp": [ + "50" + ], + "hot_plate_temp": [ + "65" + ], + "textured_plate_temp": [ + "50" + ], + "cool_plate_temp_initial_layer": [ + "50" + ], + "eng_plate_temp_initial_layer": [ + "50" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "50" + ], + "overhang_fan_threshold": [ + "50%" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_cost": [ + "0" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "bed_type": [ + "Cool Plate" + ], + "full_fan_speed_layer": [ + "0" + ], + "fan_max_speed": [ + "100" + ], + "slow_down_min_speed": [ + "5" + ], + "slow_down_layer_time": [ + "6" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "setting_id": "PMPL02_U1", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "inherits": "Polymaker HT-PLA @Base", + "filament_id": "PMPL02" +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @U1 base.json new file mode 100644 index 0000000000..9a997d8e3f --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @U1 base.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Polymaker HT-PLA @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM017", + "instantiation": "false", + "filament_cost": [ + "26.99" + ], + "filament_density": [ + "1.28" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "210" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @U1.json new file mode 100644 index 0000000000..da678d8a4c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Polymaker HT-PLA @U1", + "inherits": "Polymaker HT-PLA @U1 base", + "from": "system", + "setting_id": "GFSPM017_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Base.json new file mode 100644 index 0000000000..4cd066b3d0 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Base.json @@ -0,0 +1,29 @@ +{ + "filament_density": [ + "1.34" + ], + "temp_min": [ + "210" + ], + "temp_max": [ + "230" + ], + "temperture_vitrification": [ + "148" + ], + "idle_temperture": [ + "0" + ], + "filament_soluble": [ + "0" + ], + "description": "", + "inherits": "fdm_filament_pla", + "name": "Polymaker HT-PLA-GF @Base", + "type": "filament", + "instantiation": "false", + "from": "system", + "filament_vendor": [ + "Polymaker" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json new file mode 100644 index 0000000000..b18f79d461 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "Polymaker HT-PLA-GF @Snapmaker U1", + "from": "system", + "instantiation": "true", + "cool_plate_temp": [ + "50" + ], + "eng_plate_temp": [ + "50" + ], + "hot_plate_temp": [ + "65" + ], + "textured_plate_temp": [ + "50" + ], + "cool_plate_temp_initial_layer": [ + "50" + ], + "eng_plate_temp_initial_layer": [ + "50" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "50" + ], + "overhang_fan_threshold": [ + "50%" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_flow_ratio": [ + "1.04" + ], + "filament_cost": [ + "0" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "bed_type": [ + "Cool Plate" + ], + "full_fan_speed_layer": [ + "0" + ], + "fan_max_speed": [ + "100" + ], + "slow_down_min_speed": [ + "5" + ], + "slow_down_layer_time": [ + "6" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "setting_id": "PMPL01_U1", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "inherits": "Polymaker HT-PLA-GF @Base", + "filament_id": "PMPL01" +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @U1 base.json new file mode 100644 index 0000000000..fb70c1df40 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @U1 base.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Polymaker HT-PLA-GF @U1 base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFPM018", + "instantiation": "false", + "filament_cost": [ + "32.99" + ], + "filament_density": [ + "1.34" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "210" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @U1.json new file mode 100644 index 0000000000..554d1452be --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @U1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Polymaker HT-PLA-GF @U1", + "inherits": "Polymaker HT-PLA-GF @U1 base", + "from": "system", + "setting_id": "GFSPM018_00", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Base.json new file mode 100644 index 0000000000..04b25b012d --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Base.json @@ -0,0 +1,29 @@ +{ + "filament_density": [ + "1.3" + ], + "temp_min": [ + "240" + ], + "temp_max": [ + "260" + ], + "temperture_vitrification": [ + "75" + ], + "idle_temperture": [ + "0" + ], + "filament_soluble": [ + "0" + ], + "description": "", + "inherits": "fdm_filament_petg", + "name": "Polymaker PETG @Base", + "type": "filament", + "instantiation": "false", + "from": "system", + "filament_vendor": [ + "Polymaker" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json new file mode 100644 index 0000000000..c7559a65f7 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json @@ -0,0 +1,111 @@ +{ + "type": "filament", + "name": "Polymaker PETG @Snapmaker U1", + "from": "system", + "instantiation": "true", + "cool_plate_temp": [ + "60" + ], + "eng_plate_temp": [ + "0" + ], + "hot_plate_temp": [ + "80" + ], + "textured_plate_temp": [ + "80" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "overhang_fan_threshold": [ + "95%" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_cost": [ + "0" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "bed_type": [ + "Cool Plate" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "full_fan_speed_layer": [ + "0" + ], + "fan_max_speed": [ + "10" + ], + "fan_min_speed": [ + "50" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "6" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "260" + ], + "temperature_vitrification": [ + "71" + ], + "filament_id": "PMPE01", + "nozzle_temperature_range_high": [ + "260" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "setting_id": "PMPE01_U1", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "inherits": "Polymaker PETG @Base" +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Base.json new file mode 100644 index 0000000000..d25cf0270d --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Base.json @@ -0,0 +1,29 @@ +{ + "filament_density": [ + "1.23" + ], + "temp_min": [ + "190" + ], + "temp_max": [ + "230" + ], + "temperture_vitrification": [ + "55" + ], + "idle_temperture": [ + "0" + ], + "filament_soluble": [ + "0" + ], + "description": "", + "inherits": "fdm_filament_pla", + "name": "Polymaker PLA Pro @Base", + "type": "filament", + "instantiation": "false", + "from": "system", + "filament_vendor": [ + "Polymaker" + ] +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json new file mode 100644 index 0000000000..8b77ae186f --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "Polymaker PLA Pro @Snapmaker U1", + "from": "system", + "instantiation": "true", + "cool_plate_temp": [ + "50" + ], + "eng_plate_temp": [ + "50" + ], + "hot_plate_temp": [ + "65" + ], + "textured_plate_temp": [ + "50" + ], + "cool_plate_temp_initial_layer": [ + "50" + ], + "eng_plate_temp_initial_layer": [ + "50" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "50" + ], + "overhang_fan_threshold": [ + "50%" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_cost": [ + "0" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_vendor": [ + "Polymaker" + ], + "bed_type": [ + "Cool Plate" + ], + "full_fan_speed_layer": [ + "0" + ], + "fan_max_speed": [ + "100" + ], + "slow_down_min_speed": [ + "5" + ], + "slow_down_layer_time": [ + "6" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "61" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "setting_id": "PMPL03_U1", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "inherits": "Polymaker PLA Pro @Base", + "filament_id": "PMPL03" +} \ No newline at end of file From ef876fe5770f1822720927ba692de11605ac646f Mon Sep 17 00:00:00 2001 From: Rodrigo Faselli <162915171+RF47@users.noreply.github.com> Date: Mon, 5 Jan 2026 09:15:23 -0300 Subject: [PATCH 6/7] Wipe Tower Auto Brim bug-fix (Non BBL printers) (#11831) # Description Fix application freeze when Prime Tower brim is set to Auto This PR fixes an issue where enabling Auto brim width for the Prime Tower caused the application to freeze and consume unbounded amounts of memory. Root cause https://github.com/OrcaSlicer/OrcaSlicer/blob/0c5f6c9865642f7ba923aee412f54f79f29531a2/src/libslic3r/GCode/WipeTower2.cpp#L2036-L2039 When Auto brim is selected, the brim width was not being computed and the raw configuration value (-1) was used directly. This resulted in an effectively infinite loop during Prime Tower brim generation, leading to runaway memory allocation instead of a controlled failure or a crash. Solution The Auto brim width is now properly computed based on the Prime Tower height, matching the intended behavior and existing logic used in other slicer implementations. --- src/libslic3r/GCode/WipeTower2.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/GCode/WipeTower2.cpp b/src/libslic3r/GCode/WipeTower2.cpp index 6bec4168f4..19e98e4a09 100644 --- a/src/libslic3r/GCode/WipeTower2.cpp +++ b/src/libslic3r/GCode/WipeTower2.cpp @@ -2036,7 +2036,11 @@ WipeTower::ToolChangeResult WipeTower2::finish_layer() // brim (first layer only) if (first_layer) { writer.append("; WIPE_TOWER_BRIM_START\n"); - size_t loops_num = (m_wipe_tower_brim_width + spacing/2.f) / spacing; + float brim_width = m_wipe_tower_brim_width; + if (brim_width < 0.f) + brim_width = WipeTower::get_auto_brim_by_height(m_wipe_tower_height); + + size_t loops_num = (brim_width + spacing / 2.f) / spacing; for (size_t i = 0; i < loops_num; ++ i) { poly = offset(poly, scale_(spacing)).front(); From 044a1d5ba4295509c10b90f3832e9813d55722b5 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 5 Jan 2026 20:33:13 +0800 Subject: [PATCH 7/7] Fixed an issue where the wipe tower did not account for `z_offset`, especially when "No sparse layers" is enabled. (#11833) # Description This PR addresses the issue that WipeTower's start z position didn't consider the z_offset. fixes #11611 # Screenshots/Recordings/Graphs ## Tests --- src/libslic3r/GCode.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index 2bf29aa002..30c48df054 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -97,7 +97,8 @@ public: m_enable_timelapse_print(print_config.timelapse_type.value == TimelapseType::tlSmooth), m_enable_wrapping_detection(print_config.enable_wrapping_detection && (print_config.wrapping_exclude_area.values.size() > 2) && (slice_used_filaments.size() <= 1)), m_is_first_print(true), - m_print_config(&print_config) + m_print_config(&print_config), + m_last_wipe_tower_print_z(print_config.z_offset.value) { // initialize with the extruder offset of master extruder id m_extruder_offsets.resize(print_config.filament_map.size(), print_config.extruder_offset.get_at(print_config.master_extruder_id.value - 1)); @@ -143,7 +144,7 @@ private: // Current layer index. int m_layer_idx; int m_tool_change_idx; - double m_last_wipe_tower_print_z = 0.f; + double m_last_wipe_tower_print_z; // BBS Vec3d m_plate_origin;