chore(deps): bump actions/setup-python from 6 to 7

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6 to 7.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitattributes

@@ -1,7 +1,2 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
-
-# Shell scripts are run by Git Bash on Windows CI, which cannot read a script
-# with CRLF line endings: it fails on the first line. Windows checkouts default
-# to core.autocrlf=true, so keep these LF whatever the platform.
-*.sh text eol=lf

.github/workflows/build_orca.yml

@@ -162,14 +162,6 @@ jobs:
           retention-days: 5
           if-no-files-found: error
 
-      - name: Build system preset cache (macOS)
-        if: runner.os == 'macOS' && !inputs.macos-combine-only
-        working-directory: ${{ github.workspace }}
-        shell: bash
-        # The bundle was already packed from resources/, so the caches have to be
-        # installed into it here; the source tree keeps its JSONs for later jobs.
-        run: ./scripts/build_preset_cache.sh -b build/${{ inputs.arch }} build/${{ inputs.arch }}/OrcaSlicer/OrcaSlicer.app/Contents/Resources/profiles
-
       - name: Pack macOS app bundle ${{ inputs.arch }}
         if: runner.os == 'macOS' && !inputs.macos-combine-only
         working-directory: ${{ github.workspace }}
@@ -398,13 +390,6 @@ jobs:
           if ($arch -eq "arm64") { .\build_release_vs.bat slicer arm64 tests } else { .\build_release_vs.bat slicer tests }
         shell: pwsh
 
-      - name: Build system preset cache (Windows)
-        if: runner.os == 'Windows'
-        shell: cmd
-        # Shipped into both the already-installed tree (portable zip, MSIX) and
-        # the checkout cpack re-installs from when it builds the NSIS installer.
-        run: scripts\build_preset_cache.bat "%BUILD_DIR%" "resources\profiles" "%BUILD_DIR%\OrcaSlicer\resources\profiles"
-
       - name: Pack unit tests Win
         if: runner.os == 'Windows'
         working-directory: ${{ github.workspace }}
@@ -554,20 +539,6 @@ jobs:
           retention-days: 5
           if-no-files-found: error
 
-      - name: Build system preset cache (Linux)
-        if: runner.os == 'Linux'
-        shell: bash
-        run: |
-          # Both were packed from resources/ before the caches existed, so the
-          # AppImage is unpacked first and the caches shipped into it and into
-          # the package tree; the source tree keeps its JSONs for later steps.
-          appimage=$(find build -maxdepth 1 -name "OrcaSlicer_Linux_AppImage*.AppImage" | head -1)
-          chmod +x "$appimage"
-          "$appimage" --appimage-extract
-          ./scripts/build_preset_cache.sh -b build build/package/resources/profiles squashfs-root/resources/profiles
-          appimagetool=$(find build -name "appimagetool.AppImage" | head -1)
-          ARCH=$(uname -m) "$appimagetool" --appimage-extract-and-run squashfs-root "$appimage"
-          rm -rf squashfs-root
         # Ship the freshly-built validator so slice_check_linux (build_all.yml)
         # can slice-sweep the shipped profiles with this PR's engine. Taken from
         # the aarch64 leg so the sweep also exercises the arm build; x86_64 on

.github/workflows/update-translation.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: '3.12'
 

.gitignore

@@ -49,4 +49,3 @@ internal_docs/
 # Python bytecode
 __pycache__/
 *.pyc
-*.opc

CMakeLists.txt

@@ -80,12 +80,8 @@ endif()
 
 if (DEFINED BBL_RELEASE_TO_PUBLIC)
     add_compile_definitions("BBL_RELEASE_TO_PUBLIC=${BBL_RELEASE_TO_PUBLIC}")
-    if (BBL_RELEASE_TO_PUBLIC)
-        add_compile_definitions(WXINSPECTOR_DISABLE)
-    endif ()
 else ()
     add_compile_definitions("BBL_RELEASE_TO_PUBLIC=$<CONFIG:Release>")
-    add_compile_definitions("$<$<CONFIG:Release>:WXINSPECTOR_DISABLE>")
 endif ()
 
 find_package(Git)

build_linux.sh

@@ -567,8 +567,6 @@ if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then
 	print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer
 	echo "Building OrcaSlicer_profile_validator .."
 	print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer_profile_validator
-	echo "Building generate_system_cache ..."
-	print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target generate_system_cache
 	./scripts/run_gettext.sh
     fi
     if [[ -n "${BUILD_TESTS}" ]] ; then

deps/OpenSSL/OpenSSL.cmake

@@ -52,14 +52,6 @@ ExternalProject_Add(dep_OpenSSL
 	CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch}
         "--openssldir=${DESTDIR}"
         "--prefix=${DESTDIR}"
-        # OpenSSL's linux-x86_64 target sets multilib=64, so it installs to
-        # <prefix>/lib64 while every other dep uses <prefix>/lib. CPython's
-        # --with-openssl only ever emits -L<dir>/lib, so it misses the bundled
-        # static libs and silently links the system OpenSSL instead -- which,
-        # against 1.1.1w headers, leaves _ssl.so with an undefined
-        # SSL_get_peer_certificate (removed in OpenSSL 3.x). Pin libdir so the
-        # prefix stays single-layout.
-        "--libdir=lib"
         ${_cross_comp_prefix_line}
         no-shared
         no-asm

deps_src/imgui/imstb_textedit.h

@@ -465,57 +465,6 @@ static void stb_textedit_click(STB_TEXTEDIT_STRING *str, STB_TexteditState *stat
       STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
       y = r.ymin;
    }
-   else
-   {
-      // In multi-line mode, clamp y to stay within the text vertical bounds.
-      // This lets the click still land at a valid location if the mouse is slightly
-      // above or below the text.
-      StbTexteditRow r;
-      int n = STB_TEXTEDIT_STRINGLEN(str);
-      int i = 0;
-      float base_y = 0, y_min, y_max;
-
-      // Get the first row to establish y_min and start the iteration
-      STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
-      if (r.num_chars <= 0)
-      {
-         state->cursor = 0;
-         state->select_start = state->cursor;
-         state->select_end = state->cursor;
-         state->has_preferred_x = 0;
-         return;
-      }
-      y_min = r.ymin;
-      y_max = base_y + r.ymax;
-      i = r.num_chars;
-      base_y += r.baseline_y_delta;
-
-      // Walk the remaining rows to find the bottom of the last row
-      while (i < n)
-      {
-         STB_TEXTEDIT_LAYOUTROW(&r, str, i);
-         if (r.num_chars <= 0)
-            break;
-         y_max = base_y + r.ymax;
-         i += r.num_chars;
-         base_y += r.baseline_y_delta;
-      }
-
-      // If the text ends with a newline, account for the empty trailing line
-      // so the cursor can be placed on it
-      if (n > 0 && STB_TEXTEDIT_GETCHAR(str, n - 1) == STB_TEXTEDIT_NEWLINE)
-      {
-         STB_TEXTEDIT_LAYOUTROW(&r, str, n);
-         y_max = base_y + r.ymax;
-      }
-
-      // Subtract half the last line height to avoid rounding issues when the mouse
-      // is just barely below the last line (keep cursor on the last line, not after the text)
-      y_max -= (r.ymax - r.ymin) * 0.5f;
-
-      if (y < y_min) y = y_min;
-      if (y > y_max) y = y_max;
-   }
 
    state->cursor = stb_text_locate_coord(str, x, y);
    state->select_start = state->cursor;
@@ -536,50 +485,6 @@ static void stb_textedit_drag(STB_TEXTEDIT_STRING *str, STB_TexteditState *state
       STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
       y = r.ymin;
    }
-   else
-   {
-      // In multi-line mode, clamp y to stay within the text vertical bounds.
-      // This lets the drag keep working if the mouse goes off the top or bottom of the text.
-      StbTexteditRow r;
-      int n = STB_TEXTEDIT_STRINGLEN(str);
-      int i = 0;
-      float base_y = 0, y_min, y_max;
-
-      // Get the first row to establish y_min and start the iteration
-      STB_TEXTEDIT_LAYOUTROW(&r, str, 0);
-      if (r.num_chars <= 0)
-         return;
-      y_min = r.ymin;
-      y_max = base_y + r.ymax;
-      i = r.num_chars;
-      base_y += r.baseline_y_delta;
-
-      // Walk the remaining rows to find the bottom of the last row
-      while (i < n)
-      {
-         STB_TEXTEDIT_LAYOUTROW(&r, str, i);
-         if (r.num_chars <= 0)
-            break;
-         y_max = base_y + r.ymax;
-         i += r.num_chars;
-         base_y += r.baseline_y_delta;
-      }
-
-      // If the text ends with a newline, account for the empty trailing line
-      // so the cursor can be placed on it
-      if (n > 0 && STB_TEXTEDIT_GETCHAR(str, n - 1) == STB_TEXTEDIT_NEWLINE)
-      {
-         STB_TEXTEDIT_LAYOUTROW(&r, str, n);
-         y_max = base_y + r.ymax;
-      }
-
-      // Subtract half the last line height to avoid rounding issues when the mouse
-      // is just barely below the last line (keep cursor on the last line, not after the text)
-      y_max -= (r.ymax - r.ymin) * 0.5f;
-
-      if (y < y_min) y = y_min;
-      if (y > y_max) y = y_max;
-   }
 
    if (state->select_start == state->select_end)
       state->select_start = state->cursor;

docs/HLSD/preset-cache.md

@@ -1,288 +0,0 @@
-# System Preset Cache — High Level Design
-
-## Why it exists
-
-OrcaSlicer ships tens of thousands of system preset JSON files. Every launch used to
-parse all of them: read each vendor profile, walk its machine, process and filament
-sub-files, resolve inheritance, and build the preset collections from scratch. That
-parse dominated startup, and it produced the same result every time, because system
-presets only change when the app is updated or a profile update is installed.
-
-The preset cache replaces that parse with a read. Each vendor's presets are serialized
-once — at build time, in CI — into a single binary file the app reads in one pass. The
-read replaces the file walk and the JSON parsing, which is where the time went;
-resolving inheritance and registering the presets still runs at load, through the same
-code the JSON path uses, so the result is the parse's result without the parse.
-
-The cache is **only ever an optimization**. Every rule below exists to guarantee that a
-cache is either provably equivalent to parsing the JSONs, or rejected. There is no
-"mostly right" cache.
-
-## The unit is one vendor
-
-A cache covers exactly one vendor. `BBL.opc` sits beside `BBL.json` and holds
-everything `BBL.json` and the `BBL/` sub-file tree would have produced.
-
-Per-vendor granularity is what makes the system practical:
-
-- A vendor whose profile is bumped invalidates only its own cache. The other 60-odd
-  vendors keep theirs — even when the bumped vendor is the shared Orca filament
-  library everyone else inherits from.
-- The setup wizard, which loads vendors one at a time, gets the same speedup as
-  startup without a second code path.
-- A vendor with no cache, or a broken one, costs only that vendor a parse.
-
-A cache holds *system* presets only. User presets, project settings and modified
-presets are never serialized — they have their own storage and their own lifecycle.
-
-## Where the files live
-
-| Location | Contents on a shipped build | Role |
-|---|---|---|
-| `resources/profiles/` | `<vendor>.opc` alone — the profile and its preset JSONs both pruned | What the app ships with; the fallback everything falls back to |
-| `<data_dir>/system/` | `<vendor>.opc` alone, or `<vendor>.json` + `<vendor>/` after an update | What the user has installed |
-| `<data_dir>/system/` (dev build) | `<vendor>.json` + `<vendor>/` + `<vendor>.opc` written at runtime | A developer tree caches as it parses |
-
-Two forms of the same vendor therefore exist, and the system's central rule is that
-**a vendor's cache is the whole of it**. Where a cache ships or is installed, no profile
-and no preset JSONs sit beside it: the cache carries the presets, the vendor profile,
-and the version stamp that says which release it came from. A vendor is "installed" if
-either form is present, and its installed version is read from whichever form is there.
-
-What stays beside the caches in `resources/profiles/` is everything that is not a
-preset: each vendor's directory of printer thumbnails, cover images, bed models and
-hotend meshes, which are read from disk by path and were never part of the cache. Files
-that are not vendors at all, `blacklist.json` chief among them, are untouched.
-
-The alternative — shipping both and treating the cache as a sidecar — was rejected. It
-doubles the installed size, and it creates a class of bug where the two disagree and
-the app's behavior depends on which one a given code path happened to read.
-
-## What a cache file is
-
-A fixed-size header followed by one binary stream.
-
-The header carries a magic number, the cache format version, the payload size and a
-CRC32 of the payload. It exists so that a truncated download, a half-written file or a
-file from an entirely different program is rejected in microseconds, before anything
-tries to interpret it.
-
-The payload opens with the stamps that decide whether the cache may be used at all —
-format version, schema fingerprint, vendor name, vendor version — and then the
-vendor's data: its vendor profile, three lists of preset entries (process, filament,
-machine), and the count of errors the original parse hit.
-
-Each entry is one preset **in source form**: what its JSON sub-file states and nothing
-that resolving it derives — the preset's own config diff, the name of the preset it
-inherits, and the parse metadata (name, sub-path, description, instantiation, setting
-and filament ids, renames). Non-instantiated base presets are stored too; the children
-that inherit from them cannot resolve without them.
-
-Three deliberate choices in the layout:
-
-- **Stamps come first**, so the question "what version is this vendor installed at?"
-  can be answered by reading the first kilobyte. The updater asks that question for
-  every vendor on every launch; reading tens of megabytes to answer it would give back
-  the startup time the cache saved.
-- **Nothing inherited is baked in.** A filament preset that inherits from the shared
-  library is stored as its own diff plus its parent's name, and the parent is looked up
-  when the entry is installed, against whatever library is loaded then. A cache
-  therefore carries no other vendor's values, and no other vendor's update — the
-  library's included — can make it stale.
-- **Nothing derived is stored.** Default presets, flattened configs, aliases and
-  lookup maps are all reconstructed at load by the same code the JSON path runs, and
-  state that path never fills (obsolete-preset lists) is not stored either. This keeps
-  the cache a record of the vendor's data, not a memory image of the program's state.
-
-## When a cache may be used
-
-A cache is accepted only if every gate below passes. Any failure means "parse the
-JSONs instead" — never a hard error, never a partial load.
-
-**1. Integrity.** Magic number, plausible size, CRC32 over the payload.
-
-**2. Cache format version.** A single integer bumped by hand whenever the binary layout
-changes in a way nothing else would catch: reordering or retyping a hand-written
-serialized field, or changing what the cache's own stamps mean.
-
-**3. Schema fingerprint.** A checksum over the app version and the entire print-config
-option schema — every option's key, type, wire ordinal and enum values. This is the
-gate that makes the cache safe across development: adding a config option, changing its
-type, or reordering the enum values of an existing one all change the fingerprint, so
-caches from before the change are rejected without anyone having to remember to bump
-anything. It also means a cache never crosses app versions.
-
-**4. Vendor identity and version.** The cache names the vendor it holds and the profile
-version it was built from. It is accepted only if that version is at least as new as
-the profile now on disk. Where no profile sits beside the cache — the shipped,
-cache-only form — the comparison is skipped, because nothing on disk can be newer than
-a cache that is the installation.
-
-**5. Every entry installs.** Entries are installed as they are read, and an entry that
-cannot be — typically one that inherits a parent the currently loaded filament library
-no longer provides — rejects the whole cache, never just the entry. A partial vendor is
-not a vendor.
-
-There is deliberately no stamp for the shared filament library. A cache stores its
-filaments' inheritance by name and resolves it at load, so a library update changes
-what a cache load *produces*, never whether the cache is *valid* — the same file yields
-the updated result. This matters most on a shipped build, where a vendor is its cache
-and nothing else: a profile update that delivered only the library would otherwise have
-stranded every other vendor with a cache it invalidated and no JSONs to fall back on.
-
-A vendor profile with no parsable version is never cached and never served from a
-cache. There would be no way to tell later whether the cache had gone stale, and a
-cache nothing can invalidate is worse than no cache.
-
-## How a vendor is loaded
-
-Vendors load in a fixed order, because filament inheritance crosses exactly one
-boundary: any vendor's filament may inherit from the shared Orca filament library,
-and nothing else reaches across vendors. The library therefore goes first, alone;
-every other vendor follows in parallel, resolving against it; and the results are
-merged in a stable order:
-
-```mermaid
-flowchart LR
-    lib["1 · OrcaFilamentLibrary<br/>loaded first, synchronously"] --> par["2 · every other vendor in parallel,<br/>each into its own bundle, filaments<br/>resolving against the loaded library"] --> merge["3 · bundles merged into one,<br/>sequentially, in stable vendor order"]
-```
-
-Whether a vendor comes from its cache or from a parse changes nothing in that
-order — both produce the same bundle, so cached and parsed vendors mix freely in
-one startup. Each vendor load — startup's and the setup wizard's alike — tries,
-in order:
-
-1. The cache in the directory it was asked to load from — normally `<data_dir>/system/`.
-2. The shipped cache in `resources/profiles/` — judged against the same installed
-   profile, so it cannot resurrect a version an update has superseded.
-3. Parsing the JSONs — from the data directory if the profile is installed there, and
-   from `resources/profiles/` otherwise, which on a shipped build only has JSONs for a
-   vendor that has no cache.
-
-The same decision drawn out — "the gates" are the five acceptance checks above:
-
-```mermaid
-flowchart TB
-    start["load vendor V from a directory dir<br/>— normally &lt;data_dir&gt;/system/"]
-    start --> stamp["installed version = version of dir/V.json<br/>— or ∞ with no profile there,<br/>the cache then being the installation"]
-    stamp --> g1{"dir/V.opc<br/>passes all five gates?"}
-    g1 -- "yes" --> hit(["served from the<br/>installed cache"])
-    g1 -- "no" --> g2{"resources/profiles/V.opc passes them,<br/>against the same installed version?"}
-    g2 -- "yes" --> hit2(["served from the<br/>shipped cache"])
-    g2 -- "no" --> src{"dir/V.json<br/>present?"}
-    src -- "yes" --> pd["parse the JSONs in dir"]
-    src -- "no" --> pr["parse the JSONs in<br/>resources/profiles/"]
-    pd --> ver{"profile version<br/>parsable?"}
-    pr --> ver
-    ver -- "yes" --> save(["loaded; dir/V.opc written back —<br/>the next load takes the top path"])
-    ver -- "no" --> raw(["loaded, never cached"])
-```
-
-Serving from a cache is not a memory-image restore. The entries are deserialized and
-then installed one by one — inheritance resolved against the presets installed before
-them and the currently loaded filament library, configs flattened onto the collection
-defaults, validated and registered — by the same function the JSON path calls straight
-after parsing a sub-file. The two paths share everything below the parse, which is what
-makes a cache-loaded bundle indistinguishable from a JSON-loaded one by construction
-rather than by test coverage. Installation also rebuilds each preset's file path from
-the local data directory, so a shipped cache never carries the generating machine's
-paths.
-
-The second tier is what makes app upgrades work. After an upgrade, a cache the previous
-version installed fails the fingerprint gate; the new build's own shipped cache answers
-instead, and the user never sees a parse. The stale installed file is simply ignored
-until the next profile update overwrites it.
-
-If a parse does happen and the vendor's profile carries a version, the app writes the
-cache back beside where it looked for the vendor. That is how a developer build warms
-itself up on second launch, and how a vendor delivered by a profile update becomes
-cached without waiting for the next release.
-
-## How a vendor is installed
-
-Installing copies from `resources/profiles/` into `<data_dir>/system/`. A shipped build
-offers only a cache and a source tree only JSONs, but a partially-generated tree can
-have both, at different versions, so the installer picks the form that ships at the
-**newer version** and installs only that one:
-
-- Cache newer or equal, and readable → copy the `.opc`, and delete any profile and
-  vendor directory a previous install left behind, so nothing can shadow it.
-- Profile newer, or the cache unreadable or absent → copy the profile and the vendor's
-  preset JSONs exactly as the app did before caches existed, and delete any stale `.opc`.
-
-The result is that only one form of a vendor is ever present, and it is the newest one
-the build has. This matters most for the update check, which compares what is installed
-against what installing *would* lay down: if those two disagreed about which form
-counts, a vendor could reinstall on every launch forever, or silently never update.
-
-Profile updates delivered over the air always arrive as JSONs, and they win — an
-updated vendor's real profile lands in the data directory, the shipped cache is older
-and gets rejected, and the vendor is parsed and re-cached. An update that touches only
-the filament library needs nothing more: every other vendor's cache stays valid and
-simply resolves against the new library on its next load.
-
-## How the caches are produced
-
-Cache generation is a build step, not something a user ever runs.
-
-One script per platform does the whole job, and CI calls it once on each. It builds a
-small dev-utility that loads a profiles directory exactly as the app would, with cache
-writing enabled, dropping a `<vendor>.opc` beside every vendor profile it parses; then
-it copies those caches into each packaged application it was pointed at and deletes
-every preset JSON they replace — the vendor's own profile included. Only a vendor that
-actually has a cache is pruned, so a vendor the generator skipped keeps its JSONs and is
-simply parsed at startup.
-
-Because the schema fingerprint includes the app version, caches must be generated by
-the same build that ships them. Generation runs after the build, in the same job.
-
-## Behavior when things go wrong
-
-The system is designed so that no cache problem is fatal:
-
-- **Corrupt, truncated or foreign file** — rejected at the header, vendor parsed.
-- **Cache from another app version or schema** — rejected at the fingerprint, vendor
-  parsed or served from the shipped cache.
-- **Stale cache** — rejected on the vendor version stamp, vendor parsed and re-cached.
-- **Failure part-way through loading** — a deserialization error, or any entry that
-  fails to install — rejects the whole cache, and the bundle is reset to a clean state
-  before falling back, so a half-loaded cache can never leak into the parsed result.
-- **A vendor that can be neither read nor parsed** — logged, and left out. The setup
-  wizard drops that vendor from its list and opens with the rest; startup records the
-  error alongside the vendors that did load. One broken vendor never takes the app down.
-
-The one genuine limit: on a shipped build a vendor is its cache and nothing else, so a
-rejected cache has nothing to fall back to for that vendor. This is by design — the
-alternative is shipping every preset twice — and it is why the acceptance gates are
-conservative and why CI generates the caches with the same build that ships them. The
-recovery path is a profile update, which delivers real JSONs.
-
-It also means nothing may quietly assume a `<vendor>.json` exists. Discovery, version
-checks and the update decision all read whichever form is present, and a code path that
-enumerates only `*.json` will find no vendors at all in a packaged build.
-
-## Maintenance rules
-
-- **Adding or changing a config option** needs nothing. The fingerprint covers it.
-- **Changing a hand-written `serialize()`** — `PresetBundle::CachedPreset`,
-  `VendorProfile` or its nested types — or the cache's own layout or stamps requires
-  bumping the cache format version by hand. Nothing else is serialized by hand; the
-  config payload is covered by the fingerprint.
-- **Bumping a vendor profile's version** invalidates that vendor's cache and nothing
-  else — the filament library's included. Other vendors' caches resolve against the
-  new library the next time they load.
-- **Caches are never committed.** They are build artifacts, generated per build,
-  ignored by git.
-
-## Where this lives in the tree
-
-| Area | Files |
-|---|---|
-| Cache format, entry serialization, read/write, load and save | `src/libslic3r/PresetBundle.{hpp,cpp}` |
-| Vendor profile serialization | `src/libslic3r/Preset.hpp` |
-| Vendor discovery, installed/shipped versions, installation | `src/libslic3r/PresetBundle.cpp` |
-| Update and reinstall decisions | `src/slic3r/Utils/PresetUpdater.cpp` |
-| Setup wizard and printer-selection dialog | `src/slic3r/GUI/ConfigWizard.cpp`, `src/slic3r/GUI/WebGuideDialog.cpp` |
-| Generator tool | `src/dev-utils/generate_system_cache.cpp` |
-| Build and packaging script | `scripts/build_preset_cache.{sh,bat}` |
-| Tests | `tests/libslic3r/test_vendor_cache.cpp` |

resources/profiles/Custom.json

@@ -1,6 +1,6 @@
 {
 	"name": "Custom Printer",
-	"version": "02.04.00.02",
+	"version": "02.04.00.01",
 	"force_update": "0",
 	"description": "My configurations",
 	"machine_model_list": [

resources/profiles/Custom/filament/Generic ABS @MyToolChanger.json

@@ -24,6 +24,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic ASA @MyToolChanger.json

@@ -24,6 +24,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PA @MyToolChanger.json

@@ -24,6 +24,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PA-CF @MyToolChanger.json

@@ -24,6 +24,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PC @MyToolChanger.json

@@ -25,6 +25,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PETG @MyToolChanger.json

@@ -25,6 +25,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PLA @MyToolChanger.json

@@ -25,6 +25,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PLA-CF @MyToolChanger.json

@@ -25,6 +25,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/filament/Generic PVA @MyToolChanger.json

@@ -25,6 +25,12 @@
 	"filament_loading_speed_start": [
 		"50"
 	],
+	"filament_multitool_ramming": [
+		"1"
+	],
+	"filament_multitool_ramming_flow": [
+		"40"
+	],
 	"filament_stamping_distance": [
 		"45"
 	],

resources/profiles/Custom/machine/fdm_klipper_common.json

@@ -116,7 +116,7 @@
 	"deretraction_speed": [
 		"30"
 	],
-	"z_hop_types": "Slope Lift",
+	"z_hop_types": "Normal Lift",
 	"silent_mode": "0",
 	"single_extruder_multi_material": "1",
 	"change_filament_gcode": "",

resources/profiles/Custom/machine/fdm_repetier_common.json

@@ -118,7 +118,7 @@
 	"deretraction_speed": [
 		"30"
 	],
-	"z_hop_types": "Slope Lift",
+	"z_hop_types": "Normal Lift",
 	"silent_mode": "0",
 	"single_extruder_multi_material": "1",
 	"change_filament_gcode": "",

resources/profiles/Custom/machine/fdm_rrf_common.json

@@ -116,7 +116,7 @@
 	"deretraction_speed": [
 		"30"
 	],
-	"z_hop_types": "Slope Lift",
+	"z_hop_types": "Normal Lift",
 	"silent_mode": "0",
 	"single_extruder_multi_material": "1",
 	"change_filament_gcode": "",

resources/profiles/Custom/machine/fdm_toolchanger_common.json

@@ -172,11 +172,11 @@
 		"0.4"
 	],
 	"z_hop_types": [
-		"Slope Lift",
-		"Slope Lift",
-		"Slope Lift",
-		"Slope Lift",
-		"Slope Lift"
+		"Normal Lift",
+		"Normal Lift",
+		"Normal Lift",
+		"Normal Lift",
+		"Normal Lift"
 	],
 	"purge_in_prime_tower": "0",
 	"machine_pause_gcode": "M601",

resources/profiles/OrcaFilamentLibrary.json

@@ -1,6 +1,6 @@
 {
 	"name": "OrcaFilamentLibrary",
-	"version": "02.04.00.04",
+	"version": "02.04.00.03",
 	"force_update": "0",
 	"description": "Orca Filament Library",
 	"filament_list": [

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json

@@ -36,9 +36,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"filament_type": [
 		"PET-CF"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json

@@ -39,9 +39,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json

@@ -39,9 +39,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json

@@ -21,9 +21,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"filament_type": [
 		"PLA-AERO"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json

@@ -27,9 +27,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"filament_scarf_seam_type": [
 		"none"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json

@@ -21,9 +21,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"filament_vendor": [
 		"Bambu Lab"
 	],

resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json

@@ -36,9 +36,6 @@
 	"filament_max_volumetric_speed": [
 		"1"
 	],
-	"filament_multitool_ramming_flow": [
-		"1"
-	],
 	"filament_retraction_minimum_travel": [
 		"3"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json

@@ -72,6 +72,15 @@
 	"fan_min_speed": [
 		"10"
 	],
+	"filament_cooling_final_speed": [
+		"0"
+	],
+	"filament_cooling_initial_speed": [
+		"0"
+	],
+	"filament_cooling_moves": [
+		"0"
+	],
 	"filament_cost": [
 		"599"
 	],
@@ -90,12 +99,30 @@
 	"filament_is_support": [
 		"0"
 	],
+	"filament_loading_speed": [
+		"0"
+	],
+	"filament_loading_speed_start": [
+		"0"
+	],
 	"filament_long_retractions_when_cut": [
 		"nil"
 	],
 	"filament_max_volumetric_speed": [
 		"15"
 	],
+	"filament_minimal_purge_on_wipe_tower": [
+		"0"
+	],
+	"filament_multitool_ramming": [
+		"0"
+	],
+	"filament_multitool_ramming_flow": [
+		"10"
+	],
+	"filament_multitool_ramming_volume": [
+		"10"
+	],
 	"filament_notes": [
 		""
 	],
@@ -138,6 +165,21 @@
 	"filament_soluble": [
 		"0"
 	],
+	"filament_stamping_distance": [
+		"0"
+	],
+	"filament_stamping_loading_speed": [
+		"0"
+	],
+	"filament_toolchange_delay": [
+		"0"
+	],
+	"filament_unloading_speed": [
+		"0"
+	],
+	"filament_unloading_speed_start": [
+		"0"
+	],
 	"filament_vendor": [
 		"Elas"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json

@@ -42,6 +42,15 @@
 	"fan_min_speed": [
 		"20"
 	],
+	"filament_cooling_final_speed": [
+		"0"
+	],
+	"filament_cooling_initial_speed": [
+		"0"
+	],
+	"filament_cooling_moves": [
+		"0"
+	],
 	"filament_cost": [
 		"445"
 	],
@@ -60,12 +69,30 @@
 	"filament_is_support": [
 		"0"
 	],
+	"filament_loading_speed": [
+		"0"
+	],
+	"filament_loading_speed_start": [
+		"0"
+	],
 	"filament_long_retractions_when_cut": [
 		"1"
 	],
 	"filament_max_volumetric_speed": [
 		"18"
 	],
+	"filament_minimal_purge_on_wipe_tower": [
+		"0"
+	],
+	"filament_multitool_ramming": [
+		"0"
+	],
+	"filament_multitool_ramming_flow": [
+		"10"
+	],
+	"filament_multitool_ramming_volume": [
+		"10"
+	],
 	"filament_notes": [
 		""
 	],
@@ -108,6 +135,21 @@
 	"filament_soluble": [
 		"0"
 	],
+	"filament_stamping_distance": [
+		"0"
+	],
+	"filament_stamping_loading_speed": [
+		"0"
+	],
+	"filament_toolchange_delay": [
+		"0"
+	],
+	"filament_unloading_speed": [
+		"0"
+	],
+	"filament_unloading_speed_start": [
+		"0"
+	],
 	"filament_wipe": [
 		"nil"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json

@@ -71,6 +71,15 @@
 	"fan_min_speed": [
 		"60"
 	],
+	"filament_cooling_final_speed": [
+		"0"
+	],
+	"filament_cooling_initial_speed": [
+		"0"
+	],
+	"filament_cooling_moves": [
+		"0"
+	],
 	"filament_cost": [
 		"449.5"
 	],
@@ -89,12 +98,30 @@
 	"filament_is_support": [
 		"0"
 	],
+	"filament_loading_speed": [
+		"0"
+	],
+	"filament_loading_speed_start": [
+		"0"
+	],
 	"filament_long_retractions_when_cut": [
 		"nil"
 	],
 	"filament_max_volumetric_speed": [
 		"25"
 	],
+	"filament_minimal_purge_on_wipe_tower": [
+		"0"
+	],
+	"filament_multitool_ramming": [
+		"0"
+	],
+	"filament_multitool_ramming_flow": [
+		"10"
+	],
+	"filament_multitool_ramming_volume": [
+		"10"
+	],
 	"filament_notes": [
 		""
 	],
@@ -137,6 +164,21 @@
 	"filament_soluble": [
 		"0"
 	],
+	"filament_stamping_distance": [
+		"0"
+	],
+	"filament_stamping_loading_speed": [
+		"0"
+	],
+	"filament_toolchange_delay": [
+		"0"
+	],
+	"filament_unloading_speed": [
+		"0"
+	],
+	"filament_unloading_speed_start": [
+		"0"
+	],
 	"filament_vendor": [
 		"Elas"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json

@@ -71,6 +71,15 @@
 	"fan_min_speed": [
 		"100"
 	],
+	"filament_cooling_final_speed": [
+		"0"
+	],
+	"filament_cooling_initial_speed": [
+		"0"
+	],
+	"filament_cooling_moves": [
+		"0"
+	],
 	"filament_cost": [
 		"500"
 	],
@@ -89,12 +98,30 @@
 	"filament_is_support": [
 		"0"
 	],
+	"filament_loading_speed": [
+		"0"
+	],
+	"filament_loading_speed_start": [
+		"0"
+	],
 	"filament_long_retractions_when_cut": [
 		"nil"
 	],
 	"filament_max_volumetric_speed": [
 		"18"
 	],
+	"filament_minimal_purge_on_wipe_tower": [
+		"0"
+	],
+	"filament_multitool_ramming": [
+		"0"
+	],
+	"filament_multitool_ramming_flow": [
+		"10"
+	],
+	"filament_multitool_ramming_volume": [
+		"10"
+	],
 	"filament_notes": [
 		""
 	],
@@ -137,6 +164,21 @@
 	"filament_soluble": [
 		"0"
 	],
+	"filament_stamping_distance": [
+		"0"
+	],
+	"filament_stamping_loading_speed": [
+		"0"
+	],
+	"filament_toolchange_delay": [
+		"0"
+	],
+	"filament_unloading_speed": [
+		"0"
+	],
+	"filament_unloading_speed_start": [
+		"0"
+	],
 	"filament_vendor": [
 		"Elas"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json

@@ -24,9 +24,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"nozzle_temperature": [
 		"290"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @base.json

@@ -35,9 +35,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"filament_vendor": [
 		"Elegoo"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json

@@ -12,9 +12,6 @@
 	"filament_max_volumetric_speed": [
 		"10"
 	],
-	"filament_multitool_ramming_flow": [
-		"10"
-	],
 	"nozzle_temperature": [
 		"220"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json

@@ -44,8 +44,5 @@
 	],
 	"filament_max_volumetric_speed": [
 		"10"
-	],
-	"filament_multitool_ramming_flow": [
-		"10"
 	]
 }

resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json

@@ -44,8 +44,5 @@
 	],
 	"filament_max_volumetric_speed": [
 		"8"
-	],
-	"filament_multitool_ramming_flow": [
-		"8"
 	]
 }

resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json

@@ -10,8 +10,5 @@
 	"filament_type": [
 		"PA-CF"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json

@@ -8,8 +8,5 @@
 	"filament_max_volumetric_speed": [
 		"20"
 	],
-	"filament_multitool_ramming_flow": [
-		"20"
-	],
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json

@@ -17,9 +17,6 @@
 	"filament_max_volumetric_speed": [
 		"11.5"
 	],
-	"filament_multitool_ramming_flow": [
-		"13"
-	],
 	"overhang_fan_speed": [
 		"100"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json

@@ -12,9 +12,6 @@
 	"filament_max_volumetric_speed": [
 		"18"
 	],
-	"filament_multitool_ramming_flow": [
-		"25"
-	],
 	"slow_down_layer_time": [
 		"4"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json

@@ -8,9 +8,6 @@
 	"filament_max_volumetric_speed": [
 		"11"
 	],
-	"filament_multitool_ramming_flow": [
-		"11"
-	],
 	"filament_retraction_length": [
 		"0.8"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json

@@ -15,9 +15,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"filament_type": [
 		"PP-CF"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json

@@ -15,9 +15,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"filament_type": [
 		"PP-GF"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json

@@ -17,9 +17,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"filament_vendor": [
 		"Overture"
 	],

resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Silk @base.json

@@ -23,9 +23,6 @@
 	"filament_max_volumetric_speed": [
 		"7.5"
 	],
-	"filament_multitool_ramming_flow": [
-		"7.5"
-	],
 	"filament_vendor": [
 		"Valment"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_abs.json

@@ -43,12 +43,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"15"
-	],
-	"filament_multitool_ramming_volume": [
-		"10"
-	],
 	"filament_type": [
 		"ABS"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_asa.json

@@ -43,12 +43,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"12"
-	],
-	"filament_multitool_ramming_volume": [
-		"10"
-	],
 	"filament_type": [
 		"ASA"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json

@@ -41,15 +41,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming": [
-		"0"
-	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
-	"filament_multitool_ramming_volume": [
-		"0.1"
-	],
 	"filament_type": [
 		"BVOH"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_common.json

@@ -66,12 +66,6 @@
 	"filament_minimal_purge_on_wipe_tower": [
 		"15"
 	],
-	"filament_multitool_ramming": [
-		"1"
-	],
-	"filament_multitool_ramming_volume": [
-		"5"
-	],
 	"filament_retract_before_wipe": [
 		"nil"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_cope.json

@@ -41,9 +41,6 @@
 	"filament_max_volumetric_speed": [
 		"16"
 	],
-	"filament_multitool_ramming_flow": [
-		"16"
-	],
 	"filament_scarf_seam_type": [
 		"none"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json

@@ -8,9 +8,6 @@
 	"filament_type": [
 		"EVA"
 	],
-	"filament_multitool_ramming_flow": [
-		"12"
-	],
 	"supertack_plate_temp": [
 		"0"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json

@@ -41,9 +41,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"filament_type": [
 		"HIPS"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json

@@ -44,9 +44,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"12"
-	],
 	"filament_type": [
 		"PA"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_paht.json

@@ -7,9 +7,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"12"
-	],
 	"filament_type": [
 		"PAHT"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json

@@ -86,9 +86,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"16"
-	],
 	"filament_flow_ratio": [
 		"0.94"
 	]

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json

@@ -26,9 +26,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"10"
-	],
 	"filament_type": [
 		"PCTG"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json

@@ -38,9 +38,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"12"
-	],
 	"filament_type": [
 		"PE"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json

@@ -26,9 +26,6 @@
 	"filament_max_volumetric_speed": [
 		"10"
 	],
-	"filament_multitool_ramming_flow": [
-		"15"
-	],
 	"filament_type": [
 		"PETG"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json

@@ -38,9 +38,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"filament_type": [
 		"PHA"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json

@@ -38,9 +38,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"20"
-	],
 	"filament_scarf_seam_type": [
 		"none"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json

@@ -9,9 +9,6 @@
 	"filament_flow_ratio": [
 		"0.98"
 	],
-	"filament_multitool_ramming_flow": [
-		"10"
-	],
 	"slow_down_layer_time": [
 		"8"
 	]

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json

@@ -38,9 +38,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"12"
-	],
 	"filament_type": [
 		"PP"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json

@@ -47,9 +47,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"filament_type": [
 		"PPA-CF"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pps.json

@@ -43,9 +43,6 @@
 	"filament_max_volumetric_speed": [
 		"4"
 	],
-	"filament_multitool_ramming_flow": [
-		"4"
-	],
 	"filament_type": [
 		"PPS"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pva.json

@@ -40,15 +40,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming": [
-		"0"
-	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
-	"filament_multitool_ramming_volume": [
-		"0.1"
-	],
 	"filament_soluble": [
 		"1"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json

@@ -11,9 +11,6 @@
 	"filament_max_volumetric_speed": [
 		"12"
 	],
-	"filament_multitool_ramming_flow": [
-		"12"
-	],
 	"filament_type": [
 		"SBS"
 	],

resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_tpu.json

@@ -43,15 +43,6 @@
 	"filament_max_volumetric_speed": [
 		"3.2"
 	],
-	"filament_multitool_ramming": [
-		"0"
-	],
-	"filament_multitool_ramming_flow": [
-		"3.2"
-	],
-	"filament_multitool_ramming_volume": [
-		"0.1"
-	],
 	"filament_retraction_length": [
 		"0.4"
 	],

resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json

@@ -17,9 +17,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"filament_vendor": [
 		"eSUN"
 	],

resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json

@@ -17,9 +17,6 @@
 	"filament_max_volumetric_speed": [
 		"8"
 	],
-	"filament_multitool_ramming_flow": [
-		"8"
-	],
 	"filament_vendor": [
 		"eSUN"
 	],

resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN ePLA-LW @System.json

@@ -21,9 +21,6 @@
 	"filament_max_volumetric_speed": [
 		"6"
 	],
-	"filament_multitool_ramming_flow": [
-		"6"
-	],
 	"filament_vendor": [
 		"eSUN"
 	],

resources/profiles/Snapmaker.json

@@ -1,6 +1,6 @@
 {
 	"name": "Snapmaker",
-	"version": "02.04.00.08",
+	"version": "02.04.00.07",
 	"force_update": "0",
 	"description": "Snapmaker configurations",
 	"machine_model_list": [
@@ -426,6 +426,10 @@
 			"name": "0.16 Optimal @Snapmaker U1 (0.4 nozzle)",
 			"sub_path": "process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json"
 		},
+		{
+			"name": "0.20 Bambu Support W @Snapmaker U1 (0.4 nozzle)",
+			"sub_path": "process/0.20 Bambu Support W @Snapmaker U1 (0.4 nozzle).json"
+		},
 		{
 			"name": "0.20 Quality @Snapmaker U1 (0.4 nozzle)",
 			"sub_path": "process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json"
@@ -482,66 +486,6 @@
 			"name": "fdm_process_U1_0.8_common",
 			"sub_path": "process/fdm_process_U1_0.8_common.json"
 		},
-		{
-			"name": "fdm_process_U1_0.06_nozzle_0.2",
-			"sub_path": "process/fdm_process_U1_0.06_nozzle_0.2.json"
-		},
-		{
-			"name": "fdm_process_U1_0.08_nozzle_0.2",
-			"sub_path": "process/fdm_process_U1_0.08_nozzle_0.2.json"
-		},
-		{
-			"name": "fdm_process_U1_0.10_nozzle_0.2",
-			"sub_path": "process/fdm_process_U1_0.10_nozzle_0.2.json"
-		},
-		{
-			"name": "fdm_process_U1_0.12_nozzle_0.2",
-			"sub_path": "process/fdm_process_U1_0.12_nozzle_0.2.json"
-		},
-		{
-			"name": "fdm_process_U1_0.14_nozzle_0.2",
-			"sub_path": "process/fdm_process_U1_0.14_nozzle_0.2.json"
-		},
-		{
-			"name": "fdm_process_U1_0.18_nozzle_0.6",
-			"sub_path": "process/fdm_process_U1_0.18_nozzle_0.6.json"
-		},
-		{
-			"name": "fdm_process_U1_0.24_nozzle_0.6",
-			"sub_path": "process/fdm_process_U1_0.24_nozzle_0.6.json"
-		},
-		{
-			"name": "fdm_process_U1_0.24_nozzle_0.8",
-			"sub_path": "process/fdm_process_U1_0.24_nozzle_0.8.json"
-		},
-		{
-			"name": "fdm_process_U1_0.30_nozzle_0.6",
-			"sub_path": "process/fdm_process_U1_0.30_nozzle_0.6.json"
-		},
-		{
-			"name": "fdm_process_U1_0.32_nozzle_0.8",
-			"sub_path": "process/fdm_process_U1_0.32_nozzle_0.8.json"
-		},
-		{
-			"name": "fdm_process_U1_0.36_nozzle_0.6",
-			"sub_path": "process/fdm_process_U1_0.36_nozzle_0.6.json"
-		},
-		{
-			"name": "fdm_process_U1_0.40_nozzle_0.8",
-			"sub_path": "process/fdm_process_U1_0.40_nozzle_0.8.json"
-		},
-		{
-			"name": "fdm_process_U1_0.42_nozzle_0.6",
-			"sub_path": "process/fdm_process_U1_0.42_nozzle_0.6.json"
-		},
-		{
-			"name": "fdm_process_U1_0.48_nozzle_0.8",
-			"sub_path": "process/fdm_process_U1_0.48_nozzle_0.8.json"
-		},
-		{
-			"name": "fdm_process_U1_0.56_nozzle_0.8",
-			"sub_path": "process/fdm_process_U1_0.56_nozzle_0.8.json"
-		},
 		{
 			"name": "0.06 High Quality @Snapmaker U1 (0.2 nozzle)",
 			"sub_path": "process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json"
@@ -1564,6 +1508,10 @@
 			"name": "Snapmaker PLA Metal @U1",
 			"sub_path": "filament/Snapmaker PLA Metal @U1.json"
 		},
+		{
+			"name": "Snapmaker PLA Silk @U1",
+			"sub_path": "filament/Snapmaker PLA Silk @U1.json"
+		},
 		{
 			"name": "Snapmaker PLA Silk",
 			"sub_path": "filament/Snapmaker PLA Silk.json"
@@ -1723,214 +1671,6 @@
 		{
 			"name": "Snapmaker PLA Matte @U1 base",
 			"sub_path": "filament/Snapmaker PLA Matte @U1 base.json"
-		},
-		{
-			"name": "Polymaker PLA @U1 base",
-			"sub_path": "filament/Polymaker PLA @U1 base.json"
-		},
-		{
-			"name": "Polymaker Silk PLA Family @U1",
-			"sub_path": "filament/Polymaker Silk PLA Family @U1.json"
-		},
-		{
-			"name": "Polymaker Tough PLA Family @U1",
-			"sub_path": "filament/Polymaker Tough PLA Family @U1.json"
-		},
-		{
-			"name": "Snapmaker Breakaway Support For PLA @U1 0.2 nozzle",
-			"sub_path": "filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json"
-		},
-		{
-			"name": "Snapmaker Breakaway Support For PLA @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker Breakaway Support For PLA @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PETG HF @U1 base2",
-			"sub_path": "filament/Snapmaker PETG HF @U1 base2.json"
-		},
-		{
-			"name": "Snapmaker PETG Translucent @U1 base",
-			"sub_path": "filament/Snapmaker PETG Translucent @U1 base.json"
-		},
-		{
-			"name": "Snapmaker PLA Basic @U1 base",
-			"sub_path": "filament/Snapmaker PLA Basic @U1 base.json"
-		},
-		{
-			"name": "Snapmaker PLA Full Spectrum @U1 0.4 nozzle",
-			"sub_path": "filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Glow @U1 base",
-			"sub_path": "filament/Snapmaker PLA Glow @U1 base.json"
-		},
-		{
-			"name": "Snapmaker PLA Matte @U1 base2",
-			"sub_path": "filament/Snapmaker PLA Matte @U1 base2.json"
-		},
-		{
-			"name": "Snapmaker PLA Silk @U1 0.2 nozzle",
-			"sub_path": "filament/Snapmaker PLA Silk @U1 0.2 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Silk @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PLA Silk @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Silk @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PLA Silk @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA SnapSpeed @U1 base2",
-			"sub_path": "filament/Snapmaker PLA SnapSpeed @U1 base2.json"
-		},
-		{
-			"name": "Snapmaker PLA Translucent @U1 base",
-			"sub_path": "filament/Snapmaker PLA Translucent @U1 base.json"
-		},
-		{
-			"name": "Snapmaker PLA Wood @U1 0.4 nozzle",
-			"sub_path": "filament/Snapmaker PLA Wood @U1 0.4 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Wood @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PLA Wood @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Wood @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PLA Wood @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA-CF @U1 0.4 nozzle",
-			"sub_path": "filament/Snapmaker PLA-CF @U1 0.4 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA-CF @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PLA-CF @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA-CF @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PLA-CF @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PVA @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PVA @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PVA @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PVA @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker TPU 90A @U1",
-			"sub_path": "filament/Snapmaker TPU 90A @U1.json"
-		},
-		{
-			"name": "Snapmaker TPU 90A @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker TPU 90A @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker TPU 90A @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker TPU 90A @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker TPU 95A HF @U1",
-			"sub_path": "filament/Snapmaker TPU 95A HF @U1.json"
-		},
-		{
-			"name": "Snapmaker TPU 95A HF @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker TPU 95A HF @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Silk @U1",
-			"sub_path": "filament/Snapmaker PLA Silk @U1.json"
-		},
-		{
-			"name": "Polymaker General PLA Family @U1",
-			"sub_path": "filament/Polymaker General PLA Family @U1.json"
-		},
-		{
-			"name": "Snapmaker PETG HF @U1 0.2 nozzle",
-			"sub_path": "filament/Snapmaker PETG HF @U1 0.2 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PETG HF @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PETG HF @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PETG HF @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PETG HF @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PETG Translucent @U1 0.2 nozzle",
-			"sub_path": "filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PETG Translucent @U1 0.4 nozzle",
-			"sub_path": "filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PETG Translucent @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PETG Translucent @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Basic @U1",
-			"sub_path": "filament/Snapmaker PLA Basic @U1.json"
-		},
-		{
-			"name": "Snapmaker PLA Glow @U1 0.4 nozzle",
-			"sub_path": "filament/Snapmaker PLA Glow @U1 0.4 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Matte @U1 0.2 nozzle",
-			"sub_path": "filament/Snapmaker PLA Matte @U1 0.2 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Matte @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PLA Matte @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Matte @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PLA Matte @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA SnapSpeed @U1 0.2 nozzle",
-			"sub_path": "filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA SnapSpeed @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA SnapSpeed @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Translucent @U1 0.2 nozzle",
-			"sub_path": "filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Translucent @U1 0.4 nozzle",
-			"sub_path": "filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Translucent @U1 0.6 nozzle",
-			"sub_path": "filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json"
-		},
-		{
-			"name": "Snapmaker PLA Translucent @U1 0.8 nozzle",
-			"sub_path": "filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json"
 		}
 	],
 	"machine_list": [

resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json

@@ -1,32 +0,0 @@
-{
-	"type": "filament",
-	"name": "Polymaker General PLA Family @U1",
-	"inherits": "Polymaker PLA @U1 base",
-	"from": "system",
-	"setting_id": "thXfSaUkOAKJ50ey",
-	"instantiation": "true",
-	"compatible_printers": [
-		"Snapmaker U1 (0.4 nozzle)"
-	],
-	"enable_pressure_advance": [
-		"0"
-	],
-	"filament_max_volumetric_speed": [
-		"15"
-	],
-	"filament_vendor": [
-		"Polymaker"
-	],
-	"nozzle_temperature_range_high": [
-		"230"
-	],
-	"temperature_vitrification": [
-		"62"
-	],
-	"textured_plate_temp": [
-		"65"
-	],
-	"textured_plate_temp_initial_layer": [
-		"65"
-	]
-}

resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json

@@ -1,107 +0,0 @@
-{
-	"type": "filament",
-	"name": "Polymaker PLA @U1 base",
-	"inherits": "fdm_filament_pla",
-	"from": "system",
-	"filament_id": "OGFL99",
-	"instantiation": "false",
-	"compatible_printers": [
-		"Snapmaker U1 (0.4 nozzle)"
-	],
-	"activate_air_filtration": [
-		"0"
-	],
-	"chamber_temperatures": [
-		"0"
-	],
-	"complete_print_exhaust_fan_speed": [
-		"70"
-	],
-	"cool_plate_temp": [
-		"35"
-	],
-	"cool_plate_temp_initial_layer": [
-		"35"
-	],
-	"during_print_exhaust_fan_speed": [
-		"70"
-	],
-	"filament_cost": [
-		"20"
-	],
-	"filament_long_retractions_when_cut": [
-		"nil"
-	],
-	"filament_max_volumetric_speed": [
-		"12"
-	],
-	"filament_minimal_purge_on_wipe_tower": [
-		"15"
-	],
-	"filament_retraction_distances_when_cut": [
-		"nil"
-	],
-	"filament_retraction_length": [
-		"nil"
-	],
-	"filament_retraction_speed": [
-		"nil"
-	],
-	"filament_vendor": [
-		"Generic"
-	],
-	"filament_scarf_seam_type": [
-		"none"
-	],
-	"filament_scarf_height": [
-		"10%"
-	],
-	"filament_scarf_gap": [
-		"15%"
-	],
-	"filament_scarf_length": [
-		"10"
-	],
-	"filament_shrink": [
-		"100%"
-	],
-	"hot_plate_temp": [
-		"55"
-	],
-	"hot_plate_temp_initial_layer": [
-		"55"
-	],
-	"nozzle_temperature": [
-		"220"
-	],
-	"overhang_fan_threshold": [
-		"50%"
-	],
-	"supertack_plate_temp": [
-		"45"
-	],
-	"supertack_plate_temp_initial_layer": [
-		"45"
-	],
-	"slow_down_layer_time": [
-		"4"
-	],
-	"slow_down_min_speed": [
-		"10"
-	],
-	"temperature_vitrification": [
-		"45"
-	],
-	"textured_plate_temp": [
-		"55"
-	],
-	"textured_plate_temp_initial_layer": [
-		"55"
-	],
-	"filament_start_gcode": [
-		"; Filament gcode\n"
-	],
-	"filament_end_gcode": [
-		"; filament end gcode\n"
-	]
-}

resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json

@@ -1,32 +0,0 @@
-{
-	"type": "filament",
-	"name": "Polymaker Silk PLA Family @U1",
-	"inherits": "Polymaker PLA @U1 base",
-	"from": "system",
-	"setting_id": "h8vIYpXbxFtHPV6e",
-	"instantiation": "true",
-	"compatible_printers": [
-		"Snapmaker U1 (0.4 nozzle)"
-	],
-	"filament_density": [
-		"1.34"
-	],
-	"filament_vendor": [
-		"Polymaker"
-	],
-	"nozzle_temperature": [
-		"230"
-	],
-	"nozzle_temperature_initial_layer": [
-		"230"
-	],
-	"nozzle_temperature_range_high": [
-		"230"
-	],
-	"textured_plate_temp": [
-		"65"
-	],
-	"textured_plate_temp_initial_layer": [
-		"65"
-	]
-}

resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json

@@ -1,32 +0,0 @@
-{
-	"type": "filament",
-	"name": "Polymaker Tough PLA Family @U1",
-	"inherits": "Polymaker PLA @U1 base",
-	"from": "system",
-	"setting_id": "d6CC81Es2hp46bto",
-	"instantiation": "true",
-	"compatible_printers": [
-		"Snapmaker U1 (0.4 nozzle)"
-	],
-	"filament_density": [
-		"1.23"
-	],
-	"filament_flow_ratio": [
-		"0.96"
-	],
-	"filament_vendor": [
-		"Polymaker"
-	],
-	"slow_down_layer_time": [
-		"6"
-	],
-	"temperature_vitrification": [
-		"55"
-	],
-	"textured_plate_temp": [
-		"65"
-	],
-	"textured_plate_temp_initial_layer": [
-		"65"
-	]
-}

resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json

@@ -11,6 +11,7 @@
 	"filament_minimal_purge_on_wipe_tower": [
 		"15"
 	],
+
 	"pressure_advance": [
 		"0.05"
 	]

resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json

@@ -17,6 +17,7 @@
 	"filament_z_hop": [
 		"0.0"
 	],
+
 	"enable_pressure_advance": [
 		"1"
 	],

resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json

@@ -17,6 +17,7 @@
 	"filament_z_hop": [
 		"0.0"
 	],
+
 	"enable_pressure_advance": [
 		"1"
 	],

resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json

@@ -17,6 +17,7 @@
 	"supertack_plate_temp_initial_layer": [
 		"70"
 	],
+
 	"pressure_advance": [
 		"0.04"
 	]

resources/profiles/Snapmaker/filament/Polymaker/PolyLite Dual PLA @0.2 nozzle.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyLite Dual PLA @0.2 nozzle",
-	"inherits": "PolyLite PLA @0.2 nozzle",
 	"from": "system",
-	"setting_id": "jhmy4YHi9MuL0DWu",
 	"instantiation": "true",
+	"name": "PolyLite Dual PLA @0.2 nozzle",
+	"setting_id": "jhmy4YHi9MuL0DWu",
+	"inherits": "PolyLite PLA @0.2 nozzle",
 	"compatible_printers": [
 		"Snapmaker A250 Dual (0.2 nozzle)",
 		"Snapmaker A250 Dual BKit (0.2 nozzle)",

resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA @0.2 nozzle.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyLite J1 PLA @0.2 nozzle",
-	"inherits": "PolyLite PLA @0.2 nozzle",
 	"from": "system",
-	"setting_id": "jFlRSxx0KvN3BOUu",
 	"instantiation": "true",
+	"name": "PolyLite J1 PLA @0.2 nozzle",
+	"setting_id": "jFlRSxx0KvN3BOUu",
+	"inherits": "PolyLite PLA @0.2 nozzle",
 	"compatible_printers": [
 		"Snapmaker J1 (0.2 nozzle)"
 	]

resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyLite J1 PLA",
-	"inherits": "PolyLite PLA @base",
 	"from": "system",
-	"setting_id": "wcpOTTMyZNPFKyXr",
 	"instantiation": "true",
+	"name": "PolyLite J1 PLA",
+	"setting_id": "wcpOTTMyZNPFKyXr",
+	"inherits": "PolyLite PLA @base",
 	"compatible_printers": [
 		"Snapmaker J1 (0.4 nozzle)",
 		"Snapmaker J1 (0.6 nozzle)",

resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Base.json

@@ -1,9 +1,4 @@
 {
-	"type": "filament",
-	"name": "PolyLite PETG @Base",
-	"inherits": "fdm_filament_petg",
-	"from": "system",
-	"instantiation": "false",
 	"filament_density": [
 		"1.25"
 	],
@@ -23,6 +18,11 @@
 		"0"
 	],
 	"description": "",
+	"inherits": "fdm_filament_petg",
+	"name": "PolyLite PETG @Base",
+	"type": "filament",
+	"instantiation": "false",
+	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]

resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json

@@ -17,6 +17,7 @@
 	"supertack_plate_temp_initial_layer": [
 		"70"
 	],
+
 	"pressure_advance": [
 		"0.05"
 	]

resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json

@@ -17,6 +17,7 @@
 	"supertack_plate_temp_initial_layer": [
 		"70"
 	],
+
 	"pressure_advance": [
 		"0.05"
 	]

resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @0.2 nozzle.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyLite PLA @0.2 nozzle",
-	"inherits": "PolyLite PLA @base",
 	"from": "system",
-	"setting_id": "s9mdMaFca8SHfji9",
 	"instantiation": "true",
+	"name": "PolyLite PLA @0.2 nozzle",
+	"setting_id": "s9mdMaFca8SHfji9",
+	"inherits": "PolyLite PLA @base",
 	"compatible_printers": [
 		"Snapmaker A250 (0.2 nozzle)",
 		"Snapmaker A250 BKit (0.2 nozzle)",

resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyLite PLA @base",
-	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "1393866034",
 	"instantiation": "false",
+	"name": "PolyLite PLA @base",
+	"filament_id": "1393866034",
+	"inherits": "fdm_filament_pla",
 	"filament_flow_ratio": [
 		"0.95"
 	],

resources/profiles/Snapmaker/filament/Polymaker/PolyTerra Dual PLA @0.2 nozzle.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyTerra Dual PLA @0.2 nozzle",
-	"inherits": "PolyTerra PLA @0.2 nozzle",
 	"from": "system",
-	"setting_id": "UQYgjH1uVxf3d2Nv",
 	"instantiation": "true",
+	"name": "PolyTerra Dual PLA @0.2 nozzle",
+	"setting_id": "UQYgjH1uVxf3d2Nv",
+	"inherits": "PolyTerra PLA @0.2 nozzle",
 	"compatible_printers": [
 		"Snapmaker A250 Dual (0.2 nozzle)",
 		"Snapmaker A250 Dual BKit (0.2 nozzle)",

resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA @0.2 nozzle.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyTerra J1 PLA @0.2 nozzle",
-	"inherits": "PolyTerra PLA @0.2 nozzle",
 	"from": "system",
-	"setting_id": "mxKHxGmBZzPLS82O",
 	"instantiation": "true",
+	"name": "PolyTerra J1 PLA @0.2 nozzle",
+	"setting_id": "mxKHxGmBZzPLS82O",
+	"inherits": "PolyTerra PLA @0.2 nozzle",
 	"compatible_printers": [
 		"Snapmaker J1 (0.2 nozzle)"
 	]

resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyTerra J1 PLA",
-	"inherits": "PolyTerra PLA @base",
 	"from": "system",
-	"setting_id": "4MZWZX7QPBzxdEGj",
 	"instantiation": "true",
+	"name": "PolyTerra J1 PLA",
+	"setting_id": "4MZWZX7QPBzxdEGj",
+	"inherits": "PolyTerra PLA @base",
 	"compatible_printers": [
 		"Snapmaker J1 (0.4 nozzle)",
 		"Snapmaker J1 (0.6 nozzle)",

resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @0.2 nozzle.json

@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"name": "PolyTerra PLA @0.2 nozzle",
-	"inherits": "PolyTerra PLA @base",
 	"from": "system",
-	"setting_id": "6W1ygT08NordBdIW",
 	"instantiation": "true",
+	"name": "PolyTerra PLA @0.2 nozzle",
+	"setting_id": "6W1ygT08NordBdIW",
+	"inherits": "PolyTerra PLA @base",
 	"compatible_printers": [
 		"Snapmaker A250 (0.2 nozzle)",
 		"Snapmaker A250 BKit (0.2 nozzle)",

resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Base.json

@@ -1,9 +1,4 @@
 {
-	"type": "filament",
-	"name": "Polymaker HT-PLA @Base",
-	"inherits": "fdm_filament_pla",
-	"from": "system",
-	"instantiation": "false",
 	"filament_density": [
 		"1.28"
 	],
@@ -23,6 +18,11 @@
 		"0"
 	],
 	"description": "",
+	"inherits": "fdm_filament_pla",
+	"name": "Polymaker HT-PLA @Base",
+	"type": "filament",
+	"instantiation": "false",
+	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]

resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Base.json

@@ -1,9 +1,4 @@
 {
-	"type": "filament",
-	"name": "Polymaker HT-PLA-GF @Base",
-	"inherits": "fdm_filament_pla",
-	"from": "system",
-	"instantiation": "false",
 	"filament_density": [
 		"1.34"
 	],
@@ -23,6 +18,11 @@
 		"0"
 	],
 	"description": "",
+	"inherits": "fdm_filament_pla",
+	"name": "Polymaker HT-PLA-GF @Base",
+	"type": "filament",
+	"instantiation": "false",
+	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]

resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Base.json

@@ -1,9 +1,4 @@
 {
-	"type": "filament",
-	"name": "Polymaker PETG @Base",
-	"inherits": "fdm_filament_petg",
-	"from": "system",
-	"instantiation": "false",
 	"filament_density": [
 		"1.3"
 	],
@@ -23,6 +18,11 @@
 		"0"
 	],
 	"description": "",
+	"inherits": "fdm_filament_petg",
+	"name": "Polymaker PETG @Base",
+	"type": "filament",
+	"instantiation": "false",
+	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]

resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Base.json

@@ -1,9 +1,4 @@
 {
-	"type": "filament",
-	"name": "Polymaker PLA Pro @Base",
-	"inherits": "fdm_filament_pla",
-	"from": "system",
-	"instantiation": "false",
 	"filament_density": [
 		"1.23"
 	],
@@ -23,6 +18,11 @@
 		"0"
 	],
 	"description": "",
+	"inherits": "fdm_filament_pla",
+	"name": "Polymaker PLA Pro @Base",
+	"type": "filament",
+	"instantiation": "false",
+	"from": "system",
 	"filament_vendor": [
 		"Polymaker"
 	]